6 files changed, 34 insertions, 39 deletions

diff --git a/src/ui/chat.c b/src/ui/chat.c
index 67080bb..92dbdec 100644
--- a/src/ui/chat.c
+++ b/src/ui/chat.c
@@ -358,11 +358,8 @@ iterate_ui_chat_update_group_contacts(void *cls,
 
   const char *name = GNUNET_CHAT_contact_get_name(contact);
 
-  if (name)
-  {
-    gtk_label_set_text(entry->entry_label, name);
-    hdy_avatar_set_text(entry->entry_avatar, name);
-  }
+  gtk_label_set_text(entry->entry_label, name? name : "");
+  hdy_avatar_set_text(entry->entry_avatar, name? name : "");
 
   gtk_list_box_prepend(listbox, entry->entry_box);
 
@@ -388,18 +385,32 @@ ui_chat_update(UI_CHAT_Handle *handle,
   group = GNUNET_CHAT_context_get_group(context);
 
   const char *title = NULL;
+  GString *subtitle = g_string_new("");
 
   if (contact)
     title = GNUNET_CHAT_contact_get_name(contact);
   else if (group)
+  {
     title = GNUNET_CHAT_group_get_name(group);
 
+    g_string_append_printf(
+        subtitle,
+        "%d members",
+        GNUNET_CHAT_group_iterate_contacts(group, NULL, NULL)
+    );
+  }
+
   if (title)
   {
     gtk_label_set_text(handle->chat_title, title);
     gtk_label_set_text(handle->chat_details_label, title);
   }
 
+  if (subtitle->len > 0)
+    gtk_label_set_text(handle->chat_subtitle, subtitle->str);
+
+  g_string_free(subtitle, TRUE);
+
   GList* children = gtk_container_get_children(
       GTK_CONTAINER(handle->chat_contacts_listbox)
   );
@@ -408,6 +419,9 @@ ui_chat_update(UI_CHAT_Handle *handle,
     GtkWidget *widget = GTK_WIDGET(children->data);
     children = children->next;
 
+    if (g_hash_table_contains(app->ui.bindings, widget))
+      g_hash_table_remove(app->ui.bindings, widget);
+
     gtk_container_remove(
         GTK_CONTAINER(handle->chat_contacts_listbox),
         widget
diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index 842cfb5..8fd38e0 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -147,7 +147,7 @@ void
 ui_contacts_dialog_init(MESSENGER_Application *app,
                         UI_CONTACTS_Handle *handle)
 {
-  handle->contact_entries = g_list_alloc();
+  handle->contact_entries = NULL;
 
   handle->builder = gtk_builder_new_from_file("resources/ui/contacts.ui");
 
@@ -225,5 +225,6 @@ ui_contacts_dialog_cleanup(UI_CONTACTS_Handle *handle)
     list = list->next;
   }
 
-  g_list_free(handle->contact_entries);
+  if (handle->contact_entries)
+    g_list_free(handle->contact_entries);
 }
diff --git a/src/ui/message.c b/src/ui/message.c
index def4524..cacf666 100644
--- a/src/ui/message.c
+++ b/src/ui/message.c
@@ -27,8 +27,7 @@
 #include "../application.h"
 
 UI_MESSAGE_Handle*
-ui_message_new(MESSENGER_Application *app,
-               UI_MESSAGE_Type type)
+ui_message_new(UI_MESSAGE_Type type)
 {
   UI_MESSAGE_Handle* handle = g_malloc(sizeof(UI_MESSAGE_Handle));
 
@@ -63,14 +62,6 @@ ui_message_new(MESSENGER_Application *app,
       gtk_builder_get_object(handle->builder, "sender_label")
   );
 
-  if (UI_MESSAGE_SENT == handle->type)
-  {
-    const char *sender = GNUNET_CHAT_get_name(app->chat.messenger.handle);
-
-    hdy_avatar_set_text(handle->sender_avatar, sender);
-    gtk_label_set_text(handle->sender_label, sender);
-  }
-
   handle->text_label = GTK_LABEL(
       gtk_builder_get_object(handle->builder, "text_label")
   );
diff --git a/src/ui/message.h b/src/ui/message.h
index 333ef75..a17247c 100644
--- a/src/ui/message.h
+++ b/src/ui/message.h
@@ -59,8 +59,7 @@ typedef struct UI_MESSAGE_Handle
 } UI_MESSAGE_Handle;
 
 UI_MESSAGE_Handle*
-ui_message_new(MESSENGER_Application *app,
-               UI_MESSAGE_Type type);
+ui_message_new(UI_MESSAGE_Type type);
 
 void
 ui_message_delete(UI_MESSAGE_Handle *handle);
diff --git a/src/ui/messenger.c b/src/ui/messenger.c
index 1d09608..afa444b 100644
--- a/src/ui/messenger.c
+++ b/src/ui/messenger.c
@@ -192,7 +192,7 @@ void
 ui_messenger_init(MESSENGER_Application *app,
                   UI_MESSENGER_Handle *handle)
 {
-  handle->chat_entries = g_list_alloc();
+  handle->chat_entries = NULL;
 
   handle->builder = gtk_builder_new_from_file("resources/ui/messenger.ui");
 
@@ -401,14 +401,9 @@ ui_messenger_cleanup(UI_MESSENGER_Handle *handle)
 {
   g_object_unref(handle->builder);
 
-  GList *list = handle->chat_entries;
+  for (GList *list = handle->chat_entries; list; list = list->next)
+    ui_chat_entry_delete((UI_CHAT_ENTRY_Handle*) list->data);
 
-  while (list) {
-    if (list->data)
-      ui_chat_entry_delete((UI_CHAT_ENTRY_Handle*) list->data);
-
-    list = list->next;
-  }
-
-  g_list_free(handle->chat_entries);
+  if (handle->chat_entries)
+    g_list_free(handle->chat_entries);
 }
diff --git a/src/ui/new_group.c b/src/ui/new_group.c
index ea19371..6355fcd 100644
--- a/src/ui/new_group.c
+++ b/src/ui/new_group.c
@@ -207,7 +207,7 @@ void
 ui_new_group_dialog_init(MESSENGER_Application *app,
                          UI_NEW_GROUP_Handle *handle)
 {
-  handle->contact_entries = g_list_alloc();
+  handle->contact_entries = NULL;
 
   handle->builder = gtk_builder_new_from_file("resources/ui/new_group.ui");
 
@@ -340,14 +340,9 @@ ui_new_group_dialog_cleanup(UI_NEW_GROUP_Handle *handle)
 {
   g_object_unref(handle->builder);
 
-  GList *list = handle->contact_entries;
+  for (GList *list = handle->contact_entries; list; list = list->next)
+    ui_contact_entry_delete((UI_CONTACT_ENTRY_Handle*) list->data);
 
-  while (list) {
-    if (list->data)
-      ui_contact_entry_delete((UI_CONTACT_ENTRY_Handle*) list->data);
-
-    list = list->next;
-  }
-
-  g_list_free(handle->contact_entries);
+  if (handle->contact_entries)
+    g_list_free(handle->contact_entries);
 }