2 files changed, 62 insertions, 15 deletions

diff --git a/src/ui/accounts.c b/src/ui/accounts.c
index 1817180..fcd4ad9 100644
--- a/src/ui/accounts.c
+++ b/src/ui/accounts.c
@@ -181,18 +181,11 @@ ui_accounts_dialog_init(MESSENGER_Application *app,
       G_CALLBACK(handle_dialog_destroy),
       app
   );
-
-  GNUNET_CHAT_iterate_accounts(
-      app->chat.messenger.handle,
-      _iterate_accounts,
-      app
-  );
-
-  gtk_list_box_unselect_all(handle->accounts_listbox);
 }
 
-void
-ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle)
+static void
+_clear_accounts_listbox_rows(UI_ACCOUNTS_Handle *handle,
+                             gboolean bindings_only)
 {
   GList *list = gtk_container_get_children(
       GTK_CONTAINER(handle->accounts_listbox)
@@ -200,15 +193,28 @@ ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle)
 
   while (list)
   {
-    if (list->data)
-      g_hash_table_remove(handle->bindings, list->data);
+    GtkListBoxRow *row = GTK_LIST_BOX_ROW(list->data);
 
+    if ((!row) || (!gtk_list_box_row_get_selectable(row)))
+      goto skip_row;
+
+    g_hash_table_remove(handle->bindings, row);
+
+    if (!bindings_only)
+      gtk_container_remove(
+          GTK_CONTAINER(handle->accounts_listbox),
+          GTK_WIDGET(row)
+      );
+
+  skip_row:
     list = list->next;
   }
+}
 
-  g_object_unref(handle->builder);
-
-  list = handle->account_entries;
+static void
+_clear_accounts_entries(UI_ACCOUNTS_Handle *handle)
+{
+  GList *list = handle->account_entries;
 
   while (list) {
     if (list->data)
@@ -219,4 +225,41 @@ ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle)
 
   if (handle->account_entries)
     g_list_free(handle->account_entries);
+
+  handle->account_entries = NULL;
+}
+
+void
+ui_accounts_dialog_refresh(MESSENGER_Application *app,
+                           UI_ACCOUNTS_Handle *handle)
+{
+  if (!(handle->accounts_listbox))
+    return;
+
+  if (!(handle->account_entries))
+    goto add_account_entries;
+
+  _clear_accounts_listbox_rows(handle, FALSE);
+  _clear_accounts_entries(handle);
+
+add_account_entries:
+  GNUNET_CHAT_iterate_accounts(
+      app->chat.messenger.handle,
+      _iterate_accounts,
+      app
+  );
+
+  gtk_list_box_unselect_all(handle->accounts_listbox);
+}
+
+void
+ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle)
+{
+  _clear_accounts_listbox_rows(handle, TRUE);
+
+  g_object_unref(handle->builder);
+
+  _clear_accounts_entries(handle);
+
+  handle->accounts_listbox = NULL;
 }
diff --git a/src/ui/accounts.h b/src/ui/accounts.h
index 254c861..6a098d8 100644
--- a/src/ui/accounts.h
+++ b/src/ui/accounts.h
@@ -46,6 +46,10 @@ ui_accounts_dialog_init(MESSENGER_Application *app,
                         UI_ACCOUNTS_Handle *handle);
 
 void
+ui_accounts_dialog_refresh(MESSENGER_Application *app,
+                           UI_ACCOUNTS_Handle *handle);
+
+void
 ui_accounts_dialog_cleanup(UI_ACCOUNTS_Handle *handle);
 
 #endif /* UI_ACCOUNTS_H_ */