Added functions to solve utf8 conversion issues

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

12 files changed, 69 insertions, 71 deletions

diff --git a/src/ui/account_entry.c b/src/ui/account_entry.c
index 4d8355a..7a9ccdb 100644
--- a/src/ui/account_entry.c
+++ b/src/ui/account_entry.c
@@ -25,6 +25,7 @@
 #include "account_entry.h"
 
 #include "../application.h"
+#include "../ui.h"
 
 UI_ACCOUNT_ENTRY_Handle*
 ui_account_entry_new(MESSENGER_Application *app)
@@ -54,26 +55,20 @@ void
 ui_account_entry_set_account(UI_ACCOUNT_ENTRY_Handle* handle,
                              const struct GNUNET_CHAT_Account *account)
 {
-  const gchar *name = GNUNET_CHAT_account_get_name(account);
+  const char *name = GNUNET_CHAT_account_get_name(account);
 
-  if (!name)
-    return;
-
-  hdy_avatar_set_text(handle->entry_avatar, name);
-  gtk_label_set_text(handle->entry_label, name);
+  ui_avatar_set_text(handle->entry_avatar, name);
+  ui_label_set_text(handle->entry_label, name);
 }
 
 void
 ui_account_entry_set_contact(UI_ACCOUNT_ENTRY_Handle* handle,
                              const struct GNUNET_CHAT_Contact *contact)
 {
-  const gchar *name = GNUNET_CHAT_contact_get_name(contact);
-
-  if (!name)
-    return;
+  const char *name = GNUNET_CHAT_contact_get_name(contact);
 
-  hdy_avatar_set_text(handle->entry_avatar, name);
-  gtk_label_set_text(handle->entry_label, name);
+  ui_avatar_set_text(handle->entry_avatar, name);
+  ui_label_set_text(handle->entry_label, name);
 }
 
 void
diff --git a/src/ui/chat.c b/src/ui/chat.c
index d266726..4928c04 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -38,6 +38,7 @@
 #include "../application.h"
 #include "../contact.h"
 #include "../file.h"
+#include "../ui.h"
 
 static gboolean
 _flap_chat_details_reveal_switch(gpointer user_data)
