1 files changed, 24 insertions, 24 deletions

diff --git a/src/setup/gnunet-setup-options.c b/src/setup/gnunet-setup-options.c
index f3c1213c..58b659bc 100644
--- a/src/setup/gnunet-setup-options.c
+++ b/src/setup/gnunet-setup-options.c
@@ -1245,37 +1245,37 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   {
    "GNUNET_setup_general_services_topology_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "topology",
+   "FORCESTART",
    gettext_noop ("Topology should always be loaded"),
    "https://gnunet.org/configuration-topology",
-   &load_option_list,
-   &save_option_list, "topology",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    NULL},
 
   {
    "GNUNET_setup_general_services_hostlist_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "hostlist",
+   "FORCESTART",
    gettext_noop
    ("Should hostlist support be started automatically on startup?"),
    "https://gnunet.org/configuration-hostlist",
-   &load_option_list,
-   &save_option_list, "hostlist",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    hide_hostlist_tab},
 
   {
    "GNUNET_setup_general_services_fs_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "fs",
+   "FORCESTART",
    gettext_noop ("Should file-sharing be started automatically on startup?"),
    "https://gnunet.org/configuration-fs",
-   &load_option_list,
-   &save_option_list, "fs",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    hide_fs_tab},
 
@@ -2320,12 +2320,12 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   {
    "GNUNET_setup_general_services_pt_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "pt",
+   "FORCESTART",
    gettext_noop ("Should the VPN/PT be started automatically on startup?"),
    "https://gnunet.org/configuration-vpn",
-   &load_option_list,
-   &save_option_list, "pt",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    hide_vpn_tab},
 
@@ -2436,13 +2436,13 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   {
    "GNUNET_setup_general_services_exit_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "exit",
+   "FORCESTART",
    gettext_noop
    ("Activate the VPN exit to provide services and/or to enable others to use your Internet connection"),
    "https://gnunet.org/configuration-exit",
-   &load_option_list,
-   &save_option_list, "exit",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    hide_exit_options},
 
@@ -2636,12 +2636,12 @@ const struct GNUNET_SETUP_OptionSpecification option_specifications[] = {
   {
    "GNUNET_setup_general_services_gns_checkbutton",
    "toggled",
-   "arm",
-   "DEFAULTSERVICES",
+   "gns",
+   "FORCESTART",
    gettext_noop ("Should the GNS be started automatically on startup?"),
    "https://gnunet.org/configuration-gns",
-   &load_option_list,
-   &save_option_list, "gns",
+   &load_yes_no,
+   &save_yes_no, NULL,
    NULL, NULL,
    hide_gns_tabs},