[GNUnet-SVN] r2041 - GNUnet/src/conf

[grothoff]

Author: grothoff
Date: 2005-09-02 02:27:35 -0700 (Fri, 02 Sep 2005)
New Revision: 2041

Modified:
   GNUnet/src/conf/gnunet-setup.c
Log:
fixing 919

Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c      2005-09-01 03:53:42 UTC (rev 2040)
+++ GNUnet/src/conf/gnunet-setup.c      2005-09-02 09:27:35 UTC (rev 2041)
@@ -205,13 +205,10 @@
 {
   char *operation;
 
-#if HAVE_GTK
-  gtk_init(&argc, &argv);
-#endif
   if(OK != initUtil(argc, argv, &parser))
     return -1;
   operation = getConfigurationString("GNUNET-SETUP", "OPERATION");
-  if(operation == NULL) {
+  if (operation == NULL) {
 #if HAVE_GTK
     operation = STRDUP("gconfig");
 #elif HAVE_CURSES
@@ -219,6 +216,9 @@
 #else
     operation = STRDUP("config");
 #endif
+    LOG(LOG_WARNING,
+       "No interface specified, defaulting to `%s'\n",
+       operation);
   }
   if(strcmp(operation, "config") == 0)
     conf_main();
@@ -244,6 +244,7 @@
       errexit(_("Can only run wizard to configure gnunetd.\n"
                 "Did you forget the `%s' option?\n"), "-d");
 #if HAVE_GTK
+    gtk_init(&argc, &argv);
     wizard_main();
 #else
     printf(_("wizard-gtk is not available\n"));
@@ -251,6 +252,7 @@
   }
   else if(strcmp(operation, "gconfig") == 0) {
 #if HAVE_GTK
+    gtk_init(&argc, &argv);
     gconf_main();
 #else
     printf(_("gconfig is not available\n"));