gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [gnunet-gtk] branch master updated: remove a bunch of depre


From: gnunet
Subject: [GNUnet-SVN] [gnunet-gtk] branch master updated: remove a bunch of deprecated Gtk options for gnunet-setup
Date: Thu, 09 Mar 2017 00:42:26 +0100

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet-gtk.

The following commit(s) were added to refs/heads/master by this push:
     new a5820483 remove a bunch of deprecated Gtk options for gnunet-setup
a5820483 is described below

commit a58204836147e7093e5b741513584772b47fc3ea
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Mar 9 00:42:23 2017 +0100

    remove a bunch of deprecated Gtk options for gnunet-setup
---
 contrib/gnunet_setup_main_window.glade    | 286 +++++++++---------------------
 src/setup/gnunet-setup-namestore-config.c |  24 ---
 src/setup/gnunet-setup-options.c          | 123 +------------
 3 files changed, 87 insertions(+), 346 deletions(-)

diff --git a/contrib/gnunet_setup_main_window.glade 
b/contrib/gnunet_setup_main_window.glade
index f5cf9967..6f505b44 100644
--- a/contrib/gnunet_setup_main_window.glade
+++ b/contrib/gnunet_setup_main_window.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
@@ -425,7 +425,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">The topology subsystem is required as it ensures that your 
peer connects to other peers.</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -443,7 +442,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Hostlist servers are used to find other peers.  Here you can 
choose to offer a hostlist or simply configure which hostlists by other peers 
you want to use.</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -462,7 +460,6 @@
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Enable GNUnet's file-sharing subsystem.</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -481,7 +478,6 @@
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">Using the VPN subsystem you can tunnel your Internet traffic 
over GNUnet to a GNUnet exit. This can be used to access GNUnet-specific 
services hosted by other peer.  </property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -498,7 +494,6 @@
                                 <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.  PT adds "protocol translation", which is useful if you 
want to access the IPv4-Internet if you only have IPv6-connectivity or vice 
versa.  </property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -516,7 +511,6 @@
                                 <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 [...]
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -534,7 +528,6 @@
                                 <property 
name="receives_default">False</property>
                                 <property name="tooltip_text" 
translatable="yes">The GNS is GNUnet's replacement for DNS.  Enabling this 
subsystem will make the ".gnunet" TLD available on your system.  You will be in 
charge of your ".gnunet" TLD.</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -586,7 +579,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                               </object>
                               <packing>
@@ -707,7 +699,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -723,7 +714,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -755,7 +745,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <signal name="realize" 
handler="GNUNET_setup_hostlist_offer_hostlist_checkbutton_realize_cb" 
swapped="no"/>
                                       </object>
@@ -771,7 +760,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <signal name="realize" 
handler="GNUNET_setup_hostlist_advertise_checkbutton_realize_cb" swapped="no"/>
                                       </object>
@@ -1000,13 +988,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
                                       </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>
@@ -1016,13 +1003,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">1</property>
                                       </packing>
                                     </child>
@@ -1032,13 +1018,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">2</property>
                                       </packing>
                                     </child>
@@ -1048,13 +1033,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">3</property>
                                       </packing>
                                     </child>
@@ -1064,13 +1048,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">4</property>
                                       </packing>
                                     </child>
@@ -1080,13 +1063,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">5</property>
                                       </packing>
                                     </child>
@@ -1096,13 +1078,12 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0.5</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
                                       </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">6</property>
                                       </packing>
                                     </child>
@@ -1428,7 +1409,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_tcp_checkbutton_realize_cb" swapped="no"/>
@@ -1447,7 +1427,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_udp_checkbutton_realize_cb" swapped="no"/>
                               </object>