@@ -520,7 +521,7 @@ handle_send_record_button_click(GtkButton *button,
   {
     UI_FILE_LOAD_ENTRY_Handle *file_load = ui_file_load_entry_new(app);
 
-    gtk_label_set_text(file_load->file_label, handle->recording_filename);
+    ui_label_set_text(file_load->file_label, handle->recording_filename);
     gtk_progress_bar_set_fraction(file_load->load_progress_bar, 0.0);
 
     struct GNUNET_CHAT_File *file = GNUNET_CHAT_context_send_file(
@@ -1493,17 +1494,14 @@ ui_chat_update(UI_CHAT_Handle *handle,
     );
   }
 
-  hdy_avatar_set_text(handle->chat_avatar, title? title : "");
+  ui_avatar_set_text(handle->chat_avatar, title);
   hdy_avatar_set_icon_name(handle->chat_avatar, icon);
 
-  hdy_avatar_set_text(handle->chat_details_avatar, title? title : "");
+  ui_avatar_set_text(handle->chat_details_avatar, title);
   hdy_avatar_set_icon_name(handle->chat_details_avatar, icon);
 
-  if (title)
-  {
-    gtk_label_set_text(handle->chat_title, title);
-    gtk_label_set_text(handle->chat_details_label, title);
-  }
+  ui_label_set_text(handle->chat_title, title);
+  ui_label_set_text(handle->chat_details_label, title);
 
   if (subtitle->len > 0)
     gtk_label_set_text(handle->chat_subtitle, subtitle->str);
@@ -1694,7 +1692,7 @@ ui_chat_remove_file_load(UI_CHAT_Handle *handle,
 
   gtk_container_remove(
       GTK_CONTAINER(handle->chat_load_listbox),
-      gtk_widget_get_parent(GTK_WIDGET(file_load->entry_box))
+      gtk_widget_get_parent(file_load->entry_box)
   );
 
   if (handle->loads)
diff --git a/src/ui/chat_entry.c b/src/ui/chat_entry.c
index 85684f0..89272be 100644
--- a/src/ui/chat_entry.c
+++ b/src/ui/chat_entry.c
@@ -24,10 +24,11 @@
 
 #include "chat_entry.h"
 
+#include "message.h"
+
 #include "../application.h"
 #include "../contact.h"
-
-#include "message.h"
+#include "../ui.h"
 
 UI_CHAT_ENTRY_Handle*
 ui_chat_entry_new(MESSENGER_Application *app)
@@ -99,9 +100,8 @@ ui_chat_entry_update(UI_CHAT_ENTRY_Handle *handle,
       icon = "system-users-symbolic";
   }
 
-  gtk_label_set_text(handle->title_label, title? title : "");
-
-  hdy_avatar_set_text(handle->entry_avatar, title? title : "");
+  ui_label_set_text(handle->title_label, title);
+  ui_avatar_set_text(handle->entry_avatar, title);
   hdy_avatar_set_icon_name(handle->entry_avatar, icon);
 
   if (!(handle->chat))
diff --git a/src/ui/contact_entry.c b/src/ui/contact_entry.c
index 54fe80a..b9789da 100644
--- a/src/ui/contact_entry.c
+++ b/src/ui/contact_entry.c
@@ -25,6 +25,7 @@
 #include "contact_entry.h"
 
 #include "../application.h"
+#include "../ui.h"
 
 UI_CONTACT_ENTRY_Handle*
 ui_contact_entry_new(MESSENGER_Application *app)
@@ -59,24 +60,12 @@ ui_contact_entry_set_contact(UI_CONTACT_ENTRY_Handle* handle,
                              const struct GNUNET_CHAT_Contact *contact)
 {
 
-  const gchar *name;
-  const gchar *key;
+  const char *name = GNUNET_CHAT_contact_get_name(contact);
+  const char *key = GNUNET_CHAT_contact_get_key(contact);
 
-  name = GNUNET_CHAT_contact_get_name(contact);
-
-  if (!name)
-    goto skip_name;
-
-  hdy_avatar_set_text(handle->entry_avatar, name);
-  gtk_label_set_text(handle->title_label, name);
-
-skip_name:
-  key = GNUNET_CHAT_contact_get_key(contact);
-
-  if (!key)
-    return;
-
-  gtk_label_set_text(handle->subtitle_label, name);
+  ui_avatar_set_text(handle->entry_avatar, name);
+  ui_label_set_text(handle->title_label, name);
+  ui_label_set_text(handle->subtitle_label, key);
 }
 
 void
diff --git a/src/ui/contact_info.c b/src/ui/contact_info.c
index 05f12a6..f6c2e91 100644
--- a/src/ui/contact_info.c
+++ b/src/ui/contact_info.c
@@ -25,7 +25,9 @@
 #include "contact_info.h"
 
 #include "chat_entry.h"
+
 #include "../application.h"
+#include "../ui.h"
 
 static void
 handle_contact_edit_button_click(UNUSED GtkButton *button,
@@ -137,13 +139,16 @@ handle_open_chat_button_click(UNUSED GtkButton *button,
 
   UI_CHAT_ENTRY_Handle *entry = GNUNET_CHAT_context_get_user_pointer(context);
 
-  if (!entry)
+  if ((!entry) || (!(entry->entry_box)))
     return;
 
   GtkListBoxRow *row = GTK_LIST_BOX_ROW(
       gtk_widget_get_parent(entry->entry_box)
   );
 
+  if (!row)
+    return;
+
   gtk_list_box_select_row(handle->app->ui.messenger.chats_listbox, row);
   gtk_list_box_invalidate_filter(handle->app->ui.messenger.chats_listbox);
 
@@ -415,8 +420,8 @@ ui_contact_info_dialog_update(UI_CONTACT_INFO_Handle *handle,
 {
   const char *name = GNUNET_CHAT_contact_get_name(contact);
 
-  hdy_avatar_set_text(handle->contact_avatar, name? name : "");
-  gtk_entry_set_text(handle->contact_name_entry, name? name : "");
+  ui_avatar_set_text(handle->contact_avatar, name);
+  ui_entry_set_text(handle->contact_name_entry, name);
 
   g_object_set_qdata(
       G_OBJECT(handle->contact_name_entry),
@@ -440,12 +445,12 @@ ui_contact_info_dialog_update(UI_CONTACT_INFO_Handle *handle,
   else
     handle->qr = NULL;
 
-  gtk_label_set_text(handle->name_label, name? name : "");
+  ui_label_set_text(handle->name_label, name);
 
   if (handle->id_drawing_area)
     gtk_widget_queue_draw(GTK_WIDGET(handle->id_drawing_area));
 
-  gtk_entry_set_text(handle->id_entry, key? key : "");
+  ui_entry_set_text(handle->id_entry, key);
 
   gtk_widget_set_sensitive(
       GTK_WIDGET(handle->reveal_identity_button),
diff --git a/src/ui/message.c b/src/ui/message.c
index c1bd648..8d5627f 100644
--- a/src/ui/message.c
+++ b/src/ui/message.c
@@ -28,6 +28,7 @@
 
 #include "../application.h"
 #include "../file.h"
+#include "../ui.h"
 
 static void
 handle_downloading_file(void *cls,
@@ -434,6 +435,8 @@ _update_file_message(UI_MESSAGE_Handle *handle,
                      MESSENGER_Application *app,
                      struct GNUNET_CHAT_File *file)
 {
+  const char *filename = GNUNET_CHAT_file_get_name(file);
+
   uint64_t size = GNUNET_CHAT_file_get_size(file);
   uint64_t local_size = GNUNET_CHAT_file_get_local_size(file);
 
@@ -498,7 +501,7 @@ file_progress:
   );
 
 file_content:
-  gtk_label_set_text(handle->filename_label, GNUNET_CHAT_file_get_name(file));
+  ui_label_set_text(handle->filename_label, filename);
 
   gtk_stack_set_visible_child(
       handle->content_stack,
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 69200f9..7d68f27 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -37,6 +37,7 @@
 #include "settings.h"
 
 #include "../application.h"
+#include "../ui.h"
 
 static gboolean
 _flap_user_details_reveal_switch(gpointer user_data)
@@ -605,24 +606,22 @@ _messenger_iterate_accounts(void *cls,
   MESSENGER_Application *app = (MESSENGER_Application*) cls;
   UI_MESSENGER_Handle *ui = &(app->ui.messenger);
 
-  const gchar *name = GNUNET_CHAT_account_get_name(account);
+  const char *name = GNUNET_CHAT_account_get_name(account);
 
   UI_ACCOUNT_ENTRY_Handle *entry = ui_account_entry_new(app);
 
-  hdy_avatar_set_text(entry->entry_avatar, name);
-  gtk_label_set_text(entry->entry_label, name);
+  ui_avatar_set_text(entry->entry_avatar, name);
+  ui_label_set_text(entry->entry_label, name);
 
   gtk_list_box_prepend(ui->accounts_listbox, entry->entry_box);
 
-  GtkListBoxRow *row = GTK_LIST_BOX_ROW(
-    gtk_widget_get_parent(entry->entry_box)
-  );
+  GtkWidget *row = gtk_widget_get_parent(entry->entry_box);
 
   g_object_set_qdata(G_OBJECT(row), app->quarks.data, account);
 
   if ((account == GNUNET_CHAT_get_connected(handle)) ||
       ((app->chat.identity) && (0 == g_strcmp0(app->chat.identity, name))))
-    gtk_widget_activate(GTK_WIDGET(row));
+    gtk_widget_activate(row);
 
   ui_account_entry_delete(entry);
   return GNUNET_YES;
@@ -673,13 +672,16 @@ ui_messenger_is_context_active(UI_MESSENGER_Handle *handle,
 
   UI_CHAT_ENTRY_Handle *entry = GNUNET_CHAT_context_get_user_pointer(context);
 
-  if (!entry)
+  if ((!entry) || (!(entry->entry_box)))
     return FALSE;
 
   GtkListBoxRow *row = GTK_LIST_BOX_ROW(
       gtk_widget_get_parent(entry->entry_box)
   );
 
+  if (!row)
+    return FALSE;
+
   return gtk_list_box_row_is_selected(row);
 }
 
diff --git a/src/ui/new_account.c b/src/ui/new_account.c
index a64e016..452000b 100644
--- a/src/ui/new_account.c
+++ b/src/ui/new_account.c
@@ -63,7 +63,9 @@ handle_account_entry_changed(GtkEditable *editable,
   HdyAvatar *avatar = HDY_AVATAR(user_data);
   GtkEntry *entry = GTK_ENTRY(editable);
 
-  hdy_avatar_set_text(avatar, gtk_entry_get_text(entry));
+  const gchar *text = gtk_entry_get_text(entry);
+
+  hdy_avatar_set_text(avatar, text);
 }
 
 static void
diff --git a/src/ui/new_contact.c b/src/ui/new_contact.c
index 7d5d395..094dd67 100644
--- a/src/ui/new_contact.c
+++ b/src/ui/new_contact.c
@@ -49,18 +49,18 @@ handle_confirm_button_click(UNUSED GtkButton *button,
   gchar *emsg = NULL;
   struct GNUNET_CHAT_Uri *uri = GNUNET_CHAT_uri_parse(id_text, &emsg);
 
-  if (uri)
-  {
-    GNUNET_CHAT_lobby_join(app->chat.messenger.handle, uri);
-    GNUNET_CHAT_uri_destroy(uri);
-  }
-
   if (emsg)
   {
-    printf("ERROR: %s\n", emsg);
+    g_printerr("ERROR: %s\n", emsg);
     GNUNET_free(emsg);
   }
 
+  if (!uri)
+    goto close_dialog;
+
+  GNUNET_CHAT_lobby_join(app->chat.messenger.handle, uri);
+  GNUNET_CHAT_uri_destroy(uri);
+
 close_dialog:
   gtk_window_close(GTK_WINDOW(app->ui.new_contact.dialog));
 }
diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index 6b60145..6f76e4f 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -68,7 +68,9 @@ handle_group_entry_changed(GtkEditable *editable,
   HdyAvatar *avatar = HDY_AVATAR(user_data);
   GtkEntry *entry = GTK_ENTRY(editable);
 
-  hdy_avatar_set_text(avatar, gtk_entry_get_text(entry));
+  const gchar *text = gtk_entry_get_text(entry);
+
+  hdy_avatar_set_text(avatar, text);
 }
 
 static void
@@ -166,10 +168,7 @@ _iterate_contacts(void *cls,
       entry->entry_box
   );
 
-  GtkListBoxRow *row = GTK_LIST_BOX_ROW(
-      gtk_widget_get_parent(entry->entry_box)
-  );
-
+  GtkWidget *row = gtk_widget_get_parent(entry->entry_box);
   g_object_set_qdata(G_OBJECT(row), app->quarks.data, contact);
 
   app->ui.new_group.contact_entries = g_list_append(
diff --git a/src/ui/new_platform.c b/src/ui/new_platform.c
index 5eea8d5..1216239 100644
--- a/src/ui/new_platform.c
+++ b/src/ui/new_platform.c
@@ -51,7 +51,11 @@ handle_platform_entry_changed(GtkEditable *editable,
   HdyAvatar *avatar = HDY_AVATAR(user_data);
   GtkEntry *entry = GTK_ENTRY(editable);
 
-  GString *topic_string = g_string_new(gtk_entry_get_text(entry));
+  const gchar *text = gtk_entry_get_text(entry);
+
+  hdy_avatar_set_text(avatar, text);
+
+  GString *topic_string = g_string_new(text);
 
   g_string_prepend_c(topic_string, '#');
   hdy_avatar_set_text(avatar, topic_string->str);
diff --git a/src/ui/send_file.c b/src/ui/send_file.c
index b2e6bb0..52fee25 100644
--- a/src/ui/send_file.c
+++ b/src/ui/send_file.c
@@ -30,6 +30,7 @@
 
 #include "../application.h"
 #include "../file.h"
+#include "../ui.h"
 
 static void
 handle_cancel_button_click(UNUSED GtkButton *button,