1 files changed, 61 insertions, 56 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 177ac952..66240ebb 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -42,9 +42,7 @@
 /* Not used because libgksu2 headers have broken depends in Debian
 And this is not really needed
 #include <libgksu/libgksu.h> */
-gboolean
-gksu_run (gchar *command_line,
-          GError **error);
+gboolean gksu_run (gchar * command_line, GError ** error);
 #endif
 
 typedef struct
@@ -359,7 +357,7 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GE_Context *e,
                                  GNUNET_GE_FATAL | GNUNET_GE_USER |
                                  GNUNET_GE_IMMEDIATE, "glade_xml_new",
                                  gladeFile);
-#if GTK_CHECK_VERSION (2,10,0)  
+#if GTK_CHECK_VERSION (2,10,0)
   trayIcon = gtk_status_icon_new ();
 #endif
   initTrayIcon ();
@@ -465,8 +463,8 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
       i = 0;
       while (GNUNET_SYSERR == GNUNET_semaphore_down (cls.sig, GNUNET_NO))
         {
-          if (i == -1)
-            GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
+          if (i == -1)
+            GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
           GNUNET_mutex_lock (sclock);
           if (pscCount > 0)
             {
@@ -609,78 +607,85 @@ GNUNET_GTK_get_main_window_state ()
  * Start gnunet-setup, asking for a password if needed
  */
 gboolean
-GNUNET_GTK_run_gnunet_setup (gchar *conffile, gboolean run_wizard)
+GNUNET_GTK_run_gnunet_setup (gchar * conffile, gboolean run_wizard)
 {
   GtkWidget *mainWindow;
   GtkWidget *messageDialog;
   GError *gerror = NULL;
   char *error_message = NULL;
 
-  if (0 == ACCESS(conffile, W_OK))
+  if (0 == ACCESS (conffile, W_OK))
     {
       if (run_wizard)
         {
           char *argv[]
-              = {"gnunet-setup", "-d", "wizard-gtk", "-c", conffile, NULL};
+            = { "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);
-        }
+                         G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN,
+                         NULL, NULL, NULL, &gerror);
+        }
       else
-        {
+        {
           char *argv[]
-              = {"gnunet-setup", "-d", "gconfig", "-c", conffile, NULL};
+            = { "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);
-        }
+                         G_SPAWN_SEARCH_PATH | G_SPAWN_CHILD_INHERITS_STDIN,
+                         NULL, NULL, NULL, &gerror);
+        }
       if (gerror)
-        {  
-          error_message = GNUNET_strdup(gerror->message);
+        {
+          error_message = GNUNET_strdup (gerror->message);
           g_error_free (gerror);
         }
     }
   else
 #ifndef WITH_LIBGKSU2
-  {
-    error_message = GNUNET_strdup(_("You don't have rights to write to the provided configuration file."));
-  }
+    {
+      error_message =
+        GNUNET_strdup (_
+                       ("You don't have rights to write to the provided configuration file."));
+    }
 #else
-  {
-    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);
-      }
-  }
+    {
+      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
-  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;
-   }
+  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;
 }