@@ -1465,7 +1444,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_http_client_checkbutton_realize_cb" 
swapped="no"/>
@@ -1484,7 +1462,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_http_server_checkbutton_realize_cb" 
swapped="no"/>
@@ -1503,8 +1480,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
-                                <property 
name="yalign">0.56999999284744263</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_https_client_checkbutton_realize_cb" 
swapped="no"/>
@@ -1523,7 +1498,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_https_server_checkbutton_realize_cb" 
swapped="no"/>
@@ -1541,7 +1515,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_dv_checkbutton_realize_cb" swapped="no"/>
                               </object>
@@ -1559,7 +1532,6 @@
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
                                 <property name="use_underline">True</property>
-                                <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
                                 <signal name="realize" 
handler="GNUNET_setup_transport_wlan_checkbutton_realize_cb" swapped="no"/>
                               </object>
@@ -1699,24 +1671,6 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" 
id="GNUNET_setup_transport_tcp_stealth_checkbutton">
-                                    <property name="label" 
translatable="yes">Use TCP Stealth (requires kernel support)</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">Use this option to make your TCP server "stealthy", that is 
"invisible" (or at least much less visible) to port scanners.  This requires 
kernel support and may not be available on all operating systems. Note that if 
you use this option, only clients that also support TCP Stealth (on their 
operating system) will be able to connect to you. You do not need to check this 
box to enable TCP Stealth client-side [...]
-                                    <property name="xalign">0</property>
-                                    <property 
name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkBox" 
id="GNUNET_setup_transport_tcp_test_hbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -1789,7 +1743,7 @@
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="padding">5</property>
-                                    <property name="position">3</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2112,24 +2066,6 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" 
id="GNUNET_setup_transport_http_stealth_checkbutton">
-                                    <property name="label" 
translatable="yes">Use TCP Stealth (requires kernel support)</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">Use this option to make your TCP server "stealthy", that is 
"invisible" (or at least much less visible) to port scanners.  This requires 
kernel support and may not be available on all operating systems. Note that if 
you use this option, only clients that also support TCP Stealth (on their 
operating system) will be able to connect to you. You do not need to check this 
box to enable TCP Stealth client-side [...]
-                                    <property name="xalign">0</property>
-                                    <property 
name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkBox" 
id="GNUNET_setup_transport_http_test_hbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -2202,7 +2138,7 @@
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="padding">5</property>
-                                    <property name="position">3</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
@@ -2255,13 +2191,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                           </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>
@@ -2271,14 +2206,13 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
                                           </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">1</property>
                                           </packing>
                                         </child>
@@ -2288,14 +2222,13 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
                                           </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">2</property>
                                           </packing>
                                         </child>
@@ -2305,14 +2238,13 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
                                           </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">3</property>
                                           </packing>
                                         </child>
@@ -2322,14 +2254,13 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
                                           </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">4</property>
                                           </packing>
                                         </child>
@@ -2339,14 +2270,13 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
                                           </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">5</property>
                                           </packing>
                                         </child>
@@ -2355,8 +2285,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">1</property>
                                       </packing>
                                     </child>
@@ -2608,24 +2538,6 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkCheckButton" 
id="GNUNET_setup_transport_https_stealth_checkbutton">
-                                    <property name="label" 
translatable="yes">Use TCP Stealth (requires kernel support)</property>
-                                    <property name="visible">True</property>
-                                    <property name="sensitive">False</property>
-                                    <property name="can_focus">True</property>
-                                    <property 
name="receives_default">False</property>
-                                    <property name="tooltip_text" 
translatable="yes">Use this option to make your TCP server "stealthy", that is 
"invisible" (or at least much less visible) to port scanners.  This requires 
kernel support and may not be available on all operating systems. Note that if 
you use this option, only clients that also support TCP Stealth (on their 
operating system) will be able to connect to you. You do not need to check this 
box to enable TCP Stealth client-side [...]
-                                    <property name="xalign">0</property>
-                                    <property 
name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="expand">False</property>
-                                    <property name="fill">False</property>
-                                    <property name="padding">5</property>
-                                    <property name="position">2</property>
-                                  </packing>
-                                </child>
-                                <child>
                                   <object class="GtkBox" 
