[GNUnet-SVN] r20830 - in gnunet-gtk: contrib src/fs src/gns

[gnunet]

Author: grothoff
Date: 2012-04-01 12:05:46 +0200 (Sun, 01 Apr 2012)
New Revision: 20830

Modified:
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
   gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
   gnunet-gtk/src/gns/gnunet-gns-gtk.c
Log:
-making GNS option visible again, fixing compiler errors and warnings

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-04-01 
09:58:45 UTC (rev 20829)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-04-01 
10:05:46 UTC (rev 20830)
@@ -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>

Modified: gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c       2012-04-01 
09:58:45 UTC (rev 20829)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c       2012-04-01 
10:05:46 UTC (rev 20830)
@@ -38,12 +38,12 @@
     /**
      * 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 @@
       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));

Modified: gnunet-gtk/src/gns/gnunet-gns-gtk.c
===================================================================
--- gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-04-01 09:58:45 UTC (rev 20829)
+++ gnunet-gtk/src/gns/gnunet-gns-gtk.c 2012-04-01 10:05:46 UTC (rev 20830)
@@ -315,7 +315,7 @@
 
   /* FIXME: move to new zone 'filename' */
   fprintf (stderr, "Got zone `%s'\n", filename);
-
+  gns++; // fix compiler warning
   GNUNET_free (filename);  
 }