aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2014-05-26 08:07:54 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2014-05-26 08:07:54 +0000
commitf4b08b9858c82f9e7720ae3de72ef5de9c0a9e88 (patch)
treefdc81af7ba766bcedb367c6375a822b653088a20
parent009d42e973c63a98f1b01bb1068767a1f88c5222 (diff)
downloadgnunet-gtk-f4b08b9858c82f9e7720ae3de72ef5de9c0a9e88.tar.gz
gnunet-gtk-f4b08b9858c82f9e7720ae3de72ef5de9c0a9e88.zip
enable http/https_client tabs in transport configuration
- remove HTTP_10 from http/s client tabs since this proxy type is not supported
Diffstat
-rw-r--r--contrib/gnunet_setup_main_window.glade864
-rw-r--r--src/setup/gnunet-setup-options.c55
2 files changed, 399 insertions, 520 deletions
diff --git a/contrib/gnunet_setup_main_window.glade b/contrib/gnunet_setup_main_window.glade
index 84158353..df521624 100644
--- a/contrib/gnunet_setup_main_window.glade
+++ b/contrib/gnunet_setup_main_window.glade
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<!-- Generated with glade 3.16.1 -->
2<interface> 3<interface>
3 <requires lib="gtk+" version="2.20"/> 4 <requires lib="gtk+" version="3.0"/>
4 <!-- interface-naming-policy toplevel-contextual -->
5 <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment"> 5 <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
6 <property name="lower">5000</property> 6 <property name="lower">5000</property>
7 <property name="upper">999999999</property> 7 <property name="upper">999999999</property>
@@ -16,6 +16,304 @@
16 <property name="step_increment">1</property> 16 <property name="step_increment">1</property>
17 <property name="page_increment">10</property> 17 <property name="page_increment">10</property>
18 </object> 18 </object>
19 <object class="GtkAdjustment" id="GNUNET_setup_exit_interface_mask_adjustment">
20 <property name="lower">1</property>
21 <property name="upper">127</property>
22 <property name="value">48</property>
23 <property name="step_increment">1</property>
24 <property name="page_increment">10</property>
25 </object>
26 <object class="GtkAdjustment" id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
27 <property name="lower">1</property>
28 <property name="upper">65535</property>
29 <property name="value">3306</property>
30 <property name="step_increment">1</property>
31 <property name="page_increment">10</property>
32 </object>
33 <object class="GtkAdjustment" id="GNUNET_setup_fs_datacache_quota_adjustment">
34 <property name="lower">65536</property>
35 <property name="upper">9999999999</property>
36 <property name="value">1024000</property>
37 <property name="step_increment">65536</property>
38 <property name="page_increment">1024000</property>
39 </object>
40 <object class="GtkAdjustment" id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
41 <property name="lower">1</property>
42 <property name="upper">65535</property>
43 <property name="value">3306</property>
44 <property name="step_increment">1</property>
45 <property name="page_increment">10</property>
46 </object>
47 <object class="GtkAdjustment" id="GNUNET_setup_fs_datastore_quota_adjustment">
48 <property name="lower">1000000</property>
49 <property name="upper">999999999999</property>
50 <property name="value">100000000</property>
51 <property name="step_increment">1000000</property>
52 <property name="page_increment">1000000000</property>
53 </object>
54 <object class="GtkListStore" id="GNUNET_setup_gns_exit_dialog_liststore">
55 <columns>
56 <!-- column-name sourceport -->
57 <column type="guint"/>
58 <!-- column-name targetport -->
59 <column type="guint"/>
60 <!-- column-name targethostname -->
61 <column type="gchararray"/>
62 <!-- column-name isudp -->
63 <column type="gchararray"/>
64 </columns>
65 </object>
66 <object class="GtkTreeStore" id="GNUNET_setup_gns_treestore">
67 <columns>
68 <!-- column-name name -->
69 <column type="gchararray"/>
70 <!-- column-name is_public -->
71 <column type="gboolean"/>
72 <!-- column-name record_type -->
73 <column type="guint"/>
74 <!-- column-name record_type_as_string -->
75 <column type="gchararray"/>
76 <!-- column-name expiration_time -->
77 <column type="guint64"/>
78 <!-- column-name expiration_time_is_relative -->
79 <column type="gboolean"/>
80 <!-- column-name expiration_time_as_string -->
81 <column type="gchararray"/>
82 <!-- column-name value_as_string -->
83 <column type="gchararray"/>
84 <!-- column-name value_color -->
85 <column type="gchararray"/>
86 <!-- column-name name_is_editable -->
87 <column type="gboolean"/>
88 <!-- column-name name_is_record_row -->
89 <column type="gboolean"/>
90 <!-- column-name not_dummy_row -->
91 <column type="gboolean"/>
92 <!-- column-name expiration_time_color -->
93 <column type="gchararray"/>
94 <!-- column-name name_color -->
95 <column type="gchararray"/>
96 <!-- column-name type_is_editable -->
97 <column type="gboolean"/>
98 <!-- column-name is_shadow -->
99 <column type="gboolean"/>
100 <!-- column-name name_is_editable1 -->
101 <column type="gboolean"/>
102 <!-- column-name record_offset -->
103 <column type="guint"/>
104 </columns>
105 </object>
106 <object class="GtkListStore" id="GNUNET_setup_gns_type_liststore">
107 <columns>
108 <!-- column-name type -->
109 <column type="guint"/>
110 <!-- column-name typename -->
111 <column type="gchararray"/>
112 </columns>
113 <data>
114 <row>
115 <col id="0">1</col>
116 <col id="1">A</col>
117 </row>
118 <row>
119 <col id="0">2</col>
120 <col id="1">NS</col>
121 </row>
122 <row>
123 <col id="0">5</col>
124 <col id="1">CNAME</col>
125 </row>
126 <row>
127 <col id="0">6</col>
128 <col id="1">SOA</col>
129 </row>
130 <row>
131 <col id="0">12</col>
132 <col id="1">PTR</col>
133 </row>
134 <row>
135 <col id="0">15</col>
136 <col id="1">MX</col>
137 </row>
138 <row>
139 <col id="0">16</col>
140 <col id="1">TXT</col>
141 </row>
142 <row>
143 <col id="0">28</col>
144 <col id="1">AAAA</col>
145 </row>
146 <row>
147 <col id="0">65536</col>
148 <col id="1">PKEY</col>
149 </row>
150 <row>
151 <col id="0">65538</col>
152 <col id="1">LEHO</col>
153 </row>
154 <row>
155 <col id="0">65539</col>
156 <col id="1">VPN</col>
157 </row>
158 </data>
159 </object>
160 <object class="GtkListStore" id="GNUNET_setup_hosted_service_liststore">
161 <columns>
162 <!-- column-name name -->
163 <column type="gchararray"/>
164 <!-- column-name is_udp -->
165 <column type="gboolean"/>
166 <!-- column-name visible_port -->
167 <column type="guint"/>
168 <!-- column-name destination_address -->
169 <column type="gchararray"/>
170 </columns>
171 </object>
172 <object class="GtkAdjustment" id="GNUNET_setup_hostlist_server_port_adjustment">
173 <property name="lower">1</property>
174 <property name="upper">65535</property>
175 <property name="value">8080</property>
176 <property name="step_increment">1</property>
177 <property name="page_increment">10</property>
178 </object>
179 <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
180 <columns>
181 <!-- column-name url -->
182 <column type="gchararray"/>
183 <!-- column-name editable -->
184 <column type="gboolean"/>
185 </columns>
186 </object>
187 <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
188 <property name="upper">9999</property>
189 <property name="step_increment">1</property>
190 <property name="page_increment">10</property>
191 </object>
192 <object class="GtkAdjustment" id="GNUNET_setup_transport_http_advertised_port_adjustment">
193 <property name="lower">1</property>
194 <property name="upper">65535</property>
195 <property name="value">1080</property>
196 <property name="step_increment">1</property>
197 <property name="page_increment">10</property>
198 </object>
199 <object class="GtkAdjustment" id="GNUNET_setup_transport_http_port_adjustment">
200 <property name="lower">1</property>
201 <property name="upper">65535</property>
202 <property name="value">1080</property>
203 <property name="step_increment">1</property>
204 <property name="page_increment">10</property>
205 </object>
206 <object class="GtkAdjustment" id="GNUNET_setup_transport_https_advertised_port_adjustment">
207 <property name="lower">1</property>
208 <property name="upper">65535</property>
209 <property name="value">443</property>
210 <property name="step_increment">1</property>
211 <property name="page_increment">10</property>
212 </object>
213 <object class="GtkAdjustment" id="GNUNET_setup_transport_https_port_adjustment">
214 <property name="lower">1</property>
215 <property name="upper">65535</property>
216 <property name="value">443</property>
217 <property name="step_increment">1</property>
218 <property name="page_increment">10</property>
219 </object>
220 <object class="GtkAdjustment" id="GNUNET_setup_transport_tcp_adv_port_adjustment">
221 <property name="lower">1</property>
222 <property name="upper">65535</property>
223 <property name="value">2086</property>
224 <property name="step_increment">1</property>
225 <property name="page_increment">10</property>
226 </object>
227 <object class="GtkAdjustment" id="GNUNET_setup_transport_tcp_port_adjustment">
228 <property name="upper">65535</property>
229 <property name="value">2086</property>
230 <property name="step_increment">1</property>
231 <property name="page_increment">10</property>
232 </object>
233 <object class="GtkAdjustment" id="GNUNET_setup_transport_udp_advertised_port_adjustment">
234 <property name="lower">1</property>
235 <property name="upper">65535</property>
236 <property name="value">2086</property>
237 <property name="step_increment">1</property>
238 <property name="page_increment">10</property>
239 </object>
240 <object class="GtkAdjustment" id="GNUNET_setup_transport_udp_port_adjustment">
241 <property name="lower">1</property>
242 <property name="upper">65535</property>
243 <property name="value">2086</property>
244 <property name="step_increment">1</property>
245 <property name="page_increment">10</property>
246 </object>
247 <object class="GtkAdjustment" id="GNUNET_setup_vpn_interface_mask_adjustment">
248 <property name="lower">1</property>
249 <property name="upper">127</property>
250 <property name="value">48</property>
251 <property name="step_increment">1</property>
252 <property name="page_increment">10</property>
253 </object>
254 <object class="GtkAdjustment" id="adjustment1">
255 <property name="upper">100</property>
256 <property name="step_increment">1</property>
257 <property name="page_increment">10</property>
258 <property name="page_size">10</property>
259 </object>
260 <object class="GtkAdjustment" id="adjustment10">
261 <property name="upper">100</property>
262 <property name="step_increment">1</property>
263 <property name="page_increment">10</property>
264 </object>
265 <object class="GtkAdjustment" id="adjustment2">
266 <property name="upper">100</property>
267 <property name="step_increment">1</property>
268 <property name="page_increment">10</property>
269 <property name="page_size">10</property>
270 </object>
271 <object class="GtkAdjustment" id="adjustment3">
272 <property name="upper">100</property>
273 <property name="step_increment">1</property>
274 <property name="page_increment">10</property>
275 <property name="page_size">10</property>
276 </object>
277 <object class="GtkAdjustment" id="adjustment4">
278 <property name="upper">100</property>
279 <property name="step_increment">1</property>
280 <property name="page_increment">10</property>
281 <property name="page_size">10</property>
282 </object>
283 <object class="GtkAdjustment" id="adjustment5">
284 <property name="upper">100</property>
285 <property name="step_increment">1</property>
286 <property name="page_increment">10</property>
287 <property name="page_size">10</property>
288 </object>
289 <object class="GtkAdjustment" id="adjustment6">
290 <property name="upper">100</property>
291 <property name="step_increment">1</property>
292 <property name="page_increment">10</property>
293 <property name="page_size">10</property>
294 </object>
295 <object class="GtkAdjustment" id="adjustment7">
296 <property name="upper">100</property>
297 <property name="step_increment">1</property>
298 <property name="page_increment">10</property>
299 <property name="page_size">10</property>
300 </object>
301 <object class="GtkAdjustment" id="adjustment8">
302 <property name="upper">100</property>
303 <property name="step_increment">1</property>
304 <property name="page_increment">10</property>
305 <property name="page_size">10</property>
306 </object>
307 <object class="GtkAdjustment" id="adjustment9">
308 <property name="upper">100</property>
309 <property name="step_increment">1</property>
310 <property name="page_increment">10</property>
311 </object>
312 <object class="GtkImage" id="edit_image">
313 <property name="visible">True</property>
314 <property name="can_focus">False</property>
315 <property name="stock">gtk-edit</property>
316 </object>
19 <object class="GtkDialog" id="GNUNET_setup_dialog"> 317 <object class="GtkDialog" id="GNUNET_setup_dialog">
20 <property name="can_focus">False</property> 318 <property name="can_focus">False</property>
21 <property name="border_width">5</property> 319 <property name="border_width">5</property>
@@ -25,12 +323,12 @@
25 <property name="type_hint">normal</property> 323 <property name="type_hint">normal</property>
26 <signal name="destroy" handler="GNUNET_SETUP_quit_cb" swapped="no"/> 324 <signal name="destroy" handler="GNUNET_SETUP_quit_cb" swapped="no"/>
27 <child internal-child="vbox"> 325 <child internal-child="vbox">
28 <object class="GtkVBox" id="GNUNET_setup_dialog-vbox"> 326 <object class="GtkBox" id="GNUNET_setup_dialog-vbox">
29 <property name="visible">True</property> 327 <property name="visible">True</property>
30 <property name="can_focus">False</property> 328 <property name="can_focus">False</property>
31 <property name="spacing">2</property> 329 <property name="spacing">2</property>
32 <child internal-child="action_area"> 330 <child internal-child="action_area">
33 <object class="GtkHButtonBox" id="GNUNET_setup_dialog-action_area"> 331 <object class="GtkButtonBox" id="GNUNET_setup_dialog-action_area">
34 <property name="can_focus">False</property> 332 <property name="can_focus">False</property>
35 <property name="layout_style">end</property> 333 <property name="layout_style">end</property>
36 <child> 334 <child>
@@ -335,11 +633,8 @@
335 <property name="visible">True</property> 633 <property name="visible">True</property>
336 <property name="can_focus">True</property> 634 <property name="can_focus">True</property>
337 <property name="invisible_char">•</property> 635 <property name="invisible_char">•</property>
338 <property name="invisible_char_set">True</property>
339 <property name="primary_icon_activatable">False</property> 636 <property name="primary_icon_activatable">False</property>
340 <property name="secondary_icon_activatable">False</property> 637 <property name="secondary_icon_activatable">False</property>
341 <property name="primary_icon_sensitive">True</property>
342 <property name="secondary_icon_sensitive">True</property>
343 <property name="adjustment">GNUNET_setup_min_friends_adjustment</property> 638 <property name="adjustment">GNUNET_setup_min_friends_adjustment</property>
344 <property name="numeric">True</property> 639 <property name="numeric">True</property>
345 </object> 640 </object>
@@ -506,11 +801,8 @@
506 <property name="visible">True</property> 801 <property name="visible">True</property>
507 <property name="can_focus">True</property> 802 <property name="can_focus">True</property>
508 <property name="invisible_char">•</property> 803 <property name="invisible_char">•</property>
509 <property name="invisible_char_set">True</property>
510 <property name="primary_icon_activatable">False</property> 804 <property name="primary_icon_activatable">False</property>
511 <property name="secondary_icon_activatable">False</property> 805 <property name="secondary_icon_activatable">False</property>
512 <property name="primary_icon_sensitive">True</property>
513 <property name="secondary_icon_sensitive">True</property>
514 <property name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property> 806 <property name="adjustment">GNUNET_setup_hostlist_server_port_adjustment</property>
515 <property name="numeric">True</property> 807 <property name="numeric">True</property>
516 <signal name="realize" handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb" swapped="no"/> 808 <signal name="realize" handler="GNUNET_setup_hostlist_server_port_spin_button_realize_cb" swapped="no"/>
@@ -565,11 +857,14 @@
565 <object class="GtkTreeView" id="GNUNET_setup_hostlist_url_treeview"> 857 <object class="GtkTreeView" id="GNUNET_setup_hostlist_url_treeview">
566 <property name="visible">True</property> 858 <property name="visible">True</property>
567 <property name="can_focus">True</property> 859 <property name="can_focus">True</property>
568 <property name="model">GNUNET_setup_hostlist_url_liststore</property>
569 <property name="hadjustment">adjustment7</property> 860 <property name="hadjustment">adjustment7</property>
570 <property name="vadjustment">adjustment8</property> 861 <property name="vadjustment">adjustment8</property>
862 <property name="model">GNUNET_setup_hostlist_url_liststore</property>
571 <property name="search_column">0</property> 863 <property name="search_column">0</property>
572 <signal name="key-press-event" handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/> 864 <signal name="key-press-event" handler="GNUNET_setup_treeview_key_press_event_cb" swapped="no"/>
865 <child internal-child="selection">
866 <object class="GtkTreeSelection" id="treeview-selection1"/>
867 </child>
573 <child> 868 <child>
574 <object class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn"> 869 <object class="GtkTreeViewColumn" id="GNUNET_setup_hostlist_url_treeviewcolumn">
575 <property name="sizing">fixed</property> 870 <property name="sizing">fixed</property>
@@ -675,6 +970,7 @@
675 <property name="visible">True</property> 970 <property name="visible">True</property>
676 <property name="can_focus">True</property> 971 <property name="can_focus">True</property>
677 <property name="receives_default">False</property> 972 <property name="receives_default">False</property>
973 <property name="xalign">0.5</property>
678 <property name="active">True</property> 974 <property name="active">True</property>
679 <property name="draw_indicator">True</property> 975 <property name="draw_indicator">True</property>
680 </object> 976 </object>
@@ -690,6 +986,7 @@
690 <property name="visible">True</property> 986 <property name="visible">True</property>
691 <property name="can_focus">True</property> 987 <property name="can_focus">True</property>
692 <property name="receives_default">False</property> 988 <property name="receives_default">False</property>
989 <property name="xalign">0.5</property>
693 <property name="draw_indicator">True</property> 990 <property name="draw_indicator">True</property>
694 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 991 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
695 </object> 992 </object>
@@ -705,6 +1002,7 @@
705 <property name="visible">True</property> 1002 <property name="visible">True</property>
706 <property name="can_focus">True</property> 1003 <property name="can_focus">True</property>
707 <property name="receives_default">False</property> 1004 <property name="receives_default">False</property>
1005 <property name="xalign">0.5</property>
708 <property name="draw_indicator">True</property> 1006 <property name="draw_indicator">True</property>
709 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 1007 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
710 </object> 1008 </object>
@@ -720,6 +1018,7 @@
720 <property name="visible">True</property> 1018 <property name="visible">True</property>
721 <property name="can_focus">True</property> 1019 <property name="can_focus">True</property>
722 <property name="receives_default">False</property> 1020 <property name="receives_default">False</property>
1021 <property name="xalign">0.5</property>
723 <property name="draw_indicator">True</property> 1022 <property name="draw_indicator">True</property>
724 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 1023 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
725 </object> 1024 </object>
@@ -735,6 +1034,7 @@
735 <property name="visible">True</property> 1034 <property name="visible">True</property>
736 <property name="can_focus">True</property> 1035 <property name="can_focus">True</property>
737 <property name="receives_default">False</property> 1036 <property name="receives_default">False</property>
1037 <property name="xalign">0.5</property>
738 <property name="draw_indicator">True</property> 1038 <property name="draw_indicator">True</property>
739 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 1039 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
740 </object> 1040 </object>
@@ -750,6 +1050,7 @@
750 <property name="visible">True</property> 1050 <property name="visible">True</property>
751 <property name="can_focus">True</property> 1051 <property name="can_focus">True</property>
752 <property name="receives_default">False</property> 1052 <property name="receives_default">False</property>
1053 <property name="xalign">0.5</property>
753 <property name="draw_indicator">True</property> 1054 <property name="draw_indicator">True</property>
754 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 1055 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
755 </object> 1056 </object>
@@ -765,6 +1066,7 @@
765 <property name="visible">True</property> 1066 <property name="visible">True</property>
766 <property name="can_focus">True</property> 1067 <property name="can_focus">True</property>
767 <property name="receives_default">False</property> 1068 <property name="receives_default">False</property>
1069 <property name="xalign">0.5</property>
768 <property name="draw_indicator">True</property> 1070 <property name="draw_indicator">True</property>
769 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property> 1071 <property name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
770 </object> 1072 </object>
@@ -811,11 +1113,8 @@
811 <property name="visible">True</property> 1113 <property name="visible">True</property>
812 <property name="can_focus">True</property> 1114 <property name="can_focus">True</property>
813 <property name="invisible_char">●</property> 1115 <property name="invisible_char">●</property>
814 <property name="invisible_char_set">True</property>
815 <property name="primary_icon_activatable">False</property> 1116 <property name="primary_icon_activatable">False</property>
816 <property name="secondary_icon_activatable">False</property> 1117 <property name="secondary_icon_activatable">False</property>
817 <property name="primary_icon_sensitive">True</property>
818 <property name="secondary_icon_sensitive">True</property>
819 </object> 1118 </object>
820 <packing> 1119 <packing>
821 <property name="expand">True</property> 1120 <property name="expand">True</property>
@@ -852,11 +1151,8 @@
852 <property name="visible">True</property> 1151 <property name="visible">True</property>
853 <property name="can_focus">True</property> 1152 <property name="can_focus">True</property>
854 <property name="invisible_char">●</property> 1153 <property name="invisible_char">●</property>
855 <property name="invisible_char_set">True</property>
856 <property name="primary_icon_activatable">False</property> 1154 <property name="primary_icon_activatable">False</property>
857 <property name="secondary_icon_activatable">False</property> 1155 <property name="secondary_icon_activatable">False</property>
858 <property name="primary_icon_sensitive">True</property>
859 <property name="secondary_icon_sensitive">True</property>
860 </object> 1156 </object>
861 <packing> 1157 <packing>
862 <property name="expand">True</property> 1158 <property name="expand">True</property>
@@ -893,11 +1189,8 @@
893 <property name="visible">True</property> 1189 <property name="visible">True</property>
894 <property name="can_focus">True</property> 1190 <property name="can_focus">True</property>
895 <property name="invisible_char">●</property> 1191 <property name="invisible_char">●</property>
896 <property name="invisible_char_set">True</property>
897 <property name="primary_icon_activatable">False</property> 1192 <property name="primary_icon_activatable">False</property>
898 <property name="secondary_icon_activatable">False</property> 1193 <property name="secondary_icon_activatable">False</property>
899 <property name="primary_icon_sensitive">True</property>
900 <property name="secondary_icon_sensitive">True</property>
901 </object> 1194 </object>
902 <packing> 1195 <packing>
903 <property name="expand">True</property> 1196 <property name="expand">True</property>
@@ -990,11 +1283,8 @@
990 <property name="visible">True</property> 1283 <property name="visible">True</property>
991 <property name="can_focus">True</property> 1284 <property name="can_focus">True</property>
992 <property name="invisible_char">•</property> 1285 <property name="invisible_char">•</property>
993 <property name="invisible_char_set">True</property>
994 <property name="primary_icon_activatable">False</property> 1286 <property name="primary_icon_activatable">False</property>
995 <property name="secondary_icon_activatable">False</property> 1287 <property name="secondary_icon_activatable">False</property>
996 <property name="primary_icon_sensitive">True</property>
997 <property name="secondary_icon_sensitive">True</property>
998 <property name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property> 1288 <property name="adjustment">GNUNET_setup_bandwidth_in_adjustment</property>
999 <property name="numeric">True</property> 1289 <property name="numeric">True</property>
1000 </object> 1290 </object>
@@ -1021,11 +1311,8 @@
1021 <property name="visible">True</property> 1311 <property name="visible">True</property>
1022 <property name="can_focus">True</property> 1312 <property name="can_focus">True</property>
1023 <property name="invisible_char">•</property> 1313 <property name="invisible_char">•</property>
1024 <property name="invisible_char_set">True</property>
1025 <property name="primary_icon_activatable">False</property> 1314 <property name="primary_icon_activatable">False</property>
1026 <property name="secondary_icon_activatable">False</property> 1315 <property name="secondary_icon_activatable">False</property>
1027 <property name="primary_icon_sensitive">True</property>
1028 <property name="secondary_icon_sensitive">True</property>
1029 <property name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property> 1316 <property name="adjustment">GNUNET_setup_bandwidth_out_adjustment</property>
1030 <property name="numeric">True</property> 1317 <property name="numeric">True</property>
1031 </object> 1318 </object>
@@ -1232,11 +1519,8 @@
1232 <property name="can_focus">True</property> 1519 <property name="can_focus">True</property>
1233 <property name="max_length">255</property> 1520 <property name="max_length">255</property>
1234 <property name="invisible_char">●</property> 1521 <property name="invisible_char">●</property>
1235 <property name="invisible_char_set">True</property>
1236 <property name="primary_icon_activatable">False</property> 1522 <property name="primary_icon_activatable">False</property>
1237 <property name="secondary_icon_activatable">False</property> 1523 <property name="secondary_icon_activatable">False</property>
1238 <property name="primary_icon_sensitive">True</property>
1239 <property name="secondary_icon_sensitive">True</property>
1240 </object> 1524 </object>
1241 <packing> 1525 <packing>
1242 <property name="expand">True</property> 1526 <property name="expand">True</property>
@@ -1296,8 +1580,6 @@
1296 <property name="width_chars">15</property> 1580 <property name="width_chars">15</property>
1297 <property name="primary_icon_activatable">False</property> 1581 <property name="primary_icon_activatable">False</property>
1298 <property name="secondary_icon_activatable">False</property> 1582 <property name="secondary_icon_activatable">False</property>
1299 <property name="primary_icon_sensitive">True</property>
1300 <property name="secondary_icon_sensitive">True</property>
1301 </object> 1583 </object>
1302 <packing> 1584 <packing>
1303 <property name="expand">True</property> 1585 <property name="expand">True</property>
@@ -1480,6 +1762,7 @@
1480 <property name="receives_default">False</property> 1762 <property name="receives_default">False</property>
1481 <property name="use_underline">True</property> 1763 <property name="use_underline">True</property>
1482 <property name="xalign">0</property> 1764 <property name="xalign">0</property>
1765 <property name="yalign">0.56999999284744263</property>
1483 <property name="active">True</property> 1766 <property name="active">True</property>
1484 <property name="draw_indicator">True</property> 1767 <property name="draw_indicator">True</property>
1485 <signal name="realize" handler="GNUNET_setup_transport_https_client_checkbutton_realize_cb" swapped="no"/> 1768 <signal name="realize" handler="GNUNET_setup_transport_https_client_checkbutton_realize_cb" swapped="no"/>
@@ -1584,11 +1867,8 @@
1584 <property name="can_focus">True</property> 1867 <property name="can_focus">True</property>
1585 <property name="max_length">5</property> 1868 <property name="max_length">5</property>
1586 <property name="invisible_char">•</property> 1869 <property name="invisible_char">•</property>
1587 <property name="invisible_char_set">True</property>
1588 <property name="primary_icon_activatable">False</property> 1870 <property name="primary_icon_activatable">False</property>
1589 <property name="secondary_icon_activatable">False</property> 1871 <property name="secondary_icon_activatable">False</property>
1590 <property name="primary_icon_sensitive">True</property>
1591 <property name="secondary_icon_sensitive">True</property>
1592 <property name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property> 1872 <property name="adjustment">GNUNET_setup_transport_tcp_port_adjustment</property>
1593 <property name="numeric">True</property> 1873 <property name="numeric">True</property>
1594 </object> 1874 </object>
@@ -1643,11 +1923,8 @@
1643 <property name="can_focus">True</property> 1923 <property name="can_focus">True</property>
1644 <property name="max_length">5</property> 1924 <property name="max_length">5</property>
1645 <property name="invisible_char">●</property> 1925 <property name="invisible_char">●</property>
1646 <property name="invisible_char_set">True</property>
1647 <property name="primary_icon_activatable">False</property> 1926 <property name="primary_icon_activatable">False</property>
1648 <property name="secondary_icon_activatable">False</property> 1927 <property name="secondary_icon_activatable">False</property>
1649 <property name="primary_icon_sensitive">True</property>
1650 <property name="secondary_icon_sensitive">True</property>
1651 <property name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property> 1928 <property name="adjustment">GNUNET_setup_transport_tcp_adv_port_adjustment</property>
1652 <property name="numeric">True</property> 1929 <property name="numeric">True</property>
1653 </object> 1930 </object>
@@ -1795,11 +2072,8 @@
1795 <property name="can_focus">True</property> 2072 <property name="can_focus">True</property>
1796 <property name="max_length">5</property> 2073 <property name="max_length">5</property>
1797 <property name="invisible_char">•</property> 2074 <property name="invisible_char">•</property>
1798 <property name="invisible_char_set">True</property>
1799 <property name="primary_icon_activatable">False</property> 2075 <property name="primary_icon_activatable">False</property>
1800 <property name="secondary_icon_activatable">False</property> 2076 <property name="secondary_icon_activatable">False</property>
1801 <property name="primary_icon_sensitive">True</property>
1802 <property name="secondary_icon_sensitive">True</property>
1803 <property name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property> 2077 <property name="adjustment">GNUNET_setup_transport_udp_port_adjustment</property>
1804 <property name="numeric">True</property> 2078 <property name="numeric">True</property>
1805 </object> 2079 </object>
@@ -1843,8 +2117,6 @@
1843 <property name="invisible_char">●</property> 2117 <property name="invisible_char">●</property>
1844 <property name="primary_icon_activatable">False</property> 2118 <property name="primary_icon_activatable">False</property>
1845 <property name="secondary_icon_activatable">False</property> 2119 <property name="secondary_icon_activatable">False</property>
1846 <property name="primary_icon_sensitive">True</property>
1847 <property name="secondary_icon_sensitive">True</property>
1848 <property name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property> 2120 <property name="adjustment">GNUNET_setup_transport_udp_advertised_port_adjustment</property>
1849 <property name="numeric">True</property> 2121 <property name="numeric">True</property>
1850 </object> 2122 </object>
@@ -1999,11 +2271,8 @@
1999 <property name="can_focus">True</property> 2271 <property name="can_focus">True</property>
2000 <property name="max_length">5</property> 2272 <property name="max_length">5</property>
2001 <property name="invisible_char">•</property> 2273 <property name="invisible_char">•</property>
2002 <property name="invisible_char_set">True</property>
2003 <property name="primary_icon_activatable">False</property> 2274 <property name="primary_icon_activatable">False</property>
2004 <property name="secondary_icon_activatable">False</property> 2275 <property name="secondary_icon_activatable">False</property>
2005 <property name="primary_icon_sensitive">True</property>
2006 <property name="secondary_icon_sensitive">True</property>
2007 <property name="adjustment">GNUNET_setup_transport_http_port_adjustment</property> 2276 <property name="adjustment">GNUNET_setup_transport_http_port_adjustment</property>
2008 <property name="numeric">True</property> 2277 <property name="numeric">True</property>
2009 </object> 2278 </object>
@@ -2046,11 +2315,8 @@
2046 <property name="can_focus">True</property> 2315 <property name="can_focus">True</property>
2047 <property name="max_length">5</property> 2316 <property name="max_length">5</property>
2048 <property name="invisible_char">●</property> 2317 <property name="invisible_char">●</property>
2049 <property name="invisible_char_set">True</property>
2050 <property name="primary_icon_activatable">False</property> 2318 <property name="primary_icon_activatable">False</property>
2051 <property name="secondary_icon_activatable">False</property> 2319 <property name="secondary_icon_activatable">False</property>
2052 <property name="primary_icon_sensitive">True</property>
2053 <property name="secondary_icon_sensitive">True</property>
2054 <property name="adjustment">GNUNET_setup_transport_http_advertised_port_adjustment</property> 2320 <property name="adjustment">GNUNET_setup_transport_http_advertised_port_adjustment</property>
2055 <property name="numeric">True</property> 2321 <property name="numeric">True</property>
2056 </object> 2322 </object>
@@ -2206,6 +2472,7 @@
2206 <property name="visible">True</property> 2472 <property name="visible">True</property>
2207 <property name="can_focus">True</property> 2473 <property name="can_focus">True</property>
2208 <property name="receives_default">False</property> 2474 <property name="receives_default">False</property>
2475 <property name="xalign">0.5</property>
2209 <property name="active">True</property> 2476 <property name="active">True</property>
2210 <property name="draw_indicator">True</property> 2477 <property name="draw_indicator">True</property>
2211 </object> 2478 </object>
@@ -2221,6 +2488,7 @@
2221 <property name="visible">True</property> 2488 <property name="visible">True</property>
2222 <property name="can_focus">True</property> 2489 <property name="can_focus">True</property>
2223 <property name="receives_default">False</property> 2490 <property name="receives_default">False</property>
2491 <property name="xalign">0.5</property>
2224 <property name="active">True</property> 2492 <property name="active">True</property>
2225 <property name="draw_indicator">True</property> 2493 <property name="draw_indicator">True</property>
2226 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2494 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2232,27 +2500,12 @@
2232 </packing> 2500 </packing>
2233 </child> 2501 </child>
2234 <child> 2502 <child>
2235 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
2236 <property name="label" translatable="yes">HTTP 1.0 proxy</property>
2237 <property name="visible">True</property>
2238 <property name="can_focus">True</property>
2239 <property name="receives_default">False</property>
2240 <property name="active">True</property>
2241 <property name="draw_indicator">True</property>
2242 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2243 </object>
2244 <packing>
2245 <property name="expand">True</property>
2246 <property name="fill">True</property>
2247 <property name="position">2</property>
2248 </packing>
2249 </child>
2250 <child>
2251 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton"> 2503 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton">
2252 <property name="label" translatable="yes">SOCKS v4 proxy</property> 2504 <property name="label" translatable="yes">SOCKS v4 proxy</property>
2253 <property name="visible">True</property> 2505 <property name="visible">True</property>
2254 <property name="can_focus">True</property> 2506 <property name="can_focus">True</property>
2255 <property name="receives_default">False</property> 2507 <property name="receives_default">False</property>
2508 <property name="xalign">0.5</property>
2256 <property name="active">True</property> 2509 <property name="active">True</property>
2257 <property name="draw_indicator">True</property> 2510 <property name="draw_indicator">True</property>
2258 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2511 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2260,7 +2513,7 @@
2260 <packing> 2513 <packing>
2261 <property name="expand">True</property> 2514 <property name="expand">True</property>
2262 <property name="fill">True</property> 2515 <property name="fill">True</property>
2263 <property name="position">3</property> 2516 <property name="position">2</property>
2264 </packing> 2517 </packing>
2265 </child> 2518 </child>
2266 <child> 2519 <child>
@@ -2269,6 +2522,7 @@
2269 <property name="visible">True</property> 2522 <property name="visible">True</property>
2270 <property name="can_focus">True</property> 2523 <property name="can_focus">True</property>
2271 <property name="receives_default">False</property> 2524 <property name="receives_default">False</property>
2525 <property name="xalign">0.5</property>
2272 <property name="active">True</property> 2526 <property name="active">True</property>
2273 <property name="draw_indicator">True</property> 2527 <property name="draw_indicator">True</property>
2274 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2528 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2276,7 +2530,7 @@
2276 <packing> 2530 <packing>
2277 <property name="expand">True</property> 2531 <property name="expand">True</property>
2278 <property name="fill">True</property> 2532 <property name="fill">True</property>
2279 <property name="position">4</property> 2533 <property name="position">3</property>
2280 </packing> 2534 </packing>
2281 </child> 2535 </child>
2282 <child> 2536 <child>
@@ -2285,6 +2539,7 @@
2285 <property name="visible">True</property> 2539 <property name="visible">True</property>
2286 <property name="can_focus">True</property> 2540 <property name="can_focus">True</property>
2287 <property name="receives_default">False</property> 2541 <property name="receives_default">False</property>
2542 <property name="xalign">0.5</property>
2288 <property name="active">True</property> 2543 <property name="active">True</property>
2289 <property name="draw_indicator">True</property> 2544 <property name="draw_indicator">True</property>
2290 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2545 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2292,7 +2547,7 @@
2292 <packing> 2547 <packing>
2293 <property name="expand">True</property> 2548 <property name="expand">True</property>
2294 <property name="fill">True</property> 2549 <property name="fill">True</property>
2295 <property name="position">5</property> 2550 <property name="position">4</property>
2296 </packing> 2551 </packing>
2297 </child> 2552 </child>
2298 <child> 2553 <child>
@@ -2301,6 +2556,7 @@
2301 <property name="visible">True</property> 2556 <property name="visible">True</property>
2302 <property name="can_focus">True</property> 2557 <property name="can_focus">True</property>
2303 <property name="receives_default">False</property> 2558 <property name="receives_default">False</property>
2559 <property name="xalign">0.5</property>
2304 <property name="active">True</property> 2560 <property name="active">True</property>
2305 <property name="draw_indicator">True</property> 2561 <property name="draw_indicator">True</property>
2306 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2562 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
@@ -2308,9 +2564,12 @@
2308 <packing> 2564 <packing>
2309 <property name="expand">True</property> 2565 <property name="expand">True</property>
2310 <property name="fill">True</property> 2566 <property name="fill">True</property>
2311 <property name="position">6</property> 2567 <property name="position">5</property>
2312 </packing> 2568 </packing>
2313 </child> 2569 </child>
2570 <child>
2571 <placeholder/>
2572 </child>
2314 </object> 2573 </object>
2315 <packing> 2574 <packing>
2316 <property name="expand">True</property> 2575 <property name="expand">True</property>
@@ -2348,11 +2607,8 @@
2348 <property name="visible">True</property> 2607 <property name="visible">True</property>
2349 <property name="can_focus">True</property> 2608 <property name="can_focus">True</property>
2350 <property name="invisible_char">●</property> 2609 <property name="invisible_char">●</property>
2351 <property name="invisible_char_set">True</property>
2352 <property name="primary_icon_activatable">False</property> 2610 <property name="primary_icon_activatable">False</property>
2353 <property name="secondary_icon_activatable">False</property> 2611 <property name="secondary_icon_activatable">False</property>
2354 <property name="primary_icon_sensitive">True</property>
2355 <property name="secondary_icon_sensitive">True</property>
2356 </object> 2612 </object>
2357 <packing> 2613 <packing>
2358 <property name="expand">True</property> 2614 <property name="expand">True</property>
@@ -2391,8 +2647,6 @@
2391 <property name="invisible_char">●</property> 2647 <property name="invisible_char">●</property>
2392 <property name="primary_icon_activatable">False</property> 2648 <property name="primary_icon_activatable">False</property>
2393 <property name="secondary_icon_activatable">False</property> 2649 <property name="secondary_icon_activatable">False</property>
2394 <property name="primary_icon_sensitive">True</property>
2395 <property name="secondary_icon_sensitive">True</property>
2396 </object> 2650 </object>
2397 <packing> 2651 <packing>
2398 <property name="expand">True</property> 2652 <property name="expand">True</property>
@@ -2429,11 +2683,8 @@
2429 <property name="visible">True</property> 2683 <property name="visible">True</property>
2430 <property name="can_focus">True</property> 2684 <property name="can_focus">True</property>
2431 <property name="invisible_char">●</property> 2685 <property name="invisible_char">●</property>
2432 <property name="invisible_char_set">True</property>
2433 <property name="primary_icon_activatable">False</property> 2686 <property name="primary_icon_activatable">False</property>
2434 <property name="secondary_icon_activatable">False</property> 2687 <property name="secondary_icon_activatable">False</property>
2435 <property name="primary_icon_sensitive">True</property>
2436 <property name="secondary_icon_sensitive">True</property>
2437 </object> 2688 </object>
2438 <packing> 2689 <packing>
2439 <property name="expand">True</property> 2690 <property name="expand">True</property>
@@ -2495,11 +2746,8 @@
2495 <property name="can_focus">True</property> 2746 <property name="can_focus">True</property>
2496 <property name="max_length">5</property> 2747 <property name="max_length">5</property>
2497 <property name="invisible_char">•</property> 2748 <property name="invisible_char">•</property>
2498 <property name="invisible_char_set">True</property>
2499 <property name="primary_icon_activatable">False</property> 2749 <property name="primary_icon_activatable">False</property>
2500 <property name="secondary_icon_activatable">False</property> 2750 <property name="secondary_icon_activatable">False</property>
2501 <property name="primary_icon_sensitive">True</property>
2502 <property name="secondary_icon_sensitive">True</property>
2503 <property name="adjustment">GNUNET_setup_transport_https_port_adjustment</property> 2751 <property name="adjustment">GNUNET_setup_transport_https_port_adjustment</property>
2504 <property name="numeric">True</property> 2752 <property name="numeric">True</property>
2505 </object> 2753 </object>
@@ -2542,11 +2790,8 @@
2542 <property name="can_focus">True</property> 2790 <property name="can_focus">True</property>
2543 <property name="max_length">5</property> 2791 <property name="max_length">5</property>
2544 <property name="invisible_char">●</property> 2792 <property name="invisible_char">●</property>
2545 <property name="invisible_char_set">True</property>
2546 <property name="primary_icon_activatable">False</property> 2793 <property name="primary_icon_activatable">False</property>
2547 <property name="secondary_icon_activatable">False</property> 2794 <property name="secondary_icon_activatable">False</property>
2548 <property name="primary_icon_sensitive">True</property>
2549 <property name="secondary_icon_sensitive">True</property>
2550 <property name="adjustment">GNUNET_setup_transport_https_advertised_port_adjustment</property> 2795 <property name="adjustment">GNUNET_setup_transport_https_advertised_port_adjustment</property>
2551 <property name="numeric">True</property> 2796 <property name="numeric">True</property>
2552 </object> 2797 </object>
@@ -2671,15 +2916,15 @@
2671 </packing> 2916 </packing>
2672 </child> 2917 </child>
2673 <child> 2918 <child>
2674 <object class="GtkVBox" id="GNUNET_setup_transport_http_client_vbox1"> 2919 <object class="GtkVBox" id="GNUNET_setup_transport_https_client_vbox">
2675 <property name="visible">True</property> 2920 <property name="visible">True</property>
2676 <property name="can_focus">False</property> 2921 <property name="can_focus">False</property>
2677 <child> 2922 <child>
2678 <object class="GtkHBox" id="GNUNET_setup_transport_http_client_proxy_type_hbox1"> 2923 <object class="GtkHBox" id="GNUNET_setup_transport_https_client_proxy_type_hbox">
2679 <property name="visible">True</property> 2924 <property name="visible">True</property>
2680 <property name="can_focus">False</property> 2925 <property name="can_focus">False</property>
2681 <child> 2926 <child>
2682 <object class="GtkLabel" id="GNUNET_setup_transport_http_client_proxy_type_label1"> 2927 <object class="GtkLabel" id="GNUNET_setup_transport_https_client_proxy_type_label">
2683 <property name="visible">True</property> 2928 <property name="visible">True</property>
2684 <property name="can_focus">False</property> 2929 <property name="can_focus">False</property>
2685 <property name="label" translatable="yes">_Proxy type:</property> 2930 <property name="label" translatable="yes">_Proxy type:</property>
@@ -2693,15 +2938,16 @@
2693 </packing> 2938 </packing>
2694 </child> 2939 </child>
2695 <child> 2940 <child>
2696 <object class="GtkVBox" id="GNUNET_setup_transport_http_client_proxy_type_vbox1"> 2941 <object class="GtkVBox" id="GNUNET_setup_transport_https_client_proxy_type_vbox">
2697 <property name="visible">True</property> 2942 <property name="visible">True</property>
2698 <property name="can_focus">False</property> 2943 <property name="can_focus">False</property>
2699 <child> 2944 <child>
2700 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_none_radiobutton1"> 2945 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_none_radiobutton">
2701 <property name="label" translatable="yes">no proxy</property> 2946 <property name="label" translatable="yes">no proxy</property>
2702 <property name="visible">True</property> 2947 <property name="visible">True</property>
2703 <property name="can_focus">True</property> 2948 <property name="can_focus">True</property>
2704 <property name="receives_default">False</property> 2949 <property name="receives_default">False</property>
2950 <property name="xalign">0.5</property>
2705 <property name="active">True</property> 2951 <property name="active">True</property>
2706 <property name="draw_indicator">True</property> 2952 <property name="draw_indicator">True</property>
2707 </object> 2953 </object>
@@ -2712,11 +2958,12 @@
2712 </packing> 2958 </packing>
2713 </child> 2959 </child>
2714 <child> 2960 <child>
2715 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_http_radiobutton1"> 2961 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_http_radiobutton">
2716 <property name="label" translatable="yes">HTTP proxy</property> 2962 <property name="label" translatable="yes">HTTP proxy</property>
2717 <property name="visible">True</property> 2963 <property name="visible">True</property>
2718 <property name="can_focus">True</property> 2964 <property name="can_focus">True</property>
2719 <property name="receives_default">False</property> 2965 <property name="receives_default">False</property>
2966 <property name="xalign">0.5</property>
2720 <property name="draw_indicator">True</property> 2967 <property name="draw_indicator">True</property>
2721 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2968 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2722 </object> 2969 </object>
@@ -2727,11 +2974,12 @@
2727 </packing> 2974 </packing>
2728 </child> 2975 </child>
2729 <child> 2976 <child>
2730 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton1"> 2977 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_socks4_radiobutton">
2731 <property name="label" translatable="yes">HTTP 1.0 proxy</property> 2978 <property name="label" translatable="yes">SOCKS v4 proxy</property>
2732 <property name="visible">True</property> 2979 <property name="visible">True</property>
2733 <property name="can_focus">True</property> 2980 <property name="can_focus">True</property>
2734 <property name="receives_default">False</property> 2981 <property name="receives_default">False</property>
2982 <property name="xalign">0.5</property>
2735 <property name="draw_indicator">True</property> 2983 <property name="draw_indicator">True</property>
2736 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 2984 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2737 </object> 2985 </object>
@@ -2742,11 +2990,12 @@
2742 </packing> 2990 </packing>
2743 </child> 2991 </child>
2744 <child> 2992 <child>
2745 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton1"> 2993 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_socks4a_radiobutton">
2746 <property name="label" translatable="yes">SOCKS v4 proxy</property> 2994 <property name="label" translatable="yes">SOCKS v4a proxy</property>
2747 <property name="visible">True</property> 2995 <property name="visible">True</property>
2748 <property name="can_focus">True</property> 2996 <property name="can_focus">True</property>
2749 <property name="receives_default">False</property> 2997 <property name="receives_default">False</property>
2998 <property name="xalign">0.5</property>
2750 <property name="draw_indicator">True</property> 2999 <property name="draw_indicator">True</property>
2751 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 3000 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2752 </object> 3001 </object>
@@ -2757,11 +3006,12 @@
2757 </packing> 3006 </packing>
2758 </child> 3007 </child>
2759 <child> 3008 <child>
2760 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton1"> 3009 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_socks5_radiobutton">
2761 <property name="label" translatable="yes">SOCKS v4a proxy</property> 3010 <property name="label" translatable="yes">SOCKS v5 proxy</property>
2762 <property name="visible">True</property> 3011 <property name="visible">True</property>
2763 <property name="can_focus">True</property> 3012 <property name="can_focus">True</property>
2764 <property name="receives_default">False</property> 3013 <property name="receives_default">False</property>
3014 <property name="xalign">0.5</property>
2765 <property name="draw_indicator">True</property> 3015 <property name="draw_indicator">True</property>
2766 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 3016 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2767 </object> 3017 </object>
@@ -2772,11 +3022,12 @@
2772 </packing> 3022 </packing>
2773 </child> 3023 </child>
2774 <child> 3024 <child>
2775 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton1"> 3025 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_socks5_hostname_radiobutton">
2776 <property name="label" translatable="yes">SOCKS v5 proxy</property> 3026 <property name="label" translatable="yes">SOCKS v5 proxy with hostname</property>
2777 <property name="visible">True</property> 3027 <property name="visible">True</property>
2778 <property name="can_focus">True</property> 3028 <property name="can_focus">True</property>
2779 <property name="receives_default">False</property> 3029 <property name="receives_default">False</property>
3030 <property name="xalign">0.5</property>
2780 <property name="draw_indicator">True</property> 3031 <property name="draw_indicator">True</property>
2781 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property> 3032 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2782 </object> 3033 </object>
@@ -2787,19 +3038,7 @@
2787 </packing> 3038 </packing>
2788 </child> 3039 </child>
2789 <child> 3040 <child>
2790 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton1"> 3041 <placeholder/>
2791 <property name="label" translatable="yes">SOCKS v5 proxy with hostname</property>
2792 <property name="visible">True</property>
2793 <property name="can_focus">True</property>
2794 <property name="receives_default">False</property>
2795 <property name="draw_indicator">True</property>
2796 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
2797 </object>
2798 <packing>
2799 <property name="expand">True</property>
2800 <property name="fill">True</property>
2801 <property name="position">6</property>
2802 </packing>
2803 </child> 3042 </child>
2804 </object> 3043 </object>
2805 <packing> 3044 <packing>
@@ -2817,11 +3056,11 @@
2817 </packing> 3056 </packing>
2818 </child> 3057 </child>
2819 <child> 3058 <child>
2820 <object class="GtkHBox" id="GNUNET_setup_transport_http_client_proxy_hostname_hbox1"> 3059 <object class="GtkHBox" id="GNUNET_setup_transport_https_client_proxy_hostname_hbox">
2821 <property name="visible">True</property> 3060 <property name="visible">True</property>
2822 <property name="can_focus">False</property> 3061 <property name="can_focus">False</property>
2823 <child> 3062 <child>
2824 <object class="GtkLabel" id="GNUNET_setup_transport_http_client_proxy_hostname_label1"> 3063 <object class="GtkLabel" id="GNUNET_setup_transport_https_client_proxy_hostname_label">
2825 <property name="visible">True</property> 3064 <property name="visible">True</property>
2826 <property name="can_focus">False</property> 3065 <property name="can_focus">False</property>
2827 <property name="label" translatable="yes">Proxy hostname:</property> 3066 <property name="label" translatable="yes">Proxy hostname:</property>
@@ -2834,15 +3073,12 @@
2834 </packing> 3073 </packing>
2835 </child> 3074 </child>
2836 <child> 3075 <child>
2837 <object class="GtkEntry" id="GNUNET_setup_transport_http_client_proxy_hostname_entry1"> 3076 <object class="GtkEntry" id="GNUNET_setup_transport_https_client_proxy_hostname_entry">
2838 <property name="visible">True</property> 3077 <property name="visible">True</property>
2839 <property name="can_focus">True</property> 3078 <property name="can_focus">True</property>
2840 <property name="invisible_char">●</property> 3079 <property name="invisible_char">●</property>
2841 <property name="invisible_char_set">True</property>
2842 <property name="primary_icon_activatable">False</property> 3080 <property name="primary_icon_activatable">False</property>
2843 <property name="secondary_icon_activatable">False</property> 3081 <property name="secondary_icon_activatable">False</property>
2844 <property name="primary_icon_sensitive">True</property>
2845 <property name="secondary_icon_sensitive">True</property>
2846 </object> 3082 </object>
2847 <packing> 3083 <packing>
2848 <property name="expand">True</property> 3084 <property name="expand">True</property>
@@ -2858,11 +3094,11 @@
2858 </packing> 3094 </packing>
2859 </child> 3095 </child>
2860 <child> 3096 <child>
2861 <object class="GtkHBox" id="GNUNET_setup_transport_http_client_proxy_username_hbox1"> 3097 <object class="GtkHBox" id="GNUNET_setup_transport_https_client_proxy_username_hbox">
2862 <property name="visible">True</property> 3098 <property name="visible">True</property>
2863 <property name="can_focus">False</property> 3099 <property name="can_focus">False</property>
2864 <child> 3100 <child>
2865 <object class="GtkLabel" id="GNUNET_setup_transport_http_client_proxy_username_label1"> 3101 <object class="GtkLabel" id="GNUNET_setup_transport_https_client_proxy_username_label">
2866 <property name="visible">True</property> 3102 <property name="visible">True</property>
2867 <property name="can_focus">False</property> 3103 <property name="can_focus">False</property>
2868 <property name="label" translatable="yes">Proxy username:</property> 3104 <property name="label" translatable="yes">Proxy username:</property>
@@ -2875,15 +3111,12 @@
2875 </packing> 3111 </packing>
2876 </child> 3112 </child>
2877 <child> 3113 <child>
2878 <object class="GtkEntry" id="GNUNET_setup_transport_http_client_proxy_username_entry1"> 3114 <object class="GtkEntry" id="GNUNET_setup_transport_https_client_proxy_username_entry">
2879 <property name="visible">True</property> 3115 <property name="visible">True</property>
2880 <property name="can_focus">True</property> 3116 <property name="can_focus">True</property>
2881 <property name="invisible_char">●</property> 3117 <property name="invisible_char">●</property>
2882 <property name="invisible_char_set">True</property>
2883 <property name="primary_icon_activatable">False</property> 3118 <property name="primary_icon_activatable">False</property>
2884 <property name="secondary_icon_activatable">False</property> 3119 <property name="secondary_icon_activatable">False</property>
2885 <property name="primary_icon_sensitive">True</property>
2886 <property name="secondary_icon_sensitive">True</property>
2887 </object> 3120 </object>
2888 <packing> 3121 <packing>
2889 <property name="expand">True</property> 3122 <property name="expand">True</property>
@@ -2899,11 +3132,11 @@
2899 </packing> 3132 </packing>
2900 </child> 3133 </child>
2901 <child> 3134 <child>
2902 <object class="GtkHBox" id="GNUNET_setup_transport_http_client_proxy_password_hbox1"> 3135 <object class="GtkHBox" id="GNUNET_setup_transport_https_client_proxy_password_hbox">
2903 <property name="visible">True</property> 3136 <property name="visible">True</property>
2904 <property name="can_focus">False</property> 3137 <property name="can_focus">False</property>
2905 <child> 3138 <child>
2906 <object class="GtkLabel" id="GNUNET_setup_transport_http_client_proxy_password_label1"> 3139 <object class="GtkLabel" id="GNUNET_setup_transport_https_client_proxy_password_label">
2907 <property name="visible">True</property> 3140 <property name="visible">True</property>
2908 <property name="can_focus">False</property> 3141 <property name="can_focus">False</property>
2909 <property name="label" translatable="yes">Proxy password:</property> 3142 <property name="label" translatable="yes">Proxy password:</property>
@@ -2916,15 +3149,12 @@
2916 </packing> 3149 </packing>
2917 </child> 3150 </child>
2918 <child> 3151 <child>
2919 <object class="GtkEntry" id="GNUNET_setup_transport_http_client_proxy_password_entry1"> 3152 <object class="GtkEntry" id="GNUNET_setup_transport_https_client_proxy_password_entry">
2920 <property name="visible">True</property> 3153 <property name="visible">True</property>
2921 <property name="can_focus">True</property> 3154 <property name="can_focus">True</property>
2922 <property name="invisible_char">●</property> 3155 <property name="invisible_char">●</property>
2923 <property name="invisible_char_set">True</property>
2924 <property name="primary_icon_activatable">False</property> 3156 <property name="primary_icon_activatable">False</property>
2925 <property name="secondary_icon_activatable">False</property> 3157 <property name="secondary_icon_activatable">False</property>
2926 <property name="primary_icon_sensitive">True</property>
2927 <property name="secondary_icon_sensitive">True</property>
2928 </object> 3158 </object>
2929 <packing> 3159 <packing>
2930 <property name="expand">True</property> 3160 <property name="expand">True</property>
@@ -3006,11 +3236,8 @@
3006 <property name="can_focus">True</property> 3236 <property name="can_focus">True</property>
3007 <property name="max_length">255</property> 3237 <property name="max_length">255</property>
3008 <property name="invisible_char">●</property> 3238 <property name="invisible_char">●</property>
3009 <property name="invisible_char_set">True</property>
3010 <property name="primary_icon_activatable">False</property> 3239 <property name="primary_icon_activatable">False</property>
3011 <property name="secondary_icon_activatable">False</property> 3240 <property name="secondary_icon_activatable">False</property>
3012 <property name="primary_icon_sensitive">True</property>
3013 <property name="secondary_icon_sensitive">True</property>
3014 </object> 3241 </object>
3015 <packing> 3242 <packing>
3016 <property name="expand">False</property> 3243 <property name="expand">False</property>
@@ -3276,11 +3503,8 @@
3276 <property name="visible">True</property> 3503 <property name="visible">True</property>
3277 <property name="can_focus">True</property> 3504 <property name="can_focus">True</property>
3278 <property name="invisible_char">•</property> 3505 <property name="invisible_char">•</property>
3279 <property name="invisible_char_set">True</property>
3280 <property name="primary_icon_activatable">False</property> 3506 <property name="primary_icon_activatable">False</property>
3281 <property name="secondary_icon_activatable">False</property> 3507 <property name="secondary_icon_activatable">False</property>
3282 <property name="primary_icon_sensitive">True</property>
3283 <property name="secondary_icon_sensitive">True</property>
3284 <property name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property> 3508 <property name="adjustment">GNUNET_setup_fs_datastore_quota_adjustment</property>
3285 <property name="numeric">True</property> 3509 <property name="numeric">True</property>
3286 </object> 3510 </object>
@@ -3345,11 +3569,8 @@
3345 <property name="can_focus">True</property> 3569 <property name="can_focus">True</property>
3346 <property name="invisible_char">•</property> 3570 <property name="invisible_char">•</property>
3347 <property name="text" translatable="yes">gnunet</property> 3571 <property name="text" translatable="yes">gnunet</property>
3348 <property name="invisible_char_set">True</property>
3349 <property name="primary_icon_activatable">False</property> 3572 <property name="primary_icon_activatable">False</property>
3350 <property name="secondary_icon_activatable">False</property> 3573 <property name="secondary_icon_activatable">False</property>
3351 <property name="primary_icon_sensitive">True</property>
3352 <property name="secondary_icon_sensitive">True</property>
3353 <signal name="changed" handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/> 3574 <signal name="changed" handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
3354 </object> 3575 </object>
3355 <packing> 3576 <packing>
@@ -3423,11 +3644,8 @@
3423 <property name="visible">True</property> 3644 <property name="visible">True</property>
3424 <property name="can_focus">True</property> 3645 <property name="can_focus">True</property>
3425 <property name="invisible_char">•</property> 3646 <property name="invisible_char">•</property>
3426 <property name="invisible_char_set">True</property>
3427 <property name="primary_icon_activatable">False</property> 3647 <property name="primary_icon_activatable">False</property>
3428 <property name="secondary_icon_activatable">False</property> 3648 <property name="secondary_icon_activatable">False</property>
3429 <property name="primary_icon_sensitive">True</property>
3430 <property name="secondary_icon_sensitive">True</property>
3431 </object> 3649 </object>
3432 <packing> 3650 <packing>
3433 <property name="expand">True</property> 3651 <property name="expand">True</property>
@@ -3453,11 +3671,8 @@
3453 <property name="visible">True</property> 3671 <property name="visible">True</property>
3454 <property name="can_focus">True</property> 3672 <property name="can_focus">True</property>
3455 <property name="invisible_char">•</property> 3673 <property name="invisible_char">•</property>
3456 <property name="invisible_char_set">True</property>
3457 <property name="primary_icon_activatable">False</property> 3674 <property name="primary_icon_activatable">False</property>
3458 <property name="secondary_icon_activatable">False</property> 3675 <property name="secondary_icon_activatable">False</property>
3459 <property name="primary_icon_sensitive">True</property>
3460 <property name="secondary_icon_sensitive">True</property>
3461 </object> 3676 </object>
3462 <packing> 3677 <packing>
3463 <property name="expand">True</property> 3678 <property name="expand">True</property>
@@ -3496,11 +3711,8 @@
3496 <property name="can_focus">True</property> 3711 <property name="can_focus">True</property>
3497 <property name="invisible_char">•</property> 3712 <property name="invisible_char">•</property>
3498 <property name="text" translatable="yes">localhost</property> 3713 <property name="text" translatable="yes">localhost</property>
3499 <property name="invisible_char_set">True</property>
3500 <property name="primary_icon_activatable">False</property> 3714 <property name="primary_icon_activatable">False</property>
3501 <property name="secondary_icon_activatable">False</property> 3715 <property name="secondary_icon_activatable">False</property>
3502 <property name="primary_icon_sensitive">True</property>
3503 <property name="secondary_icon_sensitive">True</property>
3504 </object> 3716 </object>
3505 <packing> 3717 <packing>
3506 <property name="expand">True</property> 3718 <property name="expand">True</property>
@@ -3527,11 +3739,8 @@
3527 <property name="visible">True</property> 3739 <property name="visible">True</property>
3528 <property name="can_focus">True</property> 3740 <property name="can_focus">True</property>
3529 <property name="invisible_char">•</property> 3741 <property name="invisible_char">•</property>
3530 <property name="invisible_char_set">True</property>
3531 <property name="primary_icon_activatable">False</property> 3742 <property name="primary_icon_activatable">False</property>
3532 <property name="secondary_icon_activatable">False</property> 3743 <property name="secondary_icon_activatable">False</property>
3533 <property name="primary_icon_sensitive">True</property>
3534 <property name="secondary_icon_sensitive">True</property>
3535 <property name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property> 3744 <property name="adjustment">GNUNET_setup_fs_datastore_mysql_port_adjustment</property>
3536 <property name="numeric">True</property> 3745 <property name="numeric">True</property>
3537 <signal name="value-changed" handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/> 3746 <signal name="value-changed" handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
@@ -3638,11 +3847,8 @@
3638 <property name="visible">True</property> 3847 <property name="visible">True</property>
3639 <property name="can_focus">True</property> 3848 <property name="can_focus">True</property>
3640 <property name="invisible_char">•</property> 3849 <property name="invisible_char">•</property>
3641 <property name="invisible_char_set">True</property>
3642 <property name="primary_icon_activatable">False</property> 3850 <property name="primary_icon_activatable">False</property>
3643 <property name="secondary_icon_activatable">False</property> 3851 <property name="secondary_icon_activatable">False</property>
3644 <property name="primary_icon_sensitive">True</property>
3645 <property name="secondary_icon_sensitive">True</property>
3646 <signal name="changed" handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/> 3852 <signal name="changed" handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/>
3647 </object> 3853 </object>
3648 <packing> 3854 <packing>
@@ -3870,11 +4076,8 @@
3870 <property name="visible">True</property> 4076 <property name="visible">True</property>
3871 <property name="can_focus">True</property> 4077 <property name="can_focus">True</property>
3872 <property name="invisible_char">•</property> 4078 <property name="invisible_char">•</property>
3873 <property name="invisible_char_set">True</property>
3874 <property name="primary_icon_activatable">False</property> 4079 <property name="primary_icon_activatable">False</property>
3875 <property name="secondary_icon_activatable">False</property> 4080 <property name="secondary_icon_activatable">False</property>
3876 <property name="primary_icon_sensitive">True</property>
3877 <property name="secondary_icon_sensitive">True</property>
3878 <property name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property> 4081 <property name="adjustment">GNUNET_setup_fs_datacache_quota_adjustment</property>
3879 <property name="numeric">True</property> 4082 <property name="numeric">True</property>
3880 </object> 4083 </object>
@@ -3954,11 +4157,8 @@
3954 <property name="visible">True</property> 4157 <property name="visible">True</property>
3955 <property name="can_focus">True</property> 4158 <property name="can_focus">True</property>
3956 <property name="invisible_char">•</property> 4159 <property name="invisible_char">•</property>
3957 <property name="invisible_char_set">True</property>
3958 <property name="primary_icon_activatable">False</property> 4160 <property name="primary_icon_activatable">False</property>
3959 <property name="secondary_icon_activatable">False</property> 4161 <property name="secondary_icon_activatable">False</property>
3960 <property name="primary_icon_sensitive">True</property>
3961 <property name="secondary_icon_sensitive">True</property>
3962 <signal name="changed" handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/> 4162 <signal name="changed" handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/>
3963 </object> 4163 </object>
3964 <packing> 4164 <packing>
@@ -4108,6 +4308,7 @@
4108 <property name="can_focus">True</property> 4308 <property name="can_focus">True</property>
4109 <property name="receives_default">False</property> 4309 <property name="receives_default">False</property>
4110 <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> 4310 <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>
4311 <property name="xalign">0.5</property>
4111 <property name="draw_indicator">True</property> 4312 <property name="draw_indicator">True</property>
4112 </object> 4313 </object>
4113 <packing> 4314 <packing>
@@ -4124,6 +4325,7 @@
4124 <property name="can_focus">True</property> 4325 <property name="can_focus">True</property>
4125 <property name="receives_default">False</property> 4326 <property name="receives_default">False</property>
4126 <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> 4327 <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>
4328 <property name="xalign">0.5</property>
4127 <property name="draw_indicator">True</property> 4329 <property name="draw_indicator">True</property>
4128 </object> 4330 </object>
4129 <packing> 4331 <packing>
@@ -4140,6 +4342,7 @@
4140 <property name="can_focus">True</property> 4342 <property name="can_focus">True</property>
4141 <property name="receives_default">False</property> 4343 <property name="receives_default">False</property>
4142 <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 (using the network as a 1-hop proxy in the worst-case, so this does not provide you with strong anonymity).</property> 4344 <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 (using the network as a 1-hop proxy in the worst-case, so this does not provide you with strong anonymity).</property>
4345 <property name="xalign">0.5</property>
4143 <property name="draw_indicator">True</property> 4346 <property name="draw_indicator">True</property>
4144 </object> 4347 </object>
4145 <packing> 4348 <packing>
@@ -4217,8 +4420,6 @@
4217 <property name="invisible_char">●</property> 4420 <property name="invisible_char">●</property>
4218 <property name="primary_icon_activatable">False</property> 4421 <property name="primary_icon_activatable">False</property>
4219 <property name="secondary_icon_activatable">False</property> 4422 <property name="secondary_icon_activatable">False</property>
4220 <property name="primary_icon_sensitive">True</property>
4221 <property name="secondary_icon_sensitive">True</property>
4222 </object> 4423 </object>
4223 <packing> 4424 <packing>
4224 <property name="expand">False</property> 4425 <property name="expand">False</property>
@@ -4257,8 +4458,6 @@
4257 <property name="invisible_char">●</property> 4458 <property name="invisible_char">●</property>
4258 <property name="primary_icon_activatable">False</property> 4459 <property name="primary_icon_activatable">False</property>
4259 <property name="secondary_icon_activatable">False</property> 4460 <property name="secondary_icon_activatable">False</property>
4260 <property name="primary_icon_sensitive">True</property>
4261 <property name="secondary_icon_sensitive">True</property>
4262 </object> 4461 </object>
4263 <packing> 4462 <packing>
4264 <property name="expand">False</property> 4463 <property name="expand">False</property>
@@ -4285,8 +4484,6 @@
4285 <property name="invisible_char">●</property> 4484 <property name="invisible_char">●</property>
4286 <property name="primary_icon_activatable">False</property> 4485 <property name="primary_icon_activatable">False</property>
4287 <property name="secondary_icon_activatable">False</property> 4486 <property name="secondary_icon_activatable">False</property>
4288 <property name="primary_icon_sensitive">True</property>
4289 <property name="secondary_icon_sensitive">True</property>
4290 </object> 4487 </object>
4291 <packing> 4488 <packing>
4292 <property name="expand">False</property> 4489 <property name="expand">False</property>
@@ -4325,8 +4522,6 @@
4325 <property name="invisible_char">●</property> 4522 <property name="invisible_char">●</property>
4326 <property name="primary_icon_activatable">False</property> 4523 <property name="primary_icon_activatable">False</property>
4327 <property name="secondary_icon_activatable">False</property> 4524 <property name="secondary_icon_activatable">False</property>
4328 <property name="primary_icon_sensitive">True</property>
4329 <property name="secondary_icon_sensitive">True</property>
4330 </object> 4525 </object>
4331 <packing> 4526 <packing>
4332 <property name="expand">False</property> 4527 <property name="expand">False</property>
@@ -4353,8 +4548,6 @@
4353 <property name="invisible_char">●</property> 4548 <property name="invisible_char">●</property>
4354 <property name="primary_icon_activatable">False</property> 4549 <property name="primary_icon_activatable">False</property>
4355 <property name="secondary_icon_activatable">False</property> 4550 <property name="secondary_icon_activatable">False</property>
4356 <property name="primary_icon_sensitive">True</property>
4357 <property name="secondary_icon_sensitive">True</property>
4358 <property name="adjustment">GNUNET_setup_vpn_interface_mask_adjustment</property> 4551 <property name="adjustment">GNUNET_setup_vpn_interface_mask_adjustment</property>
4359 </object> 4552 </object>
4360 <packing> 4553 <packing>
@@ -4513,8 +4706,6 @@
4513 <property name="invisible_char">●</property> 4706 <property name="invisible_char">●</property>
4514 <property name="primary_icon_activatable">False</property> 4707 <property name="primary_icon_activatable">False</property>
4515 <property name="secondary_icon_activatable">False</property> 4708 <property name="secondary_icon_activatable">False</property>
4516 <property name="primary_icon_sensitive">True</property>
4517 <property name="secondary_icon_sensitive">True</property>
4518 </object> 4709 </object>
4519 <packing> 4710 <packing>
4520 <property name="expand">False</property> 4711 <property name="expand">False</property>
@@ -4555,8 +4746,6 @@
4555 <property name="invisible_char">●</property> 4746 <property name="invisible_char">●</property>
4556 <property name="primary_icon_activatable">False</property> 4747 <property name="primary_icon_activatable">False</property>
4557 <property name="secondary_icon_activatable">False</property> 4748 <property name="secondary_icon_activatable">False</property>
4558 <property name="primary_icon_sensitive">True</property>
4559 <property name="secondary_icon_sensitive">True</property>
4560 </object> 4749 </object>
4561 <packing> 4750 <packing>
4562 <property name="expand">False</property> 4751 <property name="expand">False</property>
@@ -4597,8 +4786,6 @@
4597 <property name="invisible_char">●</property> 4786 <property name="invisible_char">●</property>
4598 <property name="primary_icon_activatable">False</property> 4787 <property name="primary_icon_activatable">False</property>
4599 <property name="secondary_icon_activatable">False</property> 4788 <property name="secondary_icon_activatable">False</property>
4600 <property name="primary_icon_sensitive">True</property>
4601 <property name="secondary_icon_sensitive">True</property>
4602 </object> 4789 </object>
4603 <packing> 4790 <packing>
4604 <property name="expand">False</property> 4791 <property name="expand">False</property>
@@ -4625,8 +4812,6 @@
4625 <property name="invisible_char">●</property> 4812 <property name="invisible_char">●</property>
4626 <property name="primary_icon_activatable">False</property> 4813 <property name="primary_icon_activatable">False</property>
4627 <property name="secondary_icon_activatable">False</property> 4814 <property name="secondary_icon_activatable">False</property>
4628 <property name="primary_icon_sensitive">True</property>
4629 <property name="secondary_icon_sensitive">True</property>
4630 </object> 4815 </object>
4631 <packing> 4816 <packing>
4632 <property name="expand">False</property> 4817 <property name="expand">False</property>
@@ -4667,8 +4852,6 @@
4667 <property name="invisible_char">●</property> 4852 <property name="invisible_char">●</property>
4668 <property name="primary_icon_activatable">False</property> 4853 <property name="primary_icon_activatable">False</property>
4669 <property name="secondary_icon_activatable">False</property> 4854 <property name="secondary_icon_activatable">False</property>
4670 <property name="primary_icon_sensitive">True</property>
4671 <property name="secondary_icon_sensitive">True</property>
4672 </object> 4855 </object>
4673 <packing> 4856 <packing>
4674 <property name="expand">False</property> 4857 <property name="expand">False</property>
@@ -4695,8 +4878,6 @@
4695 <property name="invisible_char">●</property> 4878 <property name="invisible_char">●</property>
4696 <property name="primary_icon_activatable">False</property> 4879 <property name="primary_icon_activatable">False</property>
4697 <property name="secondary_icon_activatable">False</property> 4880 <property name="secondary_icon_activatable">False</property>
4698 <property name="primary_icon_sensitive">True</property>
4699 <property name="secondary_icon_sensitive">True</property>
4700 <property name="adjustment">GNUNET_setup_exit_interface_mask_adjustment</property> 4881 <property name="adjustment">GNUNET_setup_exit_interface_mask_adjustment</property>
4701 </object> 4882 </object>
4702 <packing> 4883 <packing>
@@ -4771,8 +4952,6 @@
4771 <property name="invisible_char">●</property> 4952 <property name="invisible_char">●</property>
4772 <property name="primary_icon_activatable">False</property> 4953 <property name="primary_icon_activatable">False</property>
4773 <property name="secondary_icon_activatable">False</property> 4954 <property name="secondary_icon_activatable">False</property>
4774 <property name="primary_icon_sensitive">True</property>
4775 <property name="secondary_icon_sensitive">True</property>
4776 </object> 4955 </object>
4777 <packing> 4956 <packing>
4778 <property name="expand">True</property> 4957 <property name="expand">True</property>
@@ -4812,8 +4991,6 @@
4812 <property name="invisible_char">●</property> 4991 <property name="invisible_char">●</property>
4813 <property name="primary_icon_activatable">False</property> 4992 <property name="primary_icon_activatable">False</property>
4814 <property name="secondary_icon_activatable">False</property> 4993 <property name="secondary_icon_activatable">False</property>
4815 <property name="primary_icon_sensitive">True</property>
4816 <property name="secondary_icon_sensitive">True</property>
4817 </object> 4994 </object>
4818 <packing> 4995 <packing>
4819 <property name="expand">True</property> 4996 <property name="expand">True</property>
@@ -4864,9 +5041,12 @@
4864 <object class="GtkTreeView" id="GNUNET_setup_hosted_service_treeview"> 5041 <object class="GtkTreeView" id="GNUNET_setup_hosted_service_treeview">
4865 <property name="visible">True</property> 5042 <property name="visible">True</property>
4866 <property name="can_focus">True</property> 5043 <property name="can_focus">True</property>
4867 <property name="model">GNUNET_setup_hosted_service_liststore</property>
4868 <property name="hadjustment">adjustment9</property> 5044 <property name="hadjustment">adjustment9</property>
4869 <property name="vadjustment">adjustment10</property> 5045 <property name="vadjustment">adjustment10</property>
5046 <property name="model">GNUNET_setup_hosted_service_liststore</property>
5047 <child internal-child="selection">
5048 <object class="GtkTreeSelection" id="treeview-selection2"/>
5049 </child>
4870 <child> 5050 <child>
4871 <object class="GtkTreeViewColumn" id="GNUNET_SETUP_hosted_service_identifier_treeviewcolumn"> 5051 <object class="GtkTreeViewColumn" id="GNUNET_SETUP_hosted_service_identifier_treeviewcolumn">
4872 <property name="title" translatable="yes">_Identifier</property> 5052 <property name="title" translatable="yes">_Identifier</property>
@@ -5018,8 +5198,8 @@
5018 <property name="xalign">0</property> 5198 <property name="xalign">0</property>
5019 <property name="active">True</property> 5199 <property name="active">True</property>
5020 <property name="draw_indicator">True</property> 5200 <property name="draw_indicator">True</property>
5021 <signal name="toggled" handler="GNUNET_setup_namestore_sqlite_radiobutton_toggled_cb" swapped="no"/>
5022 <signal name="realize" handler="GNUNET_setup_namestore_sqlite_radiobutton_realize_cb" swapped="no"/> 5201 <signal name="realize" handler="GNUNET_setup_namestore_sqlite_radiobutton_realize_cb" swapped="no"/>
5202 <signal name="toggled" handler="GNUNET_setup_namestore_sqlite_radiobutton_toggled_cb" swapped="no"/>
5023 </object> 5203 </object>
5024 <packing> 5204 <packing>
5025 <property name="expand">False</property> 5205 <property name="expand">False</property>
@@ -5101,11 +5281,8 @@
5101 <property name="visible">True</property> 5281 <property name="visible">True</property>
5102 <property name="can_focus">True</property> 5282 <property name="can_focus">True</property>
5103 <property name="invisible_char">•</property> 5283 <property name="invisible_char">•</property>
5104 <property name="invisible_char_set">True</property>
5105 <property name="primary_icon_activatable">False</property> 5284 <property name="primary_icon_activatable">False</property>
5106 <property name="secondary_icon_activatable">False</property> 5285 <property name="secondary_icon_activatable">False</property>
5107 <property name="primary_icon_sensitive">True</property>
5108 <property name="secondary_icon_sensitive">True</property>
5109 </object> 5286 </object>
5110 <packing> 5287 <packing>
5111 <property name="expand">True</property> 5288 <property name="expand">True</property>
@@ -5276,302 +5453,23 @@
5276 <action-widget response="-3">GNUNET_setup_save_button</action-widget> 5453 <action-widget response="-3">GNUNET_setup_save_button</action-widget>
5277 </action-widgets> 5454 </action-widgets>
5278 </object> 5455 </object>
5279 <object class="GtkAdjustment" id="GNUNET_setup_exit_interface_mask_adjustment"> 5456 <object class="GtkRadioButton" id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
5280 <property name="lower">1</property> 5457 <property name="label" translatable="yes">HTTP 1.0 proxy</property>
5281 <property name="upper">127</property> 5458 <property name="visible">True</property>
5282 <property name="value">48</property> 5459 <property name="can_focus">True</property>
5283 <property name="step_increment">1</property> 5460 <property name="receives_default">False</property>
5284 <property name="page_increment">10</property> 5461 <property name="xalign">0.5</property>
5285 </object> 5462 <property name="active">True</property>
5286 <object class="GtkAdjustment" id="GNUNET_setup_fs_datacache_mysql_port_adjustment"> 5463 <property name="draw_indicator">True</property>
5287 <property name="lower">1</property> 5464 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
5288 <property name="upper">65535</property>
5289 <property name="value">3306</property>
5290 <property name="step_increment">1</property>
5291 <property name="page_increment">10</property>
5292 </object>
5293 <object class="GtkAdjustment" id="GNUNET_setup_fs_datacache_quota_adjustment">
5294 <property name="lower">65536</property>
5295 <property name="upper">9999999999</property>
5296 <property name="value">1024000</property>
5297 <property name="step_increment">65536</property>
5298 <property name="page_increment">1024000</property>
5299 </object>
5300 <object class="GtkAdjustment" id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
5301 <property name="lower">1</property>
5302 <property name="upper">65535</property>
5303 <property name="value">3306</property>
5304 <property name="step_increment">1</property>
5305 <property name="page_increment">10</property>
5306 </object>
5307 <object class="GtkAdjustment" id="GNUNET_setup_fs_datastore_quota_adjustment">
5308 <property name="lower">1000000</property>
5309 <property name="upper">999999999999</property>
5310 <property name="value">100000000</property>
5311 <property name="step_increment">1000000</property>
5312 <property name="page_increment">1000000000</property>
5313 </object>
5314 <object class="GtkListStore" id="GNUNET_setup_gns_exit_dialog_liststore">
5315 <columns>
5316 <!-- column-name sourceport -->
5317 <column type="guint"/>
5318 <!-- column-name targetport -->
5319 <column type="guint"/>
5320 <!-- column-name targethostname -->
5321 <column type="gchararray"/>
5322 <!-- column-name isudp -->
5323 <column type="gchararray"/>
5324 </columns>
5325 </object>
5326 <object class="GtkTreeStore" id="GNUNET_setup_gns_treestore">
5327 <columns>
5328 <!-- column-name name -->
5329 <column type="gchararray"/>
5330 <!-- column-name is_public -->
5331 <column type="gboolean"/>
5332 <!-- column-name record_type -->
5333 <column type="guint"/>
5334 <!-- column-name record_type_as_string -->
5335 <column type="gchararray"/>
5336 <!-- column-name expiration_time -->
5337 <column type="guint64"/>
5338 <!-- column-name expiration_time_is_relative -->
5339 <column type="gboolean"/>
5340 <!-- column-name expiration_time_as_string -->
5341 <column type="gchararray"/>
5342 <!-- column-name value_as_string -->
5343 <column type="gchararray"/>
5344 <!-- column-name value_color -->
5345 <column type="gchararray"/>
5346 <!-- column-name name_is_editable -->
5347 <column type="gboolean"/>
5348 <!-- column-name name_is_record_row -->
5349 <column type="gboolean"/>
5350 <!-- column-name not_dummy_row -->
5351 <column type="gboolean"/>
5352 <!-- column-name expiration_time_color -->
5353 <column type="gchararray"/>
5354 <!-- column-name name_color -->
5355 <column type="gchararray"/>
5356 <!-- column-name type_is_editable -->
5357 <column type="gboolean"/>
5358 <!-- column-name is_shadow -->
5359 <column type="gboolean"/>
5360 <!-- column-name name_is_editable1 -->
5361 <column type="gboolean"/>
5362 <!-- column-name record_offset -->
5363 <column type="guint"/>
5364 </columns>
5365 </object>
5366 <object class="GtkListStore" id="GNUNET_setup_gns_type_liststore">
5367 <columns>
5368 <!-- column-name type -->
5369 <column type="guint"/>
5370 <!-- column-name typename -->
5371 <column type="gchararray"/>
5372 </columns>
5373 <data>
5374 <row>
5375 <col id="0">1</col>
5376 <col id="1">A</col>
5377 </row>
5378 <row>
5379 <col id="0">2</col>
5380 <col id="1">NS</col>
5381 </row>
5382 <row>
5383 <col id="0">5</col>
5384 <col id="1">CNAME</col>
5385 </row>
5386 <row>
5387 <col id="0">6</col>
5388 <col id="1">SOA</col>
5389 </row>
5390 <row>
5391 <col id="0">12</col>
5392 <col id="1">PTR</col>
5393 </row>
5394 <row>
5395 <col id="0">15</col>
5396 <col id="1">MX</col>
5397 </row>
5398 <row>
5399 <col id="0">16</col>
5400 <col id="1">TXT</col>
5401 </row>
5402 <row>
5403 <col id="0">28</col>
5404 <col id="1">AAAA</col>
5405 </row>
5406 <row>
5407 <col id="0">65536</col>
5408 <col id="1">PKEY</col>
5409 </row>
5410 <row>
5411 <col id="0">65538</col>
5412 <col id="1">LEHO</col>
5413 </row>
5414 <row>
5415 <col id="0">65539</col>
5416 <col id="1">VPN</col>
5417 </row>
5418 </data>
5419 </object>
5420 <object class="GtkListStore" id="GNUNET_setup_hosted_service_liststore">
5421 <columns>
5422 <!-- column-name name -->
5423 <column type="gchararray"/>
5424 <!-- column-name is_udp -->
5425 <column type="gboolean"/>
5426 <!-- column-name visible_port -->
5427 <column type="guint"/>
5428 <!-- column-name destination_address -->
5429 <column type="gchararray"/>
5430 </columns>
5431 </object>
5432 <object class="GtkAdjustment" id="GNUNET_setup_hostlist_server_port_adjustment">
5433 <property name="lower">1</property>
5434 <property name="upper">65535</property>
5435 <property name="value">8080</property>
5436 <property name="step_increment">1</property>
5437 <property name="page_increment">10</property>
5438 </object>
5439 <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
5440 <columns>
5441 <!-- column-name url -->
5442 <column type="gchararray"/>
5443 <!-- column-name editable -->
5444 <column type="gboolean"/>
5445 </columns>
5446 </object>
5447 <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
5448 <property name="upper">9999</property>
5449 <property name="step_increment">1</property>
5450 <property name="page_increment">10</property>
5451 </object>
5452 <object class="GtkAdjustment" id="GNUNET_setup_transport_http_advertised_port_adjustment">
5453 <property name="lower">1</property>
5454 <property name="upper">65535</property>
5455 <property name="value">1080</property>
5456 <property name="step_increment">1</property>
5457 <property name="page_increment">10</property>
5458 </object>
5459 <object class="GtkAdjustment" id="GNUNET_setup_transport_http_port_adjustment">
5460 <property name="lower">1</property>
5461 <property name="upper">65535</property>
5462 <property name="value">1080</property>
5463 <property name="step_increment">1</property>
5464 <property name="page_increment">10</property>
5465 </object>
5466 <object class="GtkAdjustment" id="GNUNET_setup_transport_https_advertised_port_adjustment">
5467 <property name="lower">1</property>
5468 <property name="upper">65535</property>
5469 <property name="value">443</property>
5470 <property name="step_increment">1</property>
5471 <property name="page_increment">10</property>
5472 </object>
5473 <object class="GtkAdjustment" id="GNUNET_setup_transport_https_port_adjustment">
5474 <property name="lower">1</property>
5475 <property name="upper">65535</property>
5476 <property name="value">443</property>
5477 <property name="step_increment">1</property>
5478 <property name="page_increment">10</property>
5479 </object>
5480 <object class="GtkAdjustment" id="GNUNET_setup_transport_tcp_adv_port_adjustment">
5481 <property name="lower">1</property>
5482 <property name="upper">65535</property>
5483 <property name="value">2086</property>
5484 <property name="step_increment">1</property>
5485 <property name="page_increment">10</property>
5486 </object>
5487 <object class="GtkAdjustment" id="GNUNET_setup_transport_tcp_port_adjustment">
5488 <property name="upper">65535</property>
5489 <property name="value">2086</property>
5490 <property name="step_increment">1</property>
5491 <property name="page_increment">10</property>
5492 </object>
5493 <object class="GtkAdjustment" id="GNUNET_setup_transport_udp_advertised_port_adjustment">
5494 <property name="lower">1</property>
5495 <property name="upper">65535</property>
5496 <property name="value">2086</property>
5497 <property name="step_increment">1</property>
5498 <property name="page_increment">10</property>
5499 </object>
5500 <object class="GtkAdjustment" id="GNUNET_setup_transport_udp_port_adjustment">
5501 <property name="lower">1</property>
5502 <property name="upper">65535</property>
5503 <property name="value">2086</property>
5504 <property name="step_increment">1</property>
5505 <property name="page_increment">10</property>
5506 </object>
5507 <object class="GtkAdjustment" id="GNUNET_setup_vpn_interface_mask_adjustment">
5508 <property name="lower">1</property>
5509 <property name="upper">127</property>
5510 <property name="value">48</property>
5511 <property name="step_increment">1</property>
5512 <property name="page_increment">10</property>
5513 </object>
5514 <object class="GtkAdjustment" id="adjustment1">
5515 <property name="upper">100</property>
5516 <property name="step_increment">1</property>
5517 <property name="page_increment">10</property>
5518 <property name="page_size">10</property>
5519 </object>
5520 <object class="GtkAdjustment" id="adjustment10">
5521 <property name="upper">100</property>
5522 <property name="step_increment">1</property>
5523 <property name="page_increment">10</property>
5524 </object>
5525 <object class="GtkAdjustment" id="adjustment2">
5526 <property name="upper">100</property>
5527 <property name="step_increment">1</property>
5528 <property name="page_increment">10</property>
5529 <property name="page_size">10</property>
5530 </object>
5531 <object class="GtkAdjustment" id="adjustment3">
5532 <property name="upper">100</property>
5533 <property name="step_increment">1</property>
5534 <property name="page_increment">10</property>
5535 <property name="page_size">10</property>
5536 </object>
5537 <object class="GtkAdjustment" id="adjustment4">
5538 <property name="upper">100</property>
5539 <property name="step_increment">1</property>
5540 <property name="page_increment">10</property>
5541 <property name="page_size">10</property>
5542 </object>
5543 <object class="GtkAdjustment" id="adjustment5">
5544 <property name="upper">100</property>
5545 <property name="step_increment">1</property>
5546 <property name="page_increment">10</property>
5547 <property name="page_size">10</property>
5548 </object>
5549 <object class="GtkAdjustment" id="adjustment6">
5550 <property name="upper">100</property>
5551 <property name="step_increment">1</property>
5552 <property name="page_increment">10</property>
5553 <property name="page_size">10</property>
5554 </object>
5555 <object class="GtkAdjustment" id="adjustment7">
5556 <property name="upper">100</property>
5557 <property name="step_increment">1</property>
5558 <property name="page_increment">10</property>
5559 <property name="page_size">10</property>
5560 </object>
5561 <object class="GtkAdjustment" id="adjustment8">
5562 <property name="upper">100</property>
5563 <property name="step_increment">1</property>
5564 <property name="page_increment">10</property>
5565 <property name="page_size">10</property>
5566 </object>
5567 <object class="GtkAdjustment" id="adjustment9">
5568 <property name="upper">100</property>
5569 <property name="step_increment">1</property>
5570 <property name="page_increment">10</property>
5571 </object> 5465 </object>
5572 <object class="GtkImage" id="edit_image"> 5466 <object class="GtkRadioButton" id="GNUNET_setup_transport_https_client_proxy_type_http_10_radiobutton">
5467 <property name="label" translatable="yes">HTTP 1.0 proxy</property>
5573 <property name="visible">True</property> 5468 <property name="visible">True</property>
5574 <property name="can_focus">False</property> 5469 <property name="can_focus">True</property>
5575 <property name="stock">gtk-edit</property> 5470 <property name="receives_default">False</property>
5471 <property name="xalign">0.5</property>
5472 <property name="draw_indicator">True</property>
5473 <property name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
5576 </object> 5474 </object>
5577</interface> 5475</interface>
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index 9cee7276..5fbf2314 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -971,7 +971,7 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_udp_tab[] = {
971 * Hide "http-client" tab if HTTP client not active. 971 * Hide "http-client" tab if HTTP client not active.
972 */ 972 */
973static struct GNUNET_SETUP_VisibilitySpecification hide_http_client_tab[] = { 973static struct GNUNET_SETUP_VisibilitySpecification hide_http_client_tab[] = {
974 {"GNUNET_setup_transport_http_server_vbox", "(^| )http_client($| )", NULL}, 974 {"GNUNET_setup_transport_http_client_vbox", "(^| )http_client($| )", NULL},
975 {NULL, NULL, NULL} 975 {NULL, NULL, NULL}
976}; 976};
977 977
@@ -983,6 +983,13 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_http_server_tab[] = {
983 {NULL, NULL, NULL} 983 {NULL, NULL, NULL}
984}; 984};
985 985
986/**
987 * Hide "https-client" tab if HTTPS client not active.
988 */
989static struct GNUNET_SETUP_VisibilitySpecification hide_https_client_tab[] = {
990 {"GNUNET_setup_transport_https_client_vbox", "(^| )https_client($| )", NULL},
991 {NULL, NULL, NULL}
992};
986 993
987/** 994/**
988 * Hide "https server" tab if HTTPS server not active. 995 * Hide "https server" tab if HTTPS server not active.
@@ -1507,7 +1514,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1507 &load_option_list, 1514 &load_option_list,
1508 &save_option_list, "https_client", 1515 &save_option_list, "https_client",
1509 &highlight_port_collisions, NULL, 1516 &highlight_port_collisions, NULL,
1510 NULL}, 1517 hide_https_client_tab},
1511 1518
1512 { 1519 {
1513 "GNUNET_setup_transport_dv_checkbutton", 1520 "GNUNET_setup_transport_dv_checkbutton",
@@ -1755,19 +1762,6 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1755 }, 1762 },
1756 1763
1757 { 1764 {
1758 "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton",
1759 "toggled",
1760 "transport-http_client",
1761 "PROXY_TYPE",
1762 gettext_noop ("Use an HTTP v1.0 (only) proxy"),
1763 "https://gnunet.org/configuration-http",
1764 &load_option_list /* abuse! */ ,
1765 &save_option_list /* abuse! */ , "HTTP_1_0",
1766 NULL, NULL,
1767 hide_http_proxy_options
1768 },
1769
1770 {
1771 "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton", 1765 "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
1772 "toggled", 1766 "toggled",
1773 "transport-http_client", 1767 "transport-http_client",
@@ -1858,7 +1852,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1858 /* HTTPS client */ 1852 /* HTTPS client */
1859 1853
1860 { 1854 {
1861 "GNUNET_setup_transport_http_client_proxy_type_none_radiobutton", 1855 "GNUNET_setup_transport_https_client_proxy_type_none_radiobutton",
1862 "toggled", 1856 "toggled",
1863 "transport-https_client", 1857 "transport-https_client",
1864 "PROXY_TYPE", 1858 "PROXY_TYPE",
@@ -1871,7 +1865,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1871 }, 1865 },
1872 1866
1873 { 1867 {
1874 "GNUNET_setup_transport_http_client_proxy_type_http_radiobutton", 1868 "GNUNET_setup_transport_https_client_proxy_type_http_radiobutton",
1875 "toggled", 1869 "toggled",
1876 "transport-https_client", 1870 "transport-https_client",
1877 "PROXY_TYPE", 1871 "PROXY_TYPE",
@@ -1884,20 +1878,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1884 }, 1878 },
1885 1879
1886 { 1880 {
1887 "GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton", 1881 "GNUNET_setup_transport_https_client_proxy_type_socks4_radiobutton",
1888 "toggled",
1889 "transport-https_client",
1890 "PROXY_TYPE",
1891 gettext_noop ("Use an HTTP v1.0 (only) proxy"),
1892 "https://gnunet.org/configuration-http",
1893 &load_option_list /* abuse! */ ,
1894 &save_option_list /* abuse! */ , "HTTP_1_0",
1895 NULL, NULL,
1896 hide_https_proxy_options
1897 },
1898
1899 {
1900 "GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton",
1901 "toggled", 1882 "toggled",
1902 "transport-https_client", 1883 "transport-https_client",
1903 "PROXY_TYPE", 1884 "PROXY_TYPE",
@@ -1910,7 +1891,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1910 }, 1891 },
1911 1892
1912 { 1893 {
1913 "GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton", 1894 "GNUNET_setup_transport_https_client_proxy_type_socks4a_radiobutton",
1914 "toggled", 1895 "toggled",
1915 "transport-https_client", 1896 "transport-https_client",
1916 "PROXY_TYPE", 1897 "PROXY_TYPE",
@@ -1923,7 +1904,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1923 }, 1904 },
1924 1905
1925 { 1906 {
1926 "GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton", 1907 "GNUNET_setup_transport_https_client_proxy_type_socks5_radiobutton",
1927 "toggled", 1908 "toggled",
1928 "transport-https_client", 1909 "transport-https_client",
1929 "PROXY_TYPE", 1910 "PROXY_TYPE",
@@ -1936,7 +1917,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1936 }, 1917 },
1937 1918
1938 { 1919 {
1939 "GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton", 1920 "GNUNET_setup_transport_https_client_proxy_type_socks5_hostname_radiobutton",
1940 "toggled", 1921 "toggled",
1941 "transport-https_client", 1922 "transport-https_client",
1942 "PROXY_TYPE", 1923 "PROXY_TYPE",
@@ -1949,7 +1930,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1949 }, 1930 },
1950 1931
1951 { 1932 {
1952 "GNUNET_setup_transport_http_client_proxy_hostname_entry", 1933 "GNUNET_setup_transport_https_client_proxy_hostname_entry",
1953 "changed", 1934 "changed",
1954 "transport-https_client", 1935 "transport-https_client",
1955 "PROXY", 1936 "PROXY",
@@ -1961,7 +1942,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1961 NULL}, 1942 NULL},
1962 1943
1963 { 1944 {
1964 "GNUNET_setup_transport_http_client_proxy_username_entry", 1945 "GNUNET_setup_transport_https_client_proxy_username_entry",
1965 "changed", 1946 "changed",
1966 "transport-https_client", 1947 "transport-https_client",
1967 "PROXY_USERNAME", 1948 "PROXY_USERNAME",
@@ -1973,7 +1954,7 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1973 NULL}, 1954 NULL},
1974 1955
1975 { 1956 {
1976 "GNUNET_setup_transport_http_client_proxy_password_entry", 1957 "GNUNET_setup_transport_https_client_proxy_password_entry",
1977 "changed", 1958 "changed",
1978 "transport-https_client", 1959 "transport-https_client",
1979 "PROXY_PASSWORD", 1960 "PROXY_PASSWORD",
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 08:53:30 +0000