id="GNUNET_setup_transport_https_test_hbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
@@ -2698,12 +2610,12 @@
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="padding">5</property>
-                                    <property name="position">3</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
-                                <property name="position">4</property>
+                                <property name="position">3</property>
                               </packing>
                             </child>
                             <child type="tab">
@@ -2751,13 +2663,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="active">True</property>
                                             <property 
name="draw_indicator">True</property>
                                           </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>
@@ -2767,13 +2678,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_https_client_proxy_type_none_radiobutton</property>
                                           </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">1</property>
                                           </packing>
                                         </child>
@@ -2783,13 +2693,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_https_client_proxy_type_none_radiobutton</property>
                                           </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">2</property>
                                           </packing>
                                         </child>
@@ -2799,13 +2708,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_https_client_proxy_type_none_radiobutton</property>
                                           </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">3</property>
                                           </packing>
                                         </child>
@@ -2815,13 +2723,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_https_client_proxy_type_none_radiobutton</property>
                                           </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">4</property>
                                           </packing>
                                         </child>
@@ -2831,13 +2738,12 @@
                                             <property 
name="visible">True</property>
                                             <property 
name="can_focus">True</property>
                                             <property 
name="receives_default">False</property>
-                                            <property 
name="xalign">0.5</property>
                                             <property 
name="draw_indicator">True</property>
                                             <property 
name="group">GNUNET_setup_transport_https_client_proxy_type_none_radiobutton</property>
                                           </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">5</property>
                                           </packing>
                                         </child>
@@ -2846,7 +2752,7 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property name="expand">True</property>
+                                        <property 
name="expand">False</property>
                                         <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
@@ -3138,7 +3044,6 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </object>
@@ -3155,13 +3060,12 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property 
name="receives_default">False</property>
-                                <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                               </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">1</property>
                               </packing>
                             </child>
@@ -3228,7 +3132,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datastore_sqlite_radiobutton_realize_cb" swapped="no"/>
@@ -3245,8 +3148,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
-                                        <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datastore_mysql_radiobutton_realize_cb" swapped="no"/>
@@ -3263,7 +3164,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datastore_sqlite_radiobutton</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datastore_postgres_radiobutton_realize_cb" 
swapped="no"/>
@@ -3282,14 +3182,14 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkVSeparator" 
id="GNUNET_setup_datastore_vseparator">
+                                  <object class="GtkSeparator" 
id="GNUNET_setup_datastore_vseparator">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -3803,7 +3703,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb" swapped="no"/>
@@ -3820,8 +3719,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
-                                        <property 
name="yalign">0.50999999046325684</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datacache_heap_radiobutton_realize_cb" swapped="no"/>
@@ -3838,7 +3735,6 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
                                         <signal name="realize" 
handler="GNUNET_setup_fs_datacache_postgres_radiobutton_realize_cb" 
swapped="no"/>
@@ -3857,14 +3753,14 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkVSeparator" 
id="GNUNET_setup_datacache_vseparator">
+                                  <object class="GtkSeparator" 
id="GNUNET_setup_datacache_vseparator">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">True</property>
-                                    <property name="padding">5</property>
                                     <property name="position">2</property>
                                   </packing>
                                 </child>
