-implementing 2467

2 files changed, 31 insertions, 7 deletions

diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index 85d87060..83ab55ba 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -4508,8 +4508,8 @@
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="expand">True</property>
-                                    <property name="fill">True</property>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -4587,8 +4587,8 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
diff --git a/src/setup/gnunet-setup-gns.c b/src/setup/gnunet-setup-gns.c
index 6717d563..4cea2bd9 100644
--- a/src/setup/gnunet-setup-gns.c
+++ b/src/setup/gnunet-setup-gns.c
@@ -1823,27 +1823,51 @@ load_zone (const char *zonename)
 }
 
 
+/**
+ * A different zone was selected in the zone toggle bar.  Load the
+ * appropriate zone.
+ *
+ * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
+ * @param user_data builder, unused
+ */
 void 
 GNUNET_setup_gns_shorten_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                 gpointer user_data)
 {
-  GNUNET_break (0);
+  if (gtk_toggle_button_get_active (togglebutton))
+    load_zone ("SHORTEN_ZONEKEY");
 }
 
 
+/**
+ * A different zone was selected in the zone toggle bar.  Load the
+ * appropriate zone.
+ *
+ * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
+ * @param user_data builder, unused
+ */
 void 
 GNUNET_setup_gns_private_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                 gpointer user_data)
 {
-  GNUNET_break (0);
+  if (gtk_toggle_button_get_active (togglebutton))
+    load_zone ("PRIVATE_ZONEKEY");
 }
 
 
+/**
+ * A different zone was selected in the zone toggle bar.  Load the
+ * appropriate zone.
+ *
+ * @param togglebutton button that was toggled (could be to "on" or "off", we only react to "on")
+ * @param user_data builder, unused
+ */
 void 
 GNUNET_setup_gns_master_zone_selection_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
                                                                gpointer user_data)
 {
-  GNUNET_break (0);
+  if (gtk_toggle_button_get_active (togglebutton))
+    load_zone ("ZONEKEY");
 }