[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r13586 - in gnunet-setup: contrib src
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r13586 - in gnunet-setup: contrib src |
|
Date: |
Sat, 6 Nov 2010 15:18:39 +0100 |
Author: grothoff
Date: 2010-11-06 15:18:39 +0100 (Sat, 06 Nov 2010)
New Revision: 13586
Modified:
gnunet-setup/contrib/gnunet-setup.glade
gnunet-setup/src/Makefile.am
gnunet-setup/src/gnunet-setup.c
Log:
also have config tests for datacache
Modified: gnunet-setup/contrib/gnunet-setup.glade
===================================================================
--- gnunet-setup/contrib/gnunet-setup.glade 2010-11-06 13:59:25 UTC (rev
13585)
+++ gnunet-setup/contrib/gnunet-setup.glade 2010-11-06 14:18:39 UTC (rev
13586)
@@ -2,85 +2,65 @@
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="GNUNET_setup_hostlist_url_liststore">
- <columns>
- <!-- column-name url -->
- <column type="gchararray"/>
- <!-- column-name editable -->
- <column type="gboolean"/>
- </columns>
+ <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_datacache_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</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_datastore_mysql_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">3306</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_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>
+ <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>
</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="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>
</object>
- <object class="GtkAdjustment" id="adjustment6">
- <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_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_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_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>
- <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>
@@ -1368,6 +1348,7 @@
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_mysql_tab_test_image">
<property
name="visible">True</property>
+ <property name="tooltip_text"
translatable="yes">Test datastore configuration</property>
<property
name="stock">gtk-refresh</property>
</object>
</child>
@@ -1378,6 +1359,7 @@
</child>
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_mysql_tab_ok_image">
+ <property name="tooltip_text"
translatable="yes">Configuration works!</property>
<property name="stock">gtk-ok</property>
</object>
<packing>
@@ -1386,6 +1368,7 @@
</child>
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_mysql_tab_error_image">
+ <property name="tooltip_text"
translatable="yes">Configuration error!</property>
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
@@ -1453,6 +1436,7 @@
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_postgres_tab_test_image">
<property
name="visible">True</property>
+ <property name="tooltip_text"
translatable="yes">Test datastore configuration</property>
<property
name="stock">gtk-refresh</property>
</object>
</child>
@@ -1463,6 +1447,7 @@
</child>
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_postgres_tab_ok_image">
+ <property name="tooltip_text"
translatable="yes">Configuration works!</property>
<property name="stock">gtk-ok</property>
</object>
<packing>
@@ -1471,6 +1456,7 @@
</child>
<child>
<object class="GtkImage"
id="GNUNET_setup_datastore_postgres_tab_error_image">
+ <property name="tooltip_text"
translatable="yes">Configuration error!</property>
<property
name="stock">gtk-dialog-error</property>
</object>
<packing>
@@ -1848,9 +1834,55 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label5c">
+ <object class="GtkHBox" id="hbox3a">
<property name="visible">True</property>
- <property name="label"
translatable="yes">MySQL</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_tab_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">MySQL</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_setup_datacache_mysql_tab_test_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="relief">none</property>
+ <signal name="clicked"
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb" swapped="no"/>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_mysql_tab_test_image">
+ <property
name="visible">True</property>
+ <property name="tooltip_text"
translatable="yes">Test datacache configuration</property>
+ <property
name="stock">gtk-refresh</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_mysql_tab_ok_image">
+ <property name="tooltip_text"
translatable="yes">Configuration works!</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_mysql_tab_error_image">
+ <property name="tooltip_text"
translatable="yes">Configuration error!</property>
+ <property
name="stock">gtk-dialog-error</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">1</property>
@@ -1890,9 +1922,55 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label6c">
+ <object class="GtkHBox" id="hbox8a">
<property name="visible">True</property>
- <property name="label"
translatable="yes">Postgres</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_datacache_postgres_tab_label">
+ <property name="visible">True</property>
+ <property name="label"
translatable="yes">Postgres</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_setup_datacache_postgres_tab_test_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="relief">none</property>
+ <signal name="clicked"
handler="GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb"
swapped="no"/>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_postgres_tab_test_image">
+ <property
name="visible">True</property>
+ <property name="tooltip_text"
translatable="yes">Test datacache configuration</property>
+ <property
name="stock">gtk-refresh</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_postgres_tab_ok_image">
+ <property name="tooltip_text"
translatable="yes">Configuration works!</property>
+ <property name="stock">gtk-ok</property>
+ </object>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="GNUNET_setup_datacache_postgres_tab_error_image">
+ <property name="tooltip_text"
translatable="yes">Configuration error!</property>
+ <property
name="stock">gtk-dialog-error</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="position">2</property>
@@ -2009,63 +2087,83 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="GNUNET_setup_min_friends_adjustment">
- <property name="upper">9999</property>
+ <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="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="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="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="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="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="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_transport_http_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">1080</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_hostlist_server_port_adjustment">
- <property name="lower">1</property>
- <property name="upper">65535</property>
- <property name="value">8080</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="adjustment7">
- <property name="upper">100</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>
- <property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
+ <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>
- <property name="page_size">10</property>
</object>
- <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="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_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/Makefile.am
===================================================================
--- gnunet-setup/src/Makefile.am 2010-11-06 13:59:25 UTC (rev 13585)
+++ gnunet-setup/src/Makefile.am 2010-11-06 14:18:39 UTC (rev 13586)
@@ -14,6 +14,7 @@
gnunet-setup-datastore-plugins.c \
gnunet-setup-datastore-config.c \
gnunet-setup-datacache-plugins.c \
+ gnunet-setup-datacache-config.c \
gnunet-setup-hostlist-editing.c \
os_installation.c
gnunet_setup_LDADD = \
Modified: gnunet-setup/src/gnunet-setup.c
===================================================================
--- gnunet-setup/src/gnunet-setup.c 2010-11-06 13:59:25 UTC (rev 13585)
+++ gnunet-setup/src/gnunet-setup.c 2010-11-06 14:18:39 UTC (rev 13586)
@@ -349,26 +349,27 @@
_("No default value known for option `%s' in section
`%s'\n"),
os->option,
os->section);
- i++;
- continue;
}
- if (GNUNET_OK !=
- os->load_function (os->load_save_cls,
- os->section, os->option,
- value,
- widget,
- cfg))
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to initialize widget `%s' with value
`%s'\n"),
- os->widget_name,
- value);
+ if (GNUNET_OK !=
+ os->load_function (os->load_save_cls,
+ os->section, os->option,
+ value,
+ widget,
+ cfg))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to initialize widget `%s' with value
`%s'\n"),
+ os->widget_name,
+ value);
+ }
+ else
+ {
+ update_visibility (os, value);
+ }
GNUNET_free (value);
- i++;
- continue;
}
- update_visibility (os, value);
- GNUNET_free (value);
}
if (os->help_text != NULL)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r13586 - in gnunet-setup: contrib src,
gnunet <=