From 44168e4df343175cce4d30862ad74fea465c0c0d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 22 Jan 2012 20:06:23 +0000
Subject: -minor bugfixes

---
 contrib/gnunet_setup_gtk_main_window.glade | 13 ++++++-------
 src/setup/gnunet-setup-options.c           |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index d745e45f..f0cc83d1 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -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">
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 79b277f2..46ce9dbb 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1484,7 +1484,7 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_postgres_datastore_tab[]
  * 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 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   /* VPN/PT service */
 
   {
-   "GNUNET_setup_general_services_vpn_checkbutton",
+   "GNUNET_setup_general_services_pt_checkbutton",
    "toggled",
    "arm",
    "DEFAULTSERVICES",
-- 
cgit v1.2.3