[GNUnet-SVN] r19316 - in gnunet-gtk: contrib src/setup

[gnunet]

Author: grothoff
Date: 2012-01-22 21:06:23 +0100 (Sun, 22 Jan 2012)
New Revision: 19316

Modified:
   gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
   gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
-minor bugfixes

Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-01-22 
20:02:48 UTC (rev 19315)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade       2012-01-22 
20:06:23 UTC (rev 19316)
@@ -141,12 +141,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_exit_checkbutton">
-                                <property name="label" 
translatable="yes">EXIT</property>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
+                                <property name="label" 
translatable="yes">PT/VPN</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property name="tooltip_text" 
translatable="yes">By offering an EXIT service, you can allow other peers to 
use your Internet connection to reach the IPv4 and/or IPv6 Internet.  
Naturally, as your machine will be seen as the origin of the traffic, this 
might be risky in some jurisdictions.  Enabling the exit for IPv4 and IPv6 and 
PT/VPN interception for IPv4 and IPv6 on the same machine will still give you 
4to6 and 6to4 protocol translation, allowing you to access IPv4-only servers 
from IPv6-only clients and IPv6-only servers from IPv4-only clients.</property>
+                                <property name="tooltip_text" 
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet 
traffic over GNUnet.  This is useful if you want to access the IPv4-Internet if 
you only have IPv6-connectivity or vice versa.  Furthermore, if you are only 
connected to other peers using WLAN, you could also get Internet access in the 
first place by routing IP traffic over GNUnet.</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
@@ -158,12 +158,12 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_pt_checkbutton">
-                                <property name="label" 
translatable="yes">PT/VPN</property>
+                              <object class="GtkCheckButton" 
id="GNUNET_setup_general_services_exit_checkbutton">
+                                <property name="label" 
translatable="yes">EXIT</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property name="tooltip_text" 
translatable="yes">Using the PT/VPN subsystems you can tunnel your Internet 
traffic over GNUnet.  This is useful if you want to access the IPv4-Internet if 
you only have IPv6-connectivity or vice versa.  Furthermore, if you are only 
connected to other peers using WLAN, you could also get Internet access in the 
first place by routing IP traffic over GNUnet.</property>
+                                <property name="tooltip_text" 
translatable="yes">By offering an EXIT service, you can allow other peers to 
use your Internet connection to reach the IPv4 and/or IPv6 Internet.  
Naturally, as your machine will be seen as the origin of the traffic, this 
might be risky in some jurisdictions.  Enabling the exit for IPv4 and IPv6 and 
PT/VPN interception for IPv4 and IPv6 on the same machine will still give you 
4to6 and 6to4 protocol translation, allowing you to access IPv4-only servers 
from IPv6-only clients and IPv6-only servers from IPv4-only clients.</property>
                                 <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
@@ -3632,7 +3632,6 @@
             </child>
             <child>
               <object class="GtkVBox" id="GNUNET_SETUP_gns_vbox">
-                <property name="visible">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkVBox" id="vbox1">

Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2012-01-22 20:02:48 UTC (rev 
19315)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2012-01-22 20:06:23 UTC (rev 
19316)
@@ -1484,7 +1484,7 @@
  * Hide "sqlite datacache" tab if sqlite not active.
  */
 static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datacache_tab[] 
= {
-  {"GNUNET_setup_fs_datacache_sqlite_label", "^sqlite$", NULL},
+  {"GNUNET_setup_fs_datacache_sqlite_body_label", "^sqlite$", NULL},
   {NULL, NULL, NULL}
 };
 
@@ -2248,7 +2248,7 @@
   /* VPN/PT service */
 
   {
-   "GNUNET_setup_general_services_vpn_checkbutton",
+   "GNUNET_setup_general_services_pt_checkbutton",
    "toggled",
    "arm",
    "DEFAULTSERVICES",