1 files changed, 37 insertions, 8 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index e4f71101..b98af981 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -26,6 +26,7 @@
 
 #include "platform.h"
 #include "gnunetgtk_common.h"
+#include <glib.h>
 
 #define HELPER_DEBUG NO
 
@@ -33,6 +34,12 @@
 #include <libnotify/notify.h>
 #endif
 
+#ifdef WITH_LIBGKSU2
+/*#include <libgksu/libgksu.h>
+* commented because support is broken in Debian,
+* and these headers are not really useful for us */
+#endif
+
 typedef struct {
   Semaphore * sem;
   void * args;
@@ -613,18 +620,40 @@ GdkWindowState getMainWindowState()
 * Start gnunet-setup, asking for a password if needed
 */
 gboolean startGNUnetSetup (gboolean run_wizard) {
-#ifdef HAVE_LIBGKSU2
-  if(gnunetsetup_mode) {
-    gksu_run("gnunet-setup -d wizard-gtk", NULL); }
+  int code;
+#ifdef WITH_LIBGKSU2
+  GError *gerror = NULL;
+  char *error_message;
+  if(run_wizard) {
+    code = gksu_run("gnunet-setup -d wizard-gtk", &gerror); }
   else {
-    gksu_run("gnunet-setup -d", NULL); }
-  return TRUE;
-#elif WINDOWS
-/* FIXME: run gnunet-setup, assuming we can have the needed rights */
+    code = gksu_run("gnunet-setup -d", &gerror); }
+  if(code && !gerror) {
+    error_message = STRDUP("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."); }
+  else if(code && gerror) {
+    error_message = g_strdup_printf("GKSu returned:\n%s", 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 = STRDUP("Not implemented yet !");
   return TRUE;
 #else
-  return FALSE;
+  error_message = 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."));
+  return TRUE;
 #endif
+  GtkWidget *mainWindow, *messageDialog;
+  mainWindow = glade_xml_get_widget(getMainXML(), "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 wizard: %s"),
+                                            error_message);
+  gtk_dialog_run(GTK_DIALOG(messageDialog));
+  gtk_widget_destroy (messageDialog);
+  FREE(error_message);
+  return code;
 }
 
 /* end of helper.c */