@@ -4323,7 +4219,6 @@
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv4-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic. This enables 
4over6 tunneling and 4to6 protocol translation.</property>
-                                    <property name="xalign">0.5</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -4340,7 +4235,6 @@
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">By enabling this option, all of your IPv6-Internet traffic 
will be routed over GNUnet to a GNUnet exit node.  Note that this will enable 
other GNUnet peers to observe your unencrypted Internet traffic.  This enables 
6over4 tunneling and 6to4 protocol translation.</property>
-                                    <property name="xalign">0.5</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -4357,7 +4251,6 @@
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">Enabling this option will cause your DNS traffic to be 
routed via the GNUnet network to some other peer offering DNS exit 
functionality. This is needed if you have no Internet access (and are thus 
tunnelling both IPv4 and IPv6 traffic over GNUnet).  If you have regular 
Internet access, this option only makes sense if you want to get some 'weak' 
anonymity by tunnelling all of your traffic over GNUnet (usi [...]
-                                    <property name="xalign">0.5</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -4442,7 +4335,6 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
-                                    <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -4459,7 +4351,6 @@
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">This option will allow other peers to send IPv4 traffic to 
the Internet using your network connection.</property>
-                                    <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -4476,7 +4367,6 @@
                                     <property name="can_focus">True</property>
                                     <property 
name="receives_default">False</property>
                                     <property name="tooltip_text" 
translatable="yes">This option will allow other peers to send IPv6 traffic to 
the Internet using your network connection.  You should make sure that you have 
IPv6-support before enabling this option.</property>
-                                    <property name="xalign">0</property>
                                     <property 
name="draw_indicator">True</property>
                                   </object>
                                   <packing>
@@ -5008,11 +4898,9 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property name="active">True</property>
                                         <property 
name="draw_indicator">True</property>
                                         <signal name="realize" 
handler="GNUNET_setup_namestore_sqlite_radiobutton_realize_cb" swapped="no"/>
-                                        <signal name="toggled" 
handler="GNUNET_setup_namestore_sqlite_radiobutton_toggled_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -5026,10 +4914,8 @@
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">True</property>
                                         <property 
name="receives_default">False</property>
-                                        <property name="xalign">0</property>
                                         <property 
name="draw_indicator">True</property>
                                         <property 
name="group">GNUNET_setup_namestore_sqlite_radiobutton</property>
-                                        <signal name="toggled" 
handler="GNUNET_setup_namestore_postgres_radiobutton_toggled_cb" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
@@ -5073,36 +4959,51 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkBox" 
id="GNUNET_setup_namestore_postgres_hbox">
+                                  <object class="GtkBox" 
id="GNUNET_setup_namestore_postgres_vbox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property 
name="orientation">vertical</property>
                                     <child>
-                                      <object class="GtkLabel" 
id="GNUNET_setup_namestore_postgres_config_label">
+                                      <object class="GtkBox" 
id="GNUNET_setup_namestore_postgres_hbox">
                                         <property 
name="visible">True</property>
                                         <property 
name="can_focus">False</property>
-                                        <property name="label" 
translatable="yes">Configuration:</property>
+                                        <child>
+                                          <object class="GtkLabel" 
id="GNUNET_setup_namestore_postgres_config_label">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">False</property>
+                                            <property name="label" 
translatable="yes">Configuration:</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">False</property>
+                                            <property 
name="fill">False</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" 
id="GNUNET_setup_namestore_postgres_config_entry">
+                                            <property 
name="visible">True</property>
+                                            <property 
name="can_focus">True</property>
+                                            <property 
name="invisible_char">•</property>
+                                            <property 
name="primary_icon_activatable">False</property>
+                                            <property 
name="secondary_icon_activatable">False</property>
+                                          </object>
+                                          <packing>
+                                            <property 
name="expand">True</property>
+                                            <property 
name="fill">True</property>
+                                            <property 
name="padding">5</property>
+                                            <property 
name="position">1</property>
+                                          </packing>
+                                        </child>
                                       </object>
                                       <packing>
                                         <property 
name="expand">False</property>
                                         <property name="fill">True</property>
-                                        <property name="padding">5</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkEntry" 
id="GNUNET_setup_namestore_postgres_config_entry">
-                                        <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="invisible_char">•</property>
-                                        <property 
name="primary_icon_activatable">False</property>
-                                        <property 
name="secondary_icon_activatable">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="padding">5</property>
-                                        <property name="position">1</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
                                   </object>
                                   <packing>
@@ -5243,23 +5144,4 @@
       <action-widget response="-3">GNUNET_setup_save_button</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkRadioButton" 
id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
-    <property name="label" translatable="yes">HTTP 1.0 proxy</property>
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">False</property>
-    <property name="xalign">0.5</property>
-    <property name="active">True</property>
-    <property name="draw_indicator">True</property>
-    <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
-  </object>
-  <object class="GtkRadioButton" 
id="GNUNET_setup_transport_https_client_proxy_type_http_10_radiobutton">
-    <property name="label" translatable="yes">HTTP 1.0 proxy</property>
-    <property name="visible">True</property>
-    <property name="can_focus">True</property>
-    <property name="receives_default">False</property>
-    <property name="xalign">0.5</property>
-    <property name="draw_indicator">True</property>
-    <property 
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
-  </object>
 </interface>
diff --git a/src/setup/gnunet-setup-namestore-config.c 
b/src/setup/gnunet-setup-namestore-config.c
index a664d39b..e3c277bb 100644
--- a/src/setup/gnunet-setup-namestore-config.c
+++ b/src/setup/gnunet-setup-namestore-config.c
@@ -85,28 +85,4 @@ GNUNET_setup_namestore_postgres_tab_test_button_clicked_cb 
(GtkWidget * widget,
 }
 
 
-static void
-restart_namestore ()
-{
-  /* FIXME */
-  GNUNET_break (0); /* not implemented */
-}
-
-
-void
-GNUNET_setup_namestore_sqlite_radiobutton_toggled_cb (GtkToggleButton *tb,
-                                                     gpointer user_data)
-{
-  restart_namestore ();
-}
-
-
-void
-GNUNET_setup_namestore_postgres_radiobutton_toggled_cb (GtkToggleButton *tb,
-                                                       gpointer user_data)
-{
-  restart_namestore ();
-}
-
-
 /* end of gnunet-setup-namestore-config.c */
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index c7db6c64..3b6913f1 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -99,85 +99,6 @@ load_yes_no (const void *cls,
 
 
 /**
- * Initialize 'tcp_stealth' toggle button based on an options 'yes/no' value,
- * make the widget sensitive if the platform supports TCP_STEALTH.
- *
- * @param cls closure
- * @param section section with the value
- * @param option option name
- * @param value value as a string
- * @param widget widget to initialize
- * @param cfg configuration handle
- * @return #GNUNET_OK on success, #GNUNET_SYSERR if there was a problem
- */
-static int
-load_yes_no_check_tcp_stealth (const void *cls,
-                               const char *section,
-                               const char *option,
-                               const char *value,
-                               GObject * widget,
-                               const struct GNUNET_CONFIGURATION_Handle *cfg)
-{
-  GtkWidget *button;
-  int ret;
-#ifdef SO_TCPSTEALTH
-  struct GNUNET_NETWORK_Handle *lsock;
-#endif
-  int disable;
-
-  ret = load_yes_no (cls, section,
-                     option, value,
-                     widget, cfg);
-  if (GNUNET_OK != ret)
-    return ret;
-  button = GTK_WIDGET (widget);
-  if (NULL == button)
-    return GNUNET_SYSERR;
-  /* check if TCP_STEALTH is supported by kernel */
-#ifdef SO_TCPSTEALTH
-  disable = GNUNET_NO;
-  lsock = GNUNET_NETWORK_socket_create (AF_INET, SOCK_STREAM, 0);
-  if (NULL == lsock)
-  {
-    GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR,
-                         "socket");
-    return GNUNET_SYSERR;
-  }
-  else
-  {
-    if (GNUNET_OK !=
-        GNUNET_NETWORK_socket_setsockopt (lsock,
-                                          IPPROTO_TCP,
-                                          SO_TCPSTEALTH,
-                                          "test", 4))
-      disable = GNUNET_YES;
-    GNUNET_NETWORK_socket_close (lsock);
-  }
-#else
-  disable = GNUNET_YES;
-#endif
-  if (GNUNET_YES == disable)
-  {
-    /* force to false; with insensitive user could otherwise
-       not disable */
-    if (0 == strcasecmp (value, "YES"))
-    {
-      /* deactivate the option, but warn user, as this may open up
-         security issues */
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                  _("Disabling TCP STEALTH, not supported on this system.\n"));
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
-                                    FALSE);
-    }
-    return GNUNET_OK;
-  }
-  gtk_widget_set_sensitive (button,
-                            TRUE);
-  return GNUNET_OK;
-}
-
-
-/**
  * Set a yes/no option based on a toggle button.
  *
  * @param cls closure
@@ -1208,9 +1129,8 @@ static struct GNUNET_SETUP_VisibilitySpecification 
hide_mysql_datastore_tab[] =
 /**
  * Hide "postgres datastore" tab if postgres not active.
  */
