1 files changed, 7 insertions, 12 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