[GNUnet-SVN] r15485 - in gnunet-setup: contrib src

[gnunet]

Author: grothoff
Date: 2011-06-09 13:40:53 +0200 (Thu, 09 Jun 2011)
New Revision: 15485

Modified:
   gnunet-setup/contrib/gnunet-setup.glade
   gnunet-setup/src/gnunet-setup-options.c
Log:
fixes

Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade     2011-06-09 11:37:30 UTC (rev 
15484)
+++ gnunet-setup/contrib/gnunet-setup.glade     2011-06-09 11:40:53 UTC (rev 
15485)
@@ -2923,17 +2923,8 @@
                 <property name="tab_fill">False</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkScrolledWindow" 
id="GNUNET_setup_vpn_scrolledwindow">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="hscrollbar_policy">never</property>
-               <property name="vscrollbar_policy">automatic</property>
-                <property name="shadow_type">in</property>
-                <child>
-                  <object class="GtkViewport" id="GNUNET_setup_vpn_viewport">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+
+
                     <child>
                       <object class="GtkVBox" id="GNUNET_setup_vpn_vbox">
                         <property name="visible">True</property>
@@ -3447,6 +3438,20 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="left_padding">12</property>
+
+
+            <child>
+              <object class="GtkScrolledWindow" 
id="GNUNET_setup_vpn_dns_service_scrolledwindow">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="hscrollbar_policy">never</property>
+               <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkViewport" id="GNUNET_setup_vpn_viewport">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+
                                 <child>
                                   <object class="GtkTreeView" 
id="GNUNET_setup_vpn_dns_service_treeview">
                                     <property name="visible">True</property>
@@ -3551,6 +3556,11 @@
                                 </child>
                               </object>
                             </child>
+              </object>
+                </child>
+                  </object>
+                    </child>
+
                             <child type="label">
                               <object class="GtkLabel" 
id="GNUNET_setup_vpn_dns_service_configuration_frame_label">
                                 <property name="visible">True</property>
@@ -3568,10 +3578,6 @@
                           </packing>
                         </child>
                       </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
               <packing>
                 <property name="position">4</property>
               </packing>

Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c     2011-06-09 11:37:30 UTC (rev 
15484)
+++ gnunet-setup/src/gnunet-setup-options.c     2011-06-09 11:40:53 UTC (rev 
15485)
@@ -1389,7 +1389,7 @@
  */
 static struct GNUNET_SETUP_VisibilitySpecification hide_vpn_tab[] =
 {
-  { "GNUNET_setup_vpn_scrolledwindow", "(^| )vpn($| )", NULL },
+  { "GNUNET_setup_vpn_vbox", "(^| )vpn($| )", NULL },
   { NULL, NULL, NULL }
 };