[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13591 - in gnunet-setup: contrib src
From: |
gnunet |
Subject: |
[GNUnet-SVN] r13591 - in gnunet-setup: contrib src |
Date: |
Sat, 6 Nov 2010 21:55:22 +0100 |
Author: grothoff
Date: 2010-11-06 21:55:22 +0100 (Sat, 06 Nov 2010)
New Revision: 13591
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/gnunet-setup-options.c
gnunet-setup/src/gnunet-setup.c
Log:
see discussion on usability on IRC today
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-06 18:41:55 UTC (rev
13590)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-06 20:55:22 UTC (rev
13591)
@@ -2,65 +2,85 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_quota_adjustment">
- <property name="lower">1000000</property>
- <property name="upper">999999999999</property>
- <property name="value">100000000</property>
- <property name="step_increment">1000000</property>
- <property name="page_increment">1000000000</property>
+ <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
+ <columns>
+ <!-- column-name url -->
+ <column type="gchararray"/>
+ <!-- column-name editable -->
+ <column type="gboolean"/>
+ </columns>
</object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">3306</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment7">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">3306</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_hostlist_server_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">8080</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_quota_adjustment">
+ <property name="lower">65536</property>
+ <property name="upper">9999999999</property>
+ <property name="value">1024000</property>
+ <property name="step_increment">65536</property>
+ <property name="page_increment">1024000</property>
+ </object>
+ <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_out_adjustment">
+ <property name="lower">1024</property>
+ <property name="upper">999999999</property>
+ <property name="value">65536</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_http_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">1080</property>
+ <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
+ <property name="lower">5000</property>
+ <property name="upper">999999999</property>
+ <property name="value">65536</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_udp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</property>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">2086</property>
+ <object class="GtkAdjustment" id="adjustment5">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_transport_https_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">443</property>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
- <property name="upper">9999</property>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
<object class="GtkDialog" id="GNUNET_setup_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">gnunet-setup</property>
@@ -116,6 +136,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -136,6 +157,8 @@
<property name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -145,6 +168,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
@@ -187,6 +211,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -270,6 +295,8 @@
<property name="draw_indicator">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
@@ -286,6 +313,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
@@ -466,16 +494,22 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
@@ -485,6 +519,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">6</property>
</packing>
@@ -524,6 +559,8 @@
<property name="label" translatable="yes">Max.
upload bandwidth (B/s)</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -536,6 +573,8 @@
<property name="numeric">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -968,6 +1007,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1088,6 +1129,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1171,12 +1213,16 @@
<signal name="changed"
handler="GNUNET_setup_datastore_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1199,12 +1245,16 @@
<property
name="visible">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1230,6 +1280,8 @@
<property
name="invisible_char">•</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1253,12 +1305,16 @@
<property
name="invisible_char_set">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1285,6 +1341,8 @@
<property name="text"
translatable="yes">localhost</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1319,6 +1377,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1336,6 +1396,8 @@
<property name="label"
translatable="yes">MySQL</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1356,6 +1418,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1365,6 +1429,8 @@
<property name="stock">gtk-ok</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1374,6 +1440,8 @@
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1393,6 +1461,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -1406,6 +1475,8 @@
<signal name="changed"
handler="GNUNET_setup_datastore_postgres_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1425,6 +1496,8 @@
<property name="label"
translatable="yes">Postgres</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1445,6 +1518,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1454,6 +1529,8 @@
<property name="stock">gtk-ok</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1463,6 +1540,8 @@
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1474,6 +1553,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1483,6 +1564,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1510,6 +1592,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">4</property>
</packing>
@@ -1598,6 +1681,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -1682,12 +1766,16 @@
<signal name="changed"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1711,12 +1799,16 @@
<signal name="file-set"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1743,6 +1835,8 @@
<signal name="changed"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1767,12 +1861,16 @@
<signal name="changed"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1800,6 +1898,8 @@
<signal name="changed"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1834,6 +1934,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1851,6 +1953,8 @@
<property name="label"
translatable="yes">MySQL</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1871,6 +1975,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1880,6 +1986,8 @@
<property name="stock">gtk-ok</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1889,6 +1997,8 @@
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1908,6 +2018,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -1921,6 +2032,8 @@
<signal name="changed"
handler="GNUNET_setup_datacache_postgres_invalidate_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -1940,6 +2053,8 @@
<property name="label"
translatable="yes">Postgres</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -1960,6 +2075,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1969,6 +2086,8 @@
<property name="stock">gtk-ok</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
@@ -1978,6 +2097,8 @@
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -1989,6 +2110,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
@@ -2014,6 +2137,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2030,12 +2155,12 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="GNUNET_setup_cancel_button">
@@ -2085,6 +2210,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
@@ -2097,83 +2223,63 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
+ <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
+ <property name="upper">9999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment2">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_https_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">443</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_tcp_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">2086</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_udp_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">2086</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment5">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_transport_http_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">1080</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="upper">100</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_hostlist_server_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">8080</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_in_adjustment">
- <property name="lower">5000</property>
- <property name="upper">999999999</property>
- <property name="value">65536</property>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="GNUNET_setup_bandwidth_out_adjustment">
- <property name="lower">1024</property>
- <property name="upper">999999999</property>
- <property name="value">65536</property>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_quota_adjustment">
- <property name="lower">65536</property>
- <property name="upper">9999999999</property>
- <property name="value">1024000</property>
- <property name="step_increment">65536</property>
- <property name="page_increment">1024000</property>
+ <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_quota_adjustment">
+ <property name="lower">1000000</property>
+ <property name="upper">999999999999</property>
+ <property name="value">100000000</property>
+ <property name="step_increment">1000000</property>
+ <property name="page_increment">1000000000</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datastore_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
- <columns>
- <!-- column-name url -->
- <column type="gchararray"/>
- <!-- column-name editable -->
- <column type="gboolean"/>
- </columns>
- </object>
</interface>
Modified: gnunet-setup/src/gnunet-setup-options.c
===================================================================
--- gnunet-setup/src/gnunet-setup-options.c 2010-11-06 18:41:55 UTC (rev
13590)
+++ gnunet-setup/src/gnunet-setup-options.c 2010-11-06 20:55:22 UTC (rev
13591)
@@ -826,7 +826,7 @@
"hostlist",
"OPTIONS",
gettext_noop ("Should this peer offer a hostlist to other peers"),
- "https://gnunet.org/configuration-hostlist",
+ "https://gnunet.org/configuration-hostlist-server",
&load_option_list,
&save_option_list, "-p",
hide_hostlist_server_options
@@ -838,7 +838,7 @@
"hostlist",
"OPTIONS",
gettext_noop ("Should this peer advertise its hostlist to other peers"),
- "https://gnunet.org/configuration-hostlist",
+ "https://gnunet.org/configuration-hostlist-server",
&load_option_list,
&save_option_list, "-a",
NULL
@@ -850,7 +850,7 @@
"hostlist",
"HTTPPORT",
gettext_noop ("Port this peers hostlist should be offered on"),
- "https://gnunet.org/configuration-hostlist",
+ "https://gnunet.org/configuration-hostlist-server",
&load_number,
&save_number, NULL,
NULL
Modified: gnunet-setup/src/gnunet-setup.c
===================================================================
--- gnunet-setup/src/gnunet-setup.c 2010-11-06 18:41:55 UTC (rev 13590)
+++ gnunet-setup/src/gnunet-setup.c 2010-11-06 20:55:22 UTC (rev 13591)
@@ -397,9 +397,8 @@
iret = 0;
switch (ret)
{
- case GTK_RESPONSE_DELETE_EVENT: /* -4 */
case GTK_RESPONSE_CANCEL: /* -6 */
- /* window closed, do not save! */
+ /* explicit cancel, do not save! */
break;
case GTK_RESPONSE_OK: /* save-as, -5 */
dialog = gtk_file_chooser_dialog_new (_("Save Configuration File"),
@@ -418,6 +417,7 @@
cfgName = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
gtk_widget_destroy (dialog);
/* fall through! */
+ case GTK_RESPONSE_DELETE_EVENT: /* window close, -4 */
case GTK_RESPONSE_ACCEPT: /* save, -3 */
if (GNUNET_OK !=
GNUNET_CONFIGURATION_write_diffs (cfgDefault,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13591 - in gnunet-setup: contrib src,
gnunet <=