-fix

3 files changed, 37 insertions, 25 deletions

diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index 48fdfecf..253d6703 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -4523,7 +4523,7 @@
                       </object>
                     </child>
                     <child type="label">
-                      <object class="GtkLabel" id="GNUNET_GNS_GTK_zone_label">
+                      <object class="GtkLabel" id="GNUNET_setup_gns_zone_label">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;SET TO PUBLIC KEY OF THE ZONE&lt;/b&gt;</property>
@@ -4539,8 +4539,20 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkScrolledWindow" id="GNUNET_setup_gns_main_scrolledwindow">
+                  <object class="GtkLabel" id="GNUNET_setup_gns_status_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">&lt;b&gt;&lt;big&gt;Loading...&lt;/big&gt;&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkScrolledWindow" id="GNUNET_setup_gns_main_scrolledwindow">
                     <property name="can_focus">True</property>
                     <property name="hscrollbar_policy">automatic</property>
                     <property name="vscrollbar_policy">automatic</property>
@@ -4648,7 +4660,7 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index 7ea8c6c3..229e4b38 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -180,7 +180,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     return;
   if (NULL != gns->ns)
   {
-    GNUNET_NAMESTORE_disconnect (gns->ns, GNUNET_NO);
+    GNUNET_NAMESTORE_disconnect (gns->ns);
     gns->ns = NULL;
   }
   if (NULL != gns->pkey)
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index a3feb96b..d4f73381 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -1202,8 +1202,8 @@ zone_iteration_proc (void *cls,
     GNUNET_free (zc_ctx->label);
     GNUNET_free (zc_ctx);
 
-    /* FIXME: hide message 'loading' and make tree view visible! */
-
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label")));
+    gtk_widget_show (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_gns_main_scrolledwindow")));
     return;
   }
 
@@ -1348,8 +1348,6 @@ GNUNET_SETUP_gns_pseu_entry_enter_cb (GtkWidget *widget,
 }
 
 
-
-
 /**
  * The user edited the preferred name (PSEU) of this namespace.
  * Push the update to the namestore.
@@ -1415,6 +1413,7 @@ GNUNET_SETUP_gns_init ()
   char *servicehome;
   struct ZoneIteration_Context *zc_ctx;
   GtkTreeIter toplevel;
+  GtkLabel *status_label;
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg,
                                                             "PATHS",
@@ -1435,21 +1434,23 @@ GNUNET_SETUP_gns_init ()
                                                             "ZONEKEY",
                                                             &keyfile))
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Option `%s' missing in section `%s'\n"), "ZONEKEY", "gns");
-    /* FIXME: display error message in GNS tab! */
+    status_label = GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label"));
+    label = g_markup_printf_escaped (_("Option `%s' missing in section `%s'\n"), 
+                                     "ZONEKEY", "gns");
+    gtk_label_set_markup (status_label, label);
+    g_free (label);                       
     return;
   }
-  else
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using `%s'\n", keyfile);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Using `%s'\n", keyfile);
   pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
   GNUNET_free (keyfile);
   keyfile = NULL;
   if (NULL == pkey)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to read or create private zone key\n"));
-    /* FIXME: display error message in GNS tab! */
+    status_label = GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label"));
+    label = g_markup_printf_escaped (_("Failed to read or create private zone key\n"));
+    gtk_label_set_markup (status_label, label);
+    g_free (label);                       
     return;
   }
   GNUNET_CRYPTO_rsa_key_get_public (pkey, &pubkey);
@@ -1462,20 +1463,20 @@ GNUNET_SETUP_gns_init ()
   namestore = GNUNET_NAMESTORE_connect (cfg);
   if (NULL == namestore)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                _("Failed to connect to namestore\n"));
-    /* FIXME: display error message in GNS tab! */
+    status_label = GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_status_label"));
+    label = g_markup_printf_escaped (_("<b><big>Failed to connect to namestore</b></big>"));
+    gtk_label_set_markup (status_label, label);
+    g_free (label);                       
     return;
   }
-  /* FIXME: adjust names below... */
-  ts  = GTK_TREE_STORE (GNUNET_SETUP_get_object ("GNUNET_SETUP_gns_treestore"));
-  ls =  GTK_LIST_STORE (GNUNET_SETUP_get_object ("GNUNET_SETUP_gns_type_liststore"));
-  tv =  GTK_TREE_VIEW (GNUNET_SETUP_get_object ("GNUNET_SETUP_gns_main_treeview"));
+  ts  = GTK_TREE_STORE (GNUNET_SETUP_get_object ("GNUNET_setup_gns_treestore"));
+  ls =  GTK_LIST_STORE (GNUNET_SETUP_get_object ("GNUNET_setup_gns_type_liststore"));
+  tv =  GTK_TREE_VIEW (GNUNET_SETUP_get_object ("GNUNET_setup_gns_main_treeview"));
   tm = GTK_TREE_MODEL(ts);  
   zone_as_string = GNUNET_strdup ((char *) &shenc);
   label = g_markup_printf_escaped (_("<b>Editing zone %s</b>"),
                                   zone_as_string);
-  gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_SETUP_gns_zone_label")),
+  gtk_label_set_markup (GTK_LABEL (GNUNET_SETUP_get_object ("GNUNET_setup_gns_zone_label")),
                        label);
   g_free (label);
 
@@ -1497,7 +1498,6 @@ GNUNET_SETUP_gns_init ()
                                                       GNUNET_NAMESTORE_RF_NONE,
                                                       &zone_iteration_proc,
                                                       zc_ctx);
-  /* FIXME: show message 'loading', when done make tree view visible! */
 }