1 files changed, 7 insertions, 79 deletions

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[] =
 
 
 /**
- * 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 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    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 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    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 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
    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",