1 files changed, 69 insertions, 13 deletions

diff --git a/src/namestore/gnunet-namestore-gtk.c b/src/namestore/gnunet-namestore-gtk.c
index 2258b5bc..60ab84d5 100644
--- a/src/namestore/gnunet-namestore-gtk.c
+++ b/src/namestore/gnunet-namestore-gtk.c
@@ -902,12 +902,6 @@ handle_records_for_merge (void *cls,
 {
   struct MoveOperationContext *moc = cls;
 
-  if (NULL == label)
-  {
-    moc->it = NULL;
-    merge_with_existing_records (moc, 0, NULL);
-    return;
-  }
   if (0 != strcmp (label,
                    moc->edc->name))
   {
@@ -921,6 +915,40 @@ handle_records_for_merge (void *cls,
 
 
 /**
+ * Error communicating with database, complain to user.
+ *
+ * @param cls the `struct MoveOperationContext`
+ */
+static void
+handle_records_for_merge_error (void *cls)
+{
+  struct MoveOperationContext *moc = cls;
+  struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = moc->edc;
+
+  show_error_message (_("Failed to communicate with database"),
+                      _("Check that your peer is configured correctly."));
+  GNUNET_free (moc->data);
+  GNUNET_free (moc);
+  free_edit_dialog_context (edc);
+}
+
+
+/**
+ * Finished zone iteration.  Proceed.
+ *
+ * @param cls the `struct MoveOperationContext`
+ */
+static void
+handle_records_for_merge_end (void *cls)
+{
+  struct MoveOperationContext *moc = cls;
+
+  moc->it = NULL;
+  merge_with_existing_records (moc, 0, NULL);
+}
+
+
+/**
  * The edit dialog completed; update the namestore and the
  * view based on the new values in @a edc.
  *
@@ -1069,8 +1097,12 @@ edit_dialog_continuation (struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc,
       GNUNET_CONTAINER_DLL_insert (moc_head, moc_tail, moc);
       moc->it = GNUNET_NAMESTORE_zone_iteration_start (namestore,
                                                        pk,
+                                                       &handle_records_for_merge_error,
+                                                       moc,
                                                        &handle_records_for_merge,
-                                               moc);
+                                                       moc,
+                                                       &handle_records_for_merge_end,
+                                                       moc);
       /* zone changed, remove record from old zone, add to new zone! */
       if (GNUNET_YES == edc->old_record_in_namestore)
       {
@@ -2237,6 +2269,33 @@ zone_sync_proc (void *cls)
 
 
 /**
+ * Function called once our model is again inconsistent with
+ * the current zone.  Hides the view.
+ *
+ * @param cls NULL
+ */
+static void
+zone_iteration_error (void *cls)
+{
+  clear_zone_view ();
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_pseu_hbox")));
+#if HAVE_QRENCODE_H
+  setup_qrcode ();
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_saveas_button")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_vseparator")));
+#else
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_image")));
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_saveas_button")));
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_qr_vseparator")));
+#endif
+  gtk_widget_show (GTK_WIDGET (get_object ("gnunet_namestore_gtk_status_label")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_scrolledwindow")));
+  gtk_widget_hide (GTK_WIDGET (get_object ("gnunet_namestore_gtk_zone_combobox")));
+}
+
+
+/**
  * Function called for each record in the current zone.  Update the
  * widgets accordingly.
  *
@@ -2272,12 +2331,6 @@ zone_iteration_proc (void *cls,
   GtkTreeIter sel_iter;
   GtkTreePath *sel_path;
 
-  if ((NULL == zone_key) && (NULL == name))
-  {
-    /* disconnect from namestore, clear view */
-    clear_zone_view ();
-    return;
-  }
   if ( (GNUNET_SYSERR == GNUNET_DNSPARSER_check_label (name)) &&
        (0 != strcmp (name, GNUNET_GNS_MASTERZONE_STR)) )
   {
@@ -2553,7 +2606,10 @@ load_zone (const char *name,
 #endif
   zmon = GNUNET_NAMESTORE_zone_monitor_start (cfg, pkey,
                                               GNUNET_YES,
+                                              &zone_iteration_error,
+                                              NULL,
                                               &zone_iteration_proc,
+                                              NULL,
                                               &zone_sync_proc,
                                               NULL);
 }