-static struct GNUNET_SETUP_VisibilitySpecification 
hide_postgres_datastore_tab[]
-    = {
-  {"GNUNET_setup_datastore_postgres_hbox", "^postgres$", NULL},
+static struct GNUNET_SETUP_VisibilitySpecification 
hide_postgres_datastore_tab[] = {
+  {"GNUNET_setup_datastore_postgres_config_hbox", "^postgres$", NULL},
   {NULL, NULL, NULL}
 };
 
@@ -1236,8 +1156,7 @@ static struct GNUNET_SETUP_VisibilitySpecification 
hide_heap_datacache_tab[] = {
 /**
  * Hide "postgres datacache" tab if postgres not active.
  */
-static struct GNUNET_SETUP_VisibilitySpecification 
hide_postgres_datacache_tab[]
-    = {
+static struct GNUNET_SETUP_VisibilitySpecification 
hide_postgres_datacache_tab[] = {
   {"GNUNET_setup_datacache_postgres_hbox", "^postgres$", NULL},
   {NULL, NULL, NULL}
 };
@@ -1703,18 +1622,6 @@ const struct GNUNET_SETUP_OptionSpecification 
option_specifications[] = {
    NULL},
 
   {
-   "GNUNET_setup_transport_tcp_stealth_checkbutton",
-   "toggled",
-   "transport-tcp",
-   "TCP_STEALTH",
-   gettext_noop ("Should GNUnet use TCP STEALTH for the TCP server?"),
-   "https://gnunet.org/knock";,
-   &load_yes_no_check_tcp_stealth,
-   &save_yes_no, NULL,
-   NULL, NULL,
-   NULL },
-
-  {
    "GNUNET_setup_transport_udp_port_spinbutton",
    "value-changed",
    "transport-udp",
@@ -1900,18 +1807,6 @@ const struct GNUNET_SETUP_OptionSpecification 
option_specifications[] = {
   NULL, NULL,
   NULL},
 
-  {
-   "GNUNET_setup_transport_http_stealth_checkbutton",
-   "toggled",
-   "transport-http",
-   "TCP_STEALTH",
-   gettext_noop ("Should GNUnet use TCP STEALTH for the TCP server?"),
-   "https://gnunet.org/knock";,
-   &load_yes_no_check_tcp_stealth,
-   &save_yes_no, NULL,
-   NULL, NULL,
-   NULL },
-
 
 
   /* HTTPS client */
@@ -2030,18 +1925,6 @@ const struct GNUNET_SETUP_OptionSpecification 
option_specifications[] = {
    NULL, NULL,
    NULL},
 
-  {
-   "GNUNET_setup_transport_https_stealth_checkbutton",
-   "toggled",
-   "transport-https",
-   "TCP_STEALTH",
-   gettext_noop ("Should GNUnet use TCP STEALTH for the TCP server?"),
-   "https://gnunet.org/knock";,
-   &load_yes_no_check_tcp_stealth,
-   &save_yes_no, NULL,
-   NULL, NULL,
-   NULL },
-
   /* FS TAB */
 
   {

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

[Prev in Thread] Current Thread [Next in Thread]