make namestore API less brittle/sublte to use

1 files changed, 21 insertions, 5 deletions

diff --git a/src/fs/gnunet-fs-gtk.c b/src/fs/gnunet-fs-gtk.c
index c00a764f..cbbc1984 100644
--- a/src/fs/gnunet-fs-gtk.c
+++ b/src/fs/gnunet-fs-gtk.c
@@ -562,6 +562,24 @@ service_status_change (void *cls,
 }
 
 
+static void
+monitor_zone_error (void *cls)
+{
+  GtkListStore *ls;
+
+  ls = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("namespace_label_liststore"));
+  gtk_list_store_clear (ls);
+  gtk_widget_hide (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
+}
+
+
+static void
+monitor_zone_sync (void *cls)
+{
+  gtk_widget_show (GTK_WIDGET (GNUNET_FS_GTK_get_main_window_object ("main_window_search_namespace_combobox")));
+}
+
+
 /**
  * Process a record that was stored in the namestore in the
  * "sks_zone".  Adds (or removes) the respective label to the
@@ -588,11 +606,6 @@ monitor_zone_records (void *cls,
   gchar *label_gnu;
 
   ls = GTK_LIST_STORE (GNUNET_FS_GTK_get_main_window_object ("namespace_label_liststore"));
-  if (NULL == zone)
-  {
-    gtk_list_store_clear (ls);
-    return;
-  }
   label_gnu = g_strdup_printf ("%s.%s",
                                label,
                                "gnu");
@@ -660,8 +673,11 @@ handle_sks_zone_identity (void *cls,
   main_context.zm = GNUNET_NAMESTORE_zone_monitor_start (main_context.cfg,
                                                          main_context.sks_zone,
                                                          GNUNET_YES,
+                                                         &monitor_zone_error,
+                                                         NULL,
                                                          &monitor_zone_records,
                                                          NULL,
+                                                         &monitor_zone_sync,
                                                          NULL);
 }