1 files changed, 68 insertions, 50 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index e022b1cc..413795ce 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -38,9 +38,9 @@
 #endif
 
 #ifdef WITH_LIBGKSU2
-/*#include <libgksu/libgksu.h>
-* commented because support is broken in Debian,
-* and these headers are not really useful for us */
+/* Not used because libgksu2 headers have broken depends in Debian
+And this is not really needed
+#include <libgksu/libgksu.h> */
 #endif
 
 typedef struct
@@ -516,7 +516,7 @@ GNUNET_GTK_notify (int type, const char *message, ...)
       va_end (arg);
       libnotify = notify_notification_new ("gnunet-gtk",
                                            msg,
-                                           PACKAGNUNET_GE_DATA
+                                           PACKAGE_DATA
                                            "/gnunet-gtk/gnunet-gtk-notify.png",
                                            NULL);
       GNUNET_free (msg);
@@ -588,61 +588,79 @@ GNUNET_GTK_get_main_window_state ()
  * Start gnunet-setup, asking for a password if needed
  */
 gboolean
-GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
+GNUNET_GTK_run_gnunet_setup (gchar *conffile, gboolean run_wizard)
 {
   GtkWidget *mainWindow;
   GtkWidget *messageDialog;
-  int code;
-  char *error_message;
-#ifdef WITH_LIBGKSU2
   GError *gerror = NULL;
-  if (run_wizard)
-    {
-      code = gksu_run ("gnunet-setup -d wizard-gtk", &gerror);
-    }
-  else
-    {
-      code = gksu_run ("gnunet-setup -d", &gerror);
-    }
-  if (code && !gerror)
-    {
-      error_message =
-        GNUNET_strdup (_
-                       ("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."));
-    }
-  else if (code && gerror)
+  char *error_message = NULL;
+
+  if (0 == ACCESS(conffile, W_OK))
     {
-      error_message = g_strdup_printf (_("GKSu returned:\n%s"),
-                                       gerror->message);
-      g_error_free (gerror);
+      if (run_wizard)
+        {
+          char *argv[]
+              = {"gnunet-setup", "-d", "wizard-gtk", "-c", conffile, NULL};
+          g_spawn_async (NULL, argv, NULL,
+              G_SPAWN_SEARCH_PATH|G_SPAWN_CHILD_INHERITS_STDIN,
+              NULL, NULL, NULL, &gerror);
+        }
+      else
+        {
+          char *argv[]
+              = {"gnunet-setup", "-d", "gconfig", "-c", conffile, NULL};
+          g_spawn_async (NULL, argv, NULL,
+              G_SPAWN_SEARCH_PATH|G_SPAWN_CHILD_INHERITS_STDIN,
+              NULL, NULL, NULL, &gerror);
+        }
+      if (gerror)
+        {  
+          error_message = GNUNET_strdup(gerror->message);
+          g_error_free (gerror);
+        }
     }
   else
-    {
-      error_message = NULL;
-    }
-#elif defined(WINDOWS)
-/* FIXME: run gnunet-setup, assuming we can get the needed rights */
-  error_message = GNUNET_strdup (_("Not implemented yet!"));
-  code = TRUE;
+#ifndef WITH_LIBGKSU2
+  {
+    error_message = GNUNET_strdup(_("You don't have rights to write to the provided configuration file."));
+  }
 #else
-  error_message =
-    GNUNET_strdup (_
-                   ("GKSu support is not enabled, impossible to get the needed rights. You should build gnunet-gtk with the --enable-libgksu2 option, or get the right binary package. Note you can still start the configuration tool (gnunet-setup) manually."));
-  code = TRUE;
+  {
+    char *commandline;
+
+    if (run_wizard)
+      {
+        commandline = g_strconcat ("gnunet-setup -d wizard-gtk -c ", conffile, NULL);
+        gksu_run (commandline, &gerror);
+      }
+    else
+      {
+        commandline = g_strconcat ("gnunet-setup -d gconfig -c ", conffile, NULL);
+        gksu_run (commandline, &gerror);
+      }
+    GNUNET_free (commandline);
+    if (gerror)
+      {
+        error_message = GNUNET_strdup(gerror->message);
+        g_error_free (gerror);
+      }
+  }
 #endif
-  mainWindow =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
-  messageDialog =
-    gtk_message_dialog_new (GTK_WINDOW (mainWindow),
-                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
-                            GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
-                            _
-                            ("Failed to run the configuration tool (gnunet-setup): %s"),
-                            error_message);
-  gtk_dialog_run (GTK_DIALOG (messageDialog));
-  gtk_widget_destroy (messageDialog);
-  GNUNET_free (error_message);
-  return code;
+  if(error_message) {
+    mainWindow = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+    messageDialog = gtk_message_dialog_new (GTK_WINDOW (mainWindow),
+                                            GTK_DIALOG_MODAL |
+                                            GTK_DIALOG_DESTROY_WITH_PARENT,
+                                            GTK_MESSAGE_WARNING,
+                                            GTK_BUTTONS_CLOSE,
+                                            _("Failed to run the configuration tool (gnunet-setup): %s"),
+                                            error_message);
+    gtk_dialog_run (GTK_DIALOG (messageDialog));
+    gtk_widget_destroy (messageDialog);
+    GNUNET_free (error_message);
+    return FALSE;
+   }
+  return TRUE;
 }
 
 /* end of helper.c */