-making GNS option visible again, fixing compiler errors and warnings

3 files changed, 5 insertions, 4 deletions

diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index b6c3fe80..fd11638d 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -229,6 +229,7 @@
                             <child>
                               <object class="GtkCheckButton" id="GNUNET_setup_general_services_gns_checkbutton">
                                 <property name="label" translatable="yes">GNS</property>
+                                <property name="visible">True</property>
                                 <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
diff --git a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
index 42ab0ca8..8cec9a82 100644
--- a/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+++ b/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
@@ -38,12 +38,12 @@ enum FS_SelectPseudonymModelColumns
     /**
      * A gchararray
      */
-    FS_SELECT_PSEUDONYM_NAMESPACE_NAME = 0,
+    FS_SELECT_PSEUDONYM_NAMESPACE_MC_NAME = 0,
 
     /**
      * A gpointer
      */
-    FS_SELECT_PSEUDONYM_NAMESPACE_HANDLE = 1,
+    FS_SELECT_PSEUDONYM_NAMESPACE_MC_HANDLE = 1,
   };
 
 
@@ -238,7 +238,7 @@ GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget *widget,
       struct GNUNET_FS_Namespace *nso;
 
       gtk_tree_model_get (tm, &iter,
-                          FS_SELECT_PSEUDONYM_NAMESPACE_HANDLE, &nso, -1);
+                          FS_SELECT_PSEUDONYM_NAMESPACE_MC_HANDLE, &nso, -1);
       GNUNET_FS_namespace_delete (nso, GNUNET_NO);
     }
     while (gtk_tree_model_iter_next (tm, &iter));
diff --git a/src/gns/gnunet-gns-gtk.c b/src/gns/gnunet-gns-gtk.c
index afd3a90a..29a6897e 100644
--- a/src/gns/gnunet-gns-gtk.c
+++ b/src/gns/gnunet-gns-gtk.c
@@ -315,7 +315,7 @@ GNUNET_GNS_GTK_zone_open_dialog_response_cb (GtkDialog * dialog,
 
   /* FIXME: move to new zone 'filename' */
   fprintf (stderr, "Got zone `%s'\n", filename);
-
+  gns++; // fix compiler warning
   GNUNET_free (filename);  
 }