aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-11-13 20:08:46 +0000
committerChristian Grothoff <christian@grothoff.org>2012-11-13 20:08:46 +0000
commit54e8a8abe3841b4c0ba17ea50321ddbe18032867 (patch)
tree312bc8b840afa210fabb126b1fd58f1ee6819375
parent82b26d33c60d5e1082c54518e26870fb00829ac4 (diff)
downloadgnunet-gtk-54e8a8abe3841b4c0ba17ea50321ddbe18032867.tar.gz
gnunet-gtk-54e8a8abe3841b4c0ba17ea50321ddbe18032867.zip
removing MySQL option for datacache, adding in-memory/heap option for datacache
Diffstat
-rw-r--r--contrib/gnunet_setup_gtk_main_window.glade300
-rw-r--r--src/setup/gnunet-setup-datacache-config.c25
-rw-r--r--src/setup/gnunet-setup-datacache-plugins.c4
-rw-r--r--src/setup/gnunet-setup-options.c86
4 files changed, 16 insertions, 399 deletions
diff --git a/contrib/gnunet_setup_gtk_main_window.glade b/contrib/gnunet_setup_gtk_main_window.glade
index 632358ff..10888dec 100644
--- a/contrib/gnunet_setup_gtk_main_window.glade
+++ b/contrib/gnunet_setup_gtk_main_window.glade
@@ -2951,8 +2951,8 @@
2951 </packing> 2951 </packing>
2952 </child> 2952 </child>
2953 <child> 2953 <child>
2954 <object class="GtkRadioButton" id="GNUNET_setup_fs_datacache_mysql_radiobutton"> 2954 <object class="GtkRadioButton" id="GNUNET_setup_fs_datacache_heap_radiobutton">
2955 <property name="label" translatable="yes">MySQL</property> 2955 <property name="label" translatable="yes">Memory</property>
2956 <property name="visible">True</property> 2956 <property name="visible">True</property>
2957 <property name="can_focus">True</property> 2957 <property name="can_focus">True</property>
2958 <property name="receives_default">False</property> 2958 <property name="receives_default">False</property>
@@ -2961,7 +2961,7 @@
2961 <property name="yalign">0.50999999046325684</property> 2961 <property name="yalign">0.50999999046325684</property>
2962 <property name="draw_indicator">True</property> 2962 <property name="draw_indicator">True</property>
2963 <property name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property> 2963 <property name="group">GNUNET_setup_fs_datacache_sqlite_radiobutton</property>
2964 <signal name="realize" handler="GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb" swapped="no"/> 2964 <signal name="realize" handler="GNUNET_setup_fs_datacache_heap_radiobutton_realize_cb" swapped="no"/>
2965 </object> 2965 </object>
2966 <packing> 2966 <packing>
2967 <property name="expand">False</property> 2967 <property name="expand">False</property>
@@ -3067,305 +3067,19 @@
3067 </packing> 3067 </packing>
3068 </child> 3068 </child>
3069 <child> 3069 <child>
3070 <object class="GtkVBox" id="GNUNET_setup_datacache_mysql_vbox"> 3070 <object class="GtkVBox" id="GNUNET_setup_datacache_heap_vbox">
3071 <property name="visible">True</property> 3071 <property name="visible">True</property>
3072 <property name="can_focus">False</property> 3072 <property name="can_focus">False</property>
3073 <child> 3073 <property name="label" translatable="yes">No setup required.</property>
3074 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_database_name_hbox">
3075 <property name="visible">True</property>
3076 <property name="can_focus">False</property>
3077 <child>
3078 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_database_name_label">
3079 <property name="visible">True</property>
3080 <property name="can_focus">False</property>
3081 <property name="label" translatable="yes">MySQL database name:</property>
3082 </object>
3083 <packing>
3084 <property name="expand">False</property>
3085 <property name="fill">False</property>
3086 <property name="padding">5</property>
3087 <property name="position">0</property>
3088 </packing>
3089 </child>
3090 <child>
3091 <object class="GtkEntry" id="GNUNET_setup_datacache_mysql_database_name_entry">
3092 <property name="visible">True</property>
3093 <property name="can_focus">True</property>
3094 <property name="invisible_char">•</property>
3095 <property name="text" translatable="yes">gnunet</property>
3096 <property name="invisible_char_set">True</property>
3097 <property name="primary_icon_activatable">False</property>
3098 <property name="secondary_icon_activatable">False</property>
3099 <property name="primary_icon_sensitive">True</property>
3100 <property name="secondary_icon_sensitive">True</property>
3101 <signal name="changed" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3102 </object>
3103 <packing>
3104 <property name="expand">True</property>
3105 <property name="fill">True</property>
3106 <property name="padding">5</property>
3107 <property name="position">1</property>
3108 </packing>
3109 </child>
3110 </object>
3111 <packing>
3112 <property name="expand">True</property>
3113 <property name="fill">True</property>
3114 <property name="position">0</property>
3115 </packing>
3116 </child>
3117 <child>
3118 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_config_file_hbox">
3119 <property name="visible">True</property>
3120 <property name="can_focus">False</property>
3121 <child>
3122 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_config_file_label">
3123 <property name="visible">True</property>
3124 <property name="can_focus">False</property>
3125 <property name="label" translatable="yes">Configuration file:</property>
3126 </object>
3127 <packing>
3128 <property name="expand">False</property>
3129 <property name="fill">False</property>
3130 <property name="position">0</property>
3131 </packing>
3132 </child>
3133 <child>
3134 <object class="GtkFileChooserButton" id="GNUNET_setup_datacache_mysql_config_file_filechooserbutton">
3135 <property name="visible">True</property>
3136 <property name="can_focus">False</property>
3137 <signal name="file-set" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3138 </object>
3139 <packing>
3140 <property name="expand">True</property>
3141 <property name="fill">True</property>
3142 <property name="padding">5</property>
3143 <property name="position">1</property>
3144 </packing>
3145 </child>
3146 </object>
3147 <packing>
3148 <property name="expand">True</property>
3149 <property name="fill">True</property>
3150 <property name="position">1</property>
3151 </packing>
3152 </child>
3153 <child>
3154 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_username_password_hbox">
3155 <property name="visible">True</property>
3156 <property name="can_focus">False</property>
3157 <child>
3158 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_username_label">
3159 <property name="visible">True</property>
3160 <property name="can_focus">False</property>
3161 <property name="label" translatable="yes">Username:</property>
3162 </object>
3163 <packing>
3164 <property name="expand">False</property>
3165 <property name="fill">False</property>
3166 <property name="padding">5</property>
3167 <property name="position">0</property>
3168 </packing>
3169 </child>
3170 <child>
3171 <object class="GtkEntry" id="GNUNET_setup_datacache_mysql_username_entry">
3172 <property name="visible">True</property>
3173 <property name="can_focus">True</property>
3174 <property name="invisible_char">•</property>
3175 <property name="invisible_char_set">True</property>
3176 <property name="primary_icon_activatable">False</property>
3177 <property name="secondary_icon_activatable">False</property>
3178 <property name="primary_icon_sensitive">True</property>
3179 <property name="secondary_icon_sensitive">True</property>
3180 <signal name="changed" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3181 </object>
3182 <packing>
3183 <property name="expand">True</property>
3184 <property name="fill">True</property>
3185 <property name="padding">5</property>
3186 <property name="position">1</property>
3187 </packing>
3188 </child>
3189 <child>
3190 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_password_label">
3191 <property name="visible">True</property>
3192 <property name="can_focus">False</property>
3193 <property name="label" translatable="yes">Password:</property>
3194 </object>
3195 <packing>
3196 <property name="expand">False</property>
3197 <property name="fill">False</property>
3198 <property name="position">2</property>
3199 </packing>
3200 </child>
3201 <child>
3202 <object class="GtkEntry" id="GNUNET_setup_datacache_mysql_password_entry">
3203 <property name="visible">True</property>
3204 <property name="can_focus">True</property>
3205 <property name="invisible_char">•</property>
3206 <property name="invisible_char_set">True</property>
3207 <property name="primary_icon_activatable">False</property>
3208 <property name="secondary_icon_activatable">False</property>
3209 <property name="primary_icon_sensitive">True</property>
3210 <property name="secondary_icon_sensitive">True</property>
3211 <signal name="changed" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3212 </object>
3213 <packing>
3214 <property name="expand">True</property>
3215 <property name="fill">True</property>
3216 <property name="padding">5</property>
3217 <property name="position">3</property>
3218 </packing>
3219 </child>
3220 </object>
3221 <packing>
3222 <property name="expand">True</property>
3223 <property name="fill">True</property>
3224 <property name="position">2</property>
3225 </packing>
3226 </child>
3227 <child>
3228 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_hostname_hbox">
3229 <property name="visible">True</property>
3230 <property name="can_focus">False</property>
3231 <child>
3232 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_hostname_label">
3233 <property name="visible">True</property>
3234 <property name="can_focus">False</property>
3235 <property name="label" translatable="yes">MySQL Server Hostname:</property>
3236 </object>
3237 <packing>
3238 <property name="expand">False</property>
3239 <property name="fill">False</property>
3240 <property name="padding">5</property>
3241 <property name="position">0</property>
3242 </packing>
3243 </child>
3244 <child>
3245 <object class="GtkEntry" id="GNUNET_setup_datacache_mysql_hostname_entry">
3246 <property name="visible">True</property>
3247 <property name="can_focus">True</property>
3248 <property name="invisible_char">•</property>
3249 <property name="text" translatable="yes">localhost</property>
3250 <property name="invisible_char_set">True</property>
3251 <property name="primary_icon_activatable">False</property>
3252 <property name="secondary_icon_activatable">False</property>
3253 <property name="primary_icon_sensitive">True</property>
3254 <property name="secondary_icon_sensitive">True</property>
3255 <signal name="changed" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3256 </object>
3257 <packing>
3258 <property name="expand">True</property>
3259 <property name="fill">True</property>
3260 <property name="padding">5</property>
3261 <property name="position">1</property>
3262 </packing>
3263 </child>
3264 <child>
3265 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_port_label">
3266 <property name="visible">True</property>
3267 <property name="can_focus">False</property>
3268 <property name="label" translatable="yes">Port:</property>
3269 </object>
3270 <packing>
3271 <property name="expand">False</property>
3272 <property name="fill">False</property>
3273 <property name="padding">5</property>
3274 <property name="position">2</property>
3275 </packing>
3276 </child>
3277 <child>
3278 <object class="GtkSpinButton" id="GNUNET_setup_datacache_mysql_port_spinbutton">
3279 <property name="visible">True</property>
3280 <property name="can_focus">True</property>
3281 <property name="invisible_char">•</property>
3282 <property name="invisible_char_set">True</property>
3283 <property name="primary_icon_activatable">False</property>
3284 <property name="secondary_icon_activatable">False</property>
3285 <property name="primary_icon_sensitive">True</property>
3286 <property name="secondary_icon_sensitive">True</property>
3287 <property name="adjustment">GNUNET_setup_fs_datacache_mysql_port_adjustment</property>
3288 <property name="numeric">True</property>
3289 <signal name="value-changed" handler="GNUNET_setup_datacache_mysql_invalidate_cb" swapped="no"/>
3290 </object>
3291 <packing>
3292 <property name="expand">False</property>
3293 <property name="fill">False</property>
3294 <property name="padding">5</property>
3295 <property name="position">3</property>
3296 </packing>
3297 </child>
3298 </object>
3299 <packing>
3300 <property name="expand">True</property>
3301 <property name="fill">True</property>
3302 <property name="position">3</property>
3303 </packing>
3304 </child>
3305 </object> 3074 </object>
3306 <packing>
3307 <property name="position">1</property>
3308 </packing>
3309 </child> 3075 </child>
3310 <child type="tab"> 3076 <child type="tab">
3311 <object class="GtkHBox" id="GNUNET_setup_datacache_mysql_tab_hbox"> 3077 <object class="GtkLabel" id="GNUNET_setup_fs_datacache_heap_tab_label">
3312 <property name="visible">True</property> 3078 <property name="visible">True</property>
3313 <property name="can_focus">False</property> 3079 <property name="can_focus">False</property>
3314 <child> 3080 <property name="label" translatable="yes">sqLite</property>
3315 <object class="GtkLabel" id="GNUNET_setup_datacache_mysql_tab_label">
3316 <property name="visible">True</property>
3317 <property name="can_focus">False</property>
3318 <property name="label" translatable="yes">MySQL</property>
3319 </object>
3320 <packing>
3321 <property name="expand">True</property>
3322 <property name="fill">True</property>
3323 <property name="position">0</property>
3324 </packing>
3325 </child>
3326 <child>
3327 <object class="GtkButton" id="GNUNET_setup_datacache_mysql_tab_test_button">
3328 <property name="label" translatable="yes">Test configuration</property>
3329 <property name="visible">True</property>
3330 <property name="can_focus">True</property>
3331 <property name="receives_default">True</property>
3332 <property name="use_action_appearance">False</property>
3333 <signal name="clicked" handler="GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb" swapped="no"/>
3334 </object>
3335 <packing>
3336 <property name="expand">True</property>
3337 <property name="fill">True</property>
3338 <property name="padding">5</property>
3339 <property name="position">1</property>
3340 </packing>
3341 </child>
3342 <child>
3343 <object class="GtkImage" id="GNUNET_setup_datacache_mysql_tab_ok_image">
3344 <property name="can_focus">False</property>
3345 <property name="tooltip_text" translatable="yes">Configuration works!</property>
3346 <property name="pixbuf">gnunet-setup-oxygen-ok.png</property>
3347 </object>
3348 <packing>
3349 <property name="expand">False</property>
3350 <property name="fill">True</property>
3351 <property name="position">2</property>
3352 </packing>
3353 </child>
3354 <child>
3355 <object class="GtkImage" id="GNUNET_setup_datacache_mysql_tab_error_image">
3356 <property name="can_focus">False</property>
3357 <property name="tooltip_text" translatable="yes">Configuration error!</property>
3358 <property name="pixbuf">gnunet-setup-oxygen-cancel.png</property>
3359 </object>
3360 <packing>
3361 <property name="expand">True</property>
3362 <property name="fill">True</property>
3363 <property name="position">3</property>
3364 </packing>
3365 </child>
3366 </object> 3081 </object>
3367 <packing> 3082 <packing>
3368 <property name="position">1</property>
3369 <property name="tab_fill">False</property> 3083 <property name="tab_fill">False</property>
3370 </packing> 3084 </packing>
3371 </child> 3085 </child>
diff --git a/src/setup/gnunet-setup-datacache-config.c b/src/setup/gnunet-setup-datacache-config.c
index cc0f60ca..7df9679d 100644
--- a/src/setup/gnunet-setup-datacache-config.c
+++ b/src/setup/gnunet-setup-datacache-config.c
@@ -76,14 +76,6 @@ hide (const char *name)
76 76
77 77
78void 78void
79GNUNET_setup_datacache_mysql_invalidate_cb ()
80{
81 hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
82 hide ("GNUNET_setup_datacache_mysql_tab_error_image");
83}
84
85
86void
87GNUNET_setup_datacache_postgres_invalidate_cb () 79GNUNET_setup_datacache_postgres_invalidate_cb ()
88{ 80{
89 hide ("GNUNET_setup_datacache_postgres_tab_ok_image"); 81 hide ("GNUNET_setup_datacache_postgres_tab_ok_image");
@@ -92,23 +84,6 @@ GNUNET_setup_datacache_postgres_invalidate_cb ()
92 84
93 85
94void 86void
95GNUNET_setup_datacache_mysql_tab_test_button_clicked_cb (GtkWidget * widget,
96 gpointer user_data)
97{
98 if (GNUNET_OK == test_config ("libgnunet_plugin_datacache_mysql"))
99 {
100 show ("GNUNET_setup_datacache_mysql_tab_ok_image");
101 hide ("GNUNET_setup_datacache_mysql_tab_error_image");
102 }
103 else
104 {
105 hide ("GNUNET_setup_datacache_mysql_tab_ok_image");
106 show ("GNUNET_setup_datacache_mysql_tab_error_image");
107 }
108}
109
110
111void
112GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb (GtkWidget * widget, 87GNUNET_setup_datacache_postgres_tab_test_button_clicked_cb (GtkWidget * widget,
113 gpointer user_data) 88 gpointer user_data)
114{ 89{
diff --git a/src/setup/gnunet-setup-datacache-plugins.c b/src/setup/gnunet-setup-datacache-plugins.c
index 022345d3..dbef6790 100644
--- a/src/setup/gnunet-setup-datacache-plugins.c
+++ b/src/setup/gnunet-setup-datacache-plugins.c
@@ -58,10 +58,10 @@ GNUNET_setup_fs_datacache_sqlite_radiobutton_realize_cb (GtkWidget * widget,
58 58
59 59
60void 60void
61GNUNET_setup_fs_datacache_mysql_radiobutton_realize_cb (GtkWidget * widget, 61GNUNET_setup_fs_datacache_heap_radiobutton_realize_cb (GtkWidget * widget,
62 gpointer user_data) 62 gpointer user_data)
63{ 63{
64 test_plugin (widget, "libgnunet_plugin_datacache_mysql"); 64 test_plugin (widget, "libgnunet_plugin_datacache_heap");
65} 65}
66 66
67 67
diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index c547d715..681d7c45 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -882,10 +882,10 @@ static struct GNUNET_SETUP_VisibilitySpecification hide_sqlite_datacache_tab[] =
882 882
883 883
884/** 884/**
885 * Hide "mysql datacache" tab if mysql not active. 885 * Hide "heap datacache" tab if heap not active.
886 */ 886 */
887static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[] = { 887static struct GNUNET_SETUP_VisibilitySpecification hide_heap_datacache_tab[] = {
888 {"GNUNET_setup_datacache_mysql_vbox", "^mysql$", NULL}, 888 {"GNUNET_setup_datacache_heap_vbox", "^heap$", NULL},
889 {NULL, NULL, NULL} 889 {NULL, NULL, NULL}
890}; 890};
891 891
@@ -1633,16 +1633,16 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1633 hide_sqlite_datacache_tab}, 1633 hide_sqlite_datacache_tab},
1634 1634
1635 { 1635 {
1636 "GNUNET_setup_fs_datacache_mysql_radiobutton", 1636 "GNUNET_setup_fs_datacache_heap_radiobutton",
1637 "toggled", 1637 "toggled",
1638 "dhtcache", 1638 "dhtcache",
1639 "DATABASE", 1639 "DATABASE",
1640 gettext_noop ("Use MySQL to cache DHT data"), 1640 gettext_noop ("Use memory to cache DHT data"),
1641 "https://gnunet.org/configuration-datacache", 1641 "https://gnunet.org/configuration-datacache",
1642 &load_option_list /* abuse! */ , 1642 &load_option_list /* abuse! */ ,
1643 &save_option_list /* abuse! */ , "mysql", 1643 &save_option_list /* abuse! */ , "heap",
1644 NULL, NULL, 1644 NULL, NULL,
1645 hide_mysql_datacache_tab}, 1645 hide_heap_datacache_tab},
1646 1646
1647 { 1647 {
1648 "GNUNET_setup_fs_datacache_postgres_radiobutton", 1648 "GNUNET_setup_fs_datacache_postgres_radiobutton",
@@ -1657,66 +1657,6 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1657 hide_postgres_datacache_tab}, 1657 hide_postgres_datacache_tab},
1658 1658
1659 { 1659 {
1660 "GNUNET_setup_datacache_mysql_database_name_entry",
1661 "changed",
1662 "datacache-mysql",
1663 "DATABASE",
1664 gettext_noop ("Name for the MySQL database"),
1665 "https://gnunet.org/configuration-datacache",
1666 &load_text,
1667 &save_text, NULL,
1668 NULL, NULL,
1669 NULL},
1670
1671 {
1672 "GNUNET_setup_datacache_mysql_config_file_filechooserbutton",
1673 "selection-changed",
1674 "datacache-mysql",
1675 "CONFIG",
1676 gettext_noop ("Configuration file for MySQL access"),
1677 "http://dev.mysql.com/doc/refman/5.5/en/option-files.html",
1678 &load_filename,
1679 &save_filename, NULL,
1680 NULL, NULL,
1681 NULL},
1682
1683 {
1684 "GNUNET_setup_datacache_mysql_username_entry",
1685 "changed",
1686 "datacache-mysql",
1687 "USER",
1688 gettext_noop ("Username for MySQL access"),
1689 "https://gnunet.org/configuration-datacache",
1690 &load_text,
1691 &save_text, NULL,
1692 NULL, NULL,
1693 NULL},
1694
1695 {
1696 "GNUNET_setup_datacache_mysql_password_entry",
1697 "changed",
1698 "datacache-mysql",
1699 "PASSWORD",
1700 gettext_noop ("Password for MySQL access"),
1701 "https://gnunet.org/configuration-datacache",
1702 &load_text,
1703 &save_text, NULL,
1704 NULL, NULL,
1705 NULL},
1706
1707 {
1708 "GNUNET_setup_datacache_mysql_hostname_entry",
1709 "changed",
1710 "datacache-mysql",
1711 "HOST",
1712 gettext_noop ("Name of host running MySQL database"),
1713 "https://gnunet.org/configuration-datacache",
1714 &load_text,
1715 &save_text, NULL,
1716 NULL, NULL,
1717 NULL},
1718
1719 {
1720 "GNUNET_setup_transport_wlan_interface_entry", 1660 "GNUNET_setup_transport_wlan_interface_entry",
1721 "changed", 1661 "changed",
1722 "transport-wlan", 1662 "transport-wlan",
@@ -1729,18 +1669,6 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
1729 NULL}, 1669 NULL},
1730 1670
1731 { 1671 {
1732 "GNUNET_setup_datacache_mysql_port_spinbutton",
1733 "value-changed",
1734 "datacache-mysql",
1735 "PORT",
1736 gettext_noop ("Port of MySQL database"),
1737 "https://gnunet.org/configuration-datacache",
1738 &load_number,
1739 &save_number, NULL,
1740 NULL, NULL,
1741 NULL},
1742
1743 {
1744 "GNUNET_setup_datacache_postgres_config_entry", 1672 "GNUNET_setup_datacache_postgres_config_entry",
1745 "changed", 1673 "changed",
1746 "datacache-postgres", 1674 "datacache-postgres",
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 20:09:13 +0000