1 files changed, 13 insertions, 47 deletions

diff --git a/src/ui/contacts.c b/src/ui/contacts.c
index 21d2f2f..68d18b4 100644
--- a/src/ui/contacts.c
+++ b/src/ui/contacts.c
@@ -61,7 +61,7 @@ handle_contacts_listbox_row_activated(UNUSED GtkListBox* listbox,
   }
 
   struct GNUNET_CHAT_Contact *contact = (struct GNUNET_CHAT_Contact*) (
-      bindings_get(app->bindings, row)
+      g_object_get_qdata(G_OBJECT(row), app->quarks.data)
   );
 
   if ((!contact) || (!GNUNET_CHAT_contact_get_key(contact)) ||
@@ -86,20 +86,20 @@ static gboolean
 handle_contacts_listbox_filter_func(GtkListBoxRow *row,
                                     gpointer user_data)
 {
-  UI_CONTACTS_Handle *handle = (UI_CONTACTS_Handle*) user_data;
+  MESSENGER_Application *app = (MESSENGER_Application*) user_data;
 
   if ((!row) || (!gtk_list_box_row_get_selectable(row)))
     return TRUE;
 
   const gchar *filter = gtk_entry_get_text(
-      GTK_ENTRY(handle->contact_search_entry)
+      GTK_ENTRY(app->ui.contacts.contact_search_entry)
   );
 
   if (!filter)
     return TRUE;
 
   UI_CONTACT_ENTRY_Handle *entry = (UI_CONTACT_ENTRY_Handle*) (
-      bindings_get(handle->bindings, row)
+      g_object_get_qdata(G_OBJECT(row), app->quarks.ui)
   );
 
   if (!entry)
@@ -151,8 +151,14 @@ _iterate_contacts(void *cls,
       gtk_widget_get_parent(entry->entry_box)
   );
 
-  bindings_put(app->bindings, row, contact);
-  bindings_put(app->ui.contacts.bindings, row, entry);
+  g_object_set_qdata(G_OBJECT(row), app->quarks.data, contact);
+
+  g_object_set_qdata_full(
+      G_OBJECT(row),
+      app->quarks.ui,
+      entry,
+      (GDestroyNotify) ui_contact_entry_delete
+  );
 
   return GNUNET_YES;
 }
@@ -161,8 +167,6 @@ void
 ui_contacts_dialog_init(MESSENGER_Application *app,
                         UI_CONTACTS_Handle *handle)
 {
-  handle->bindings = bindings_create();
-
   handle->builder = gtk_builder_new_from_resource(
       application_get_resource_path(app, "ui/contacts.ui")
   );
@@ -187,7 +191,7 @@ ui_contacts_dialog_init(MESSENGER_Application *app,
   gtk_list_box_set_filter_func(
       handle->contacts_listbox,
       handle_contacts_listbox_filter_func,
-      handle,
+      app,
       NULL
   );
 
@@ -232,48 +236,10 @@ ui_contacts_dialog_init(MESSENGER_Application *app,
   gtk_list_box_invalidate_filter(handle->contacts_listbox);
 }
 
-static void
-_clear_contacts_listbox_rows(UI_CONTACTS_Handle *handle,
-                             gboolean bindings_only)
-{
-  GList *list = gtk_container_get_children(
-      GTK_CONTAINER(handle->contacts_listbox)
-  );
-
-  while (list)
-  {
-    GtkListBoxRow *row = GTK_LIST_BOX_ROW(list->data);
-
-    if ((!row) || (!gtk_list_box_row_get_selectable(row)))
-      goto skip_row;
-
-    if (!bindings_only)
-      gtk_container_remove(
-          GTK_CONTAINER(handle->contacts_listbox),
-          GTK_WIDGET(row)
-      );
-
-    bindings_remove(
-        handle->bindings,
-        row,
-        NULL,
-        (GDestroyNotify) ui_contact_entry_delete
-    );
-
-  skip_row:
-    list = list->next;
-  }
-}
-
 void
 ui_contacts_dialog_cleanup(UI_CONTACTS_Handle *handle)
 {
-  _clear_contacts_listbox_rows(handle, TRUE);
-
   g_object_unref(handle->builder);
 
-  bindings_destroy(handle->bindings);
-  handle->bindings = NULL;
-
   handle->contacts_listbox = NULL;
 }