diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-11-13 20:08:46 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-11-13 20:08:46 +0000 |
commit | 54e8a8abe3841b4c0ba17ea50321ddbe18032867 (patch) | |
tree | 312bc8b840afa210fabb126b1fd58f1ee6819375 /src/setup/gnunet-setup-options.c | |
parent | 82b26d33c60d5e1082c54518e26870fb00829ac4 (diff) | |
download | gnunet-gtk-54e8a8abe3841b4c0ba17ea50321ddbe18032867.tar.gz gnunet-gtk-54e8a8abe3841b4c0ba17ea50321ddbe18032867.zip |
removing MySQL option for datacache, adding in-memory/heap option for datacache
Diffstat (limited to 'src/setup/gnunet-setup-options.c')
-rw-r--r-- | src/setup/gnunet-setup-options.c | 86 |
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[] = | |||
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 | */ |
887 | static struct GNUNET_SETUP_VisibilitySpecification hide_mysql_datacache_tab[] = { | 887 | static 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", |