[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24939 - in gnunet-gtk: contrib src/setup
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24939 - in gnunet-gtk: contrib src/setup |
|
Date: |
Tue, 13 Nov 2012 21:08:46 +0100 |
Author: grothoff
Date: 2012-11-13 21:08:46 +0100 (Tue, 13 Nov 2012)
New Revision: 24939
Modified:
gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
gnunet-gtk/src/setup/gnunet-setup-datacache-config.c
gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c
gnunet-gtk/src/setup/gnunet-setup-options.c
Log:
removing MySQL option for datacache, adding in-memory/heap option for datacache
Modified: gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-11-13
20:05:40 UTC (rev 24938)
+++ gnunet-gtk/contrib/gnunet_setup_gtk_main_window.glade 2012-11-13
20:08:46 UTC (rev 24939)
@@ -2951,8 +2951,8 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton"
id="GNUNET_setup_fs_datacache_mysql_radiobutton">
- <property name="label"
translatable="yes">MySQL</property>
+ <object class="GtkRadioButton"
id="GNUNET_setup_fs_datacache_heap_radiobutton">
+ <property name="label"
translatable="yes">Memory</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
@@ -2961,7 +2961,7 @@
<property
name="yalign">0.50999999046325684</property>
<property
name="draw_indicator">True</property>
<property
name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
- <signal name="realize"
handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/>
+ <signal name="realize"
handler="GNUNET_setup_fs_datacache_heap_radiobutton_realize_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -3067,305 +3067,19 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_datacache_mysql_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_datacache_heap_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_database_name_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_database_name_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">MySQL database name:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="padding">5</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_database_name_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property name="text"
translatable="yes">gnunet</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <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>
- <child>
- <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_config_file_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_config_file_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Configuration file:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFileChooserButton"
id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <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>
- <child>
- <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_username_password_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_username_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Username:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="padding">5</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_username_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <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>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_password_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Password:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_password_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <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>
- <child>
- <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_hostname_hbox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_hostname_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">MySQL Server Hostname:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="padding">5</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_setup_datacache_mysql_hostname_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property name="text"
translatable="yes">localhost</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <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>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_port_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Port:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</property>
- <property
name="padding">5</property>
- <property
name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_setup_datacache_mysql_port_spinbutton">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- <property
name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
- <property
name="numeric">True</property>
- <signal name="value-changed"
handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">False</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">3</property>
- </packing>
- </child>
+ <property name="label"
translatable="yes">No setup required.</property>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkHBox"
id="GNUNET_setup_datacache_mysql_tab_hbox">
+ <object class="GtkLabel"
id="GNUNET_setup_fs_datacache_heap_tab_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_setup_datacache_mysql_tab_label">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <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>
- <child>
- <object class="GtkButton"
id="GNUNET_setup_datacache_mysql_tab_test_button">
- <property name="label"
translatable="yes">Test configuration</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="use_action_appearance">False</property>
- <signal name="clicked"
handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_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>
- <child>
- <object class="GtkImage"
id="GNUNET_setup_datacache_mysql_tab_ok_image">
- <property
name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Configuration works!</property>
- <property
name="pixbuf">gnunet-setup-oxygen-ok.png</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="GNUNET_setup_datacache_mysql_tab_error_image">
- <property
name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Configuration error!</property>
- <property
name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="label"
translatable="yes">sqLite</property>
</object>
<packing>
- <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
Modified: gnunet-gtk/src/setup/gnunet-setup-datacache-config.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datacache-config.c 2012-11-13
20:05:40 UTC (rev 24938)
+++ gnunet-gtk/src/setup/gnunet-setup-datacache-config.c 2012-11-13
20:08:46 UTC (rev 24939)
@@ -76,14 +76,6 @@
void
-GNUNET_setup_datacache_mysql_invalidate_cb ()
-{
- hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
- hide ("GNUNET_setup_datacache_mysql_tab_error_image");
-}
-
-
-void
GNUNET_setup_datacache_postgres_invalidate_cb ()
{
hide ("GNUNET_setup_datacache_postgres_tab_ok_image");
@@ -92,23 +84,6 @@
void
-GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb (GtkWidget * widget,
- gpointer user_data)
-{
- if (GNUNET_OK == test_config ("libgnunet_plugin_datacache_mysql"))
- {
- show ("GNUNET_setup_datacache_mysql_tab_ok_image");
- hide ("GNUNET_setup_datacache_mysql_tab_error_image");
- }
- else
- {
- hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
- show ("GNUNET_setup_datacache_mysql_tab_error_image");
- }
-}
-
-
-void
GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb (GtkWidget * widget,
gpointer user_data)
{
Modified: gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c 2012-11-13
20:05:40 UTC (rev 24938)
+++ gnunet-gtk/src/setup/gnunet-setup-datacache-plugins.c 2012-11-13
20:08:46 UTC (rev 24939)
@@ -58,10 +58,10 @@
void
-GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb (GtkWidget * widget,
+GNUNET_setup_fs_datacache_heap_radiobutton_realize_cb (GtkWidget * widget,
gpointer user_data)
{
- test_plugin (widget, "libgnunet_plugin_datacache_mysql");
+ test_plugin (widget, "libgnunet_plugin_datacache_heap");
}
Modified: gnunet-gtk/src/setup/gnunet-setup-options.c
===================================================================
--- gnunet-gtk/src/setup/gnunet-setup-options.c 2012-11-13 20:05:40 UTC (rev
24938)
+++ gnunet-gtk/src/setup/gnunet-setup-options.c 2012-11-13 20:08:46 UTC (rev
24939)
@@ -882,10 +882,10 @@
/**
- * Hide "mysql datacache" tab if mysql not active.
+ * Hide "heap datacache" tab if heap not active.
*/
-static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[]
= {
- {"GNUNET_setup_datacache_mysql_vbox", "^mysql$", NULL},
+static struct GNUNET_SETUP_VisibilitySpecification hide_heap_datacache_tab[] =
{
+ {"GNUNET_setup_datacache_heap_vbox", "^heap$", NULL},
{NULL, NULL, NULL}
};
@@ -1633,16 +1633,16 @@
hide_sqlite_datacache_tab},
{
- "GNUNET_setup_fs_datacache_mysql_radiobutton",
+ "GNUNET_setup_fs_datacache_heap_radiobutton",
"toggled",
"dhtcache",
"DATABASE",
- gettext_noop ("Use MySQL to cache DHT data"),
+ gettext_noop ("Use memory to cache DHT data"),
"https://gnunet.org/configuration-datacache";,
&load_option_list /* abuse! */ ,
- &save_option_list /* abuse! */ , "mysql",
+ &save_option_list /* abuse! */ , "heap",
NULL, NULL,
- hide_mysql_datacache_tab},
+ hide_heap_datacache_tab},
{
"GNUNET_setup_fs_datacache_postgres_radiobutton",
@@ -1657,66 +1657,6 @@
hide_postgres_datacache_tab},
{
- "GNUNET_setup_datacache_mysql_database_name_entry",
- "changed",
- "datacache-mysql",
- "DATABASE",
- gettext_noop ("Name for the MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
- "GNUNET_setup_datacache_mysql_config_file_filechooserbutton",
- "selection-changed",
- "datacache-mysql",
- "CONFIG",
- gettext_noop ("Configuration file for MySQL access"),
- "http://dev.mysql.com/doc/refman/5.5/en/option-files.html";,
- &load_filename,
- &save_filename, NULL,
- NULL, NULL,
- NULL},
-
- {
- "GNUNET_setup_datacache_mysql_username_entry",
- "changed",
- "datacache-mysql",
- "USER",
- gettext_noop ("Username for MySQL access"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
- "GNUNET_setup_datacache_mysql_password_entry",
- "changed",
- "datacache-mysql",
- "PASSWORD",
- gettext_noop ("Password for MySQL access"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
- "GNUNET_setup_datacache_mysql_hostname_entry",
- "changed",
- "datacache-mysql",
- "HOST",
- gettext_noop ("Name of host running MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_text,
- &save_text, NULL,
- NULL, NULL,
- NULL},
-
- {
"GNUNET_setup_transport_wlan_interface_entry",
"changed",
"transport-wlan",
@@ -1729,18 +1669,6 @@
NULL},
{
- "GNUNET_setup_datacache_mysql_port_spinbutton",
- "value-changed",
- "datacache-mysql",
- "PORT",
- gettext_noop ("Port of MySQL database"),
- "https://gnunet.org/configuration-datacache";,
- &load_number,
- &save_number, NULL,
- NULL, NULL,
- NULL},
-
- {
"GNUNET_setup_datacache_postgres_config_entry",
"changed",
"datacache-postgres",
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24939 - in gnunet-gtk: contrib src/setup,
gnunet <=