1 files changed, 3 insertions, 36 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index d50cf39a..1ec84fe5 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -26,7 +26,6 @@
 #include "gnunet-setup.h"
 #include "gnunet-setup-transport.h"
 #include "gnunet-setup-options.h"
-#include "gnunet-setup-gns.h"
 #include <gnunet/gnunet_constants.h>
 #include <regex.h>
 #if ENABLE_NLS
@@ -79,13 +78,6 @@ static int do_autoconfig;
  * Flag to enable privilege escalation.
  */
 static int do_gksu;
-
-/**
- * Show all configuration options, even if we are run
- * as a normal user and a 'gnunet' user exists and thus
- * most options should not apply to the normal user.
- */
-static int force_full_setup;
 #endif
 
 
@@ -355,7 +347,7 @@ write_configuration ()
 
 
 /**
- * Actual main method that sets up the configuration window.
+ * Method run on shutdown.
  *
  * @param cls the main loop handle
  * @param tc scheduler context
@@ -368,7 +360,6 @@ cleanup_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
     GNUNET_break (0);
     return;
   }
-  GNUNET_SETUP_gns_done ();
   GNUNET_GTK_main_loop_quit (ml);
   ml = NULL;
   if (GNUNET_OK != write_configuration ())
@@ -409,7 +400,6 @@ GNUNET_SETUP_restart_namestore (void *cls,
 {
   if (GNUNET_OK != write_configuration ())
     return; /* no point in re-starting namestore ... */
-  GNUNET_SETUP_gns_done ();
   if (NULL != namestore)
   {
     GNUNET_break (0 == GNUNET_OS_process_kill (namestore, SIGTERM));
@@ -422,7 +412,6 @@ GNUNET_SETUP_restart_namestore (void *cls,
                              NULL, NULL,
                              "gnunet-service-namestore",
                              "gnunet-service-namestore", NULL);
-  GNUNET_SETUP_gns_init ();
 }
 
 
@@ -588,8 +577,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 #ifndef MINGW
   if ( (0 != my_uid) &&
        (NULL != gnunet_pw) &&
-       (my_uid != gnunet_pw->pw_uid) &&
-       (0 == force_full_setup) )
+       (my_uid != gnunet_pw->pw_uid) )
   {
     /* load system defaults, system/'gnunet' user's configuration and THEN
        our configuration file */
@@ -638,24 +626,6 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                               GNUNET_CONSTANTS_SERVICE_TIMEOUT,
                               &start_identity, NULL);
   load_options ();
-  GNUNET_SETUP_gns_init ();
-#ifndef MINGW
-  if ( (0 != my_uid) &&
-       (NULL != gnunet_pw) &&
-       (my_uid != gnunet_pw->pw_uid) &&
-       (0 == force_full_setup) )
-  {
-    /* hide all options that are not for individual users; this
-       run is only for per-user options, not for per-peer options */
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_general_vbox")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_main_frame")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_network_tab_vbox")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_fs_main_vbox")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_vpn_vbox")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_exit_vbox")));
-    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_namestore_vbox")));
-  }
-#endif
   GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
                                 &cleanup_task, NULL);
   if (do_autoconfig)
@@ -688,9 +658,6 @@ main (int argc, char *const *argv)
     { 'e', "elevate-priviledges", NULL,
       gettext_noop ("run as user 'gnunet', if necessary by executing gksu to elevate rights"),
       0, &GNUNET_GETOPT_set_one, &do_gksu },
-    { 'f', "force-full-setup", NULL,
-      gettext_noop ("force showing the full set of options, even if gnunet-setup is run as a normal user and as a user 'gnunet' exists on the system, most options should not apply to the normal user as GNUnet should be run by the 'gnunet' user"),
-      0, &GNUNET_GETOPT_set_one, &force_full_setup },
 #endif
     GNUNET_GETOPT_OPTION_END
   };
@@ -698,7 +665,7 @@ main (int argc, char *const *argv)
 
   if (GNUNET_OK ==
       GNUNET_GTK_main_loop_start ("gnunet-setup", "gnunet-setup", argc, argv,
-                                  options, "gnunet_setup_gtk_main_window.glade",
+                                  options, "gnunet_setup_main_window.glade",
                                   &run))
     ret = gret;
   else