1 files changed, 3 insertions, 16 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index 92f72589..120949d9 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -38,12 +38,7 @@ static struct GNUNET_GTK_MainLoop *ml;
 /**
  * Name of the configuration file.
  */
-static char *cfgName;
-
-/**
- * Our log level (FIXME: needed!?)
- */
-static char *loglev;
+static const char *cfgName;
 
 /**
  * Our configuration.
@@ -319,6 +314,7 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   GtkWidget *main_window;
 
   ml = cls;
+  cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
   (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
@@ -342,26 +338,17 @@ int
 main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
-    GNUNET_GETOPT_OPTION_CFG_FILE (&cfgName),
-    GNUNET_GETOPT_OPTION_HELP (gettext_noop ("Setup tool for GNUnet")),
-    GNUNET_GETOPT_OPTION_LOGLEVEL (&loglev),
-    GNUNET_GETOPT_OPTION_VERSION (PACKAGE_VERSION),
     GNUNET_GETOPT_OPTION_END
   };
   int ret;
 
-  cfgName = GNUNET_strdup (GNUNET_DEFAULT_USER_CONFIG_FILE);
-  loglev = GNUNET_strdup ("WARNING");
-
   if (GNUNET_OK ==
-      GNUNET_GTK_main_loop_start ("gnunet-setup", "guunet-setup", argc, argv,
+      GNUNET_GTK_main_loop_start ("gnunet-setup", "gnunet-setup", argc, argv,
                                   options, "gnunet_setup_gtk_main_window.glade",
                                   &run))
     ret = gret;
   else
     ret = 1;
-  GNUNET_free (cfgName);
-  GNUNET_free (loglev);
   return ret;
 }