1 files changed, 17 insertions, 8 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index e9010c7d..302c28ba 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -172,13 +172,6 @@ display_record (void *cls,
   gboolean is_public;
   char *value;
 
-  if (NULL == zone_key)
-  {
-    /* disconnect, clear (and possibly freeze) view */
-    gtk_list_store_clear (contacts_liststore);
-    gtk_widget_hide (contacts_treeview);
-    return;
-  }
   do_display = FALSE;
   value = NULL;
   for (i = 0; i < rd_len; i++)
@@ -290,6 +283,20 @@ unfreeze_view (void *cls)
 
 
 /**
+ * Function called once the monitor has disconnected from the
+ * database.
+ *
+ * @param cls closure
+ */
+static void
+freeze_view (void *cls)
+{
+  gtk_list_store_clear (contacts_liststore);
+  gtk_widget_hide (contacts_treeview);
+}
+
+
+/**
  * A different zone was selected in the zone toggle bar.  Load the
  * appropriate zone.
  *
@@ -322,7 +329,10 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   zone_mon = GNUNET_NAMESTORE_zone_monitor_start (GCG_get_configuration (),
                                                   temp_zone_pkey,
                                                   GNUNET_YES,
+                                                  &freeze_view,
+                                                  NULL,
                                                   &display_record,
+                                                  NULL,
                                                   &unfreeze_view,
                                                   NULL);
 }
@@ -451,4 +461,3 @@ GCG_CONTACTS_shutdown ()
 }
 
 /* end of gnunet-conversation-gtk_contacts.c */
-