1 files changed, 60 insertions, 59 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 304a6cbb..1c3b4538 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -37,9 +37,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
 
 static struct GNUNET_CronManager *cron;
@@ -172,12 +170,12 @@ doUpdateMenus (void *arg)
   if (ret == 0)
     {
       canStart = 0;
-          fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
-          if (NULL == fn)
-            GNUNET_GC_get_configuration_value_filename (cfg, "DAEMON",
-                                                                                                    "CONFIGFILE",
-                                                                                                    GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
-                                                                                                    &fn);
+      fn = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+      if (NULL == fn)
+        GNUNET_GC_get_configuration_value_filename (cfg, "DAEMON",
+                                                    "CONFIGFILE",
+                                                    GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
+                                                    &fn);
       if (isLocal && fn)
         {
           if (GNUNET_disk_file_test (ectx, fn) == GNUNET_YES)
@@ -195,7 +193,7 @@ doUpdateMenus (void *arg)
 #if defined(WINDOWS) || defined(WITH_LIBGKSU2)
                   canStart = 1;
 #else
-                                  struct passwd *pws;
+                  struct passwd *pws;
                   if (NULL == (pws = getpwnam (user)))
                     {
                       canStart = 0;
@@ -246,9 +244,9 @@ cronCheckDaemon (void *dummy)
   int ret;
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
-      ret = 1;
+    ret = 1;
   else
-      ret = 0;
+    ret = 0;
   GNUNET_GTK_save_call (&doUpdateMenus, &ret);
 }
 
@@ -287,42 +285,41 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
       if (0 != GNUNET_GC_parse_configuration (dcfg, fn))
         user = NULL;
       GNUNET_GC_get_configuration_value_string (dcfg,
-                                                "GNUNETD",
-                                                "USER", "", &user);
+                                                "GNUNETD", "USER", "", &user);
 #ifdef WITH_LIBGKSU2
-          char *command;
-          GError *gerror = NULL;
-          struct passwd *pws;
-          if (strlen (user) > 0)
-            {
+      char *command;
+      GError *gerror = NULL;
+      struct passwd *pws;
+      if (strlen (user) > 0)
+        {
           pws = getpwnam (user);
           if (pws->pw_uid != getuid ())
-                        {
+            {
               command = g_strconcat ("gnunetd -c ", fn, NULL);
-                          code = gksu_run (command, &gerror);
-                          GNUNET_free (command);
-                          if (gerror)
+              code = gksu_run (command, &gerror);
+              GNUNET_free (command);
+              if (gerror)
                 {
-                                  GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
+                  GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
 
-                                  g_error_free (gerror);
+                  g_error_free (gerror);
                 }
               else
                 {
                   GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
                 }
-             g_free (fn);
-                         cronCheckDaemon (NULL);
-                         return;
-                        }
-           else
-             code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES); 
-                }
+              g_free (fn);
+              cronCheckDaemon (NULL);
+              return;
+            }
+          else
+            code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
+        }
 #else
-     code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
+      code = GNUNET_daemon_start (ectx, cfg, fn, GNUNET_YES);
 #endif
-                                                
-         if (GNUNET_SYSERR != code)
+
+      if (GNUNET_SYSERR != code)
         {
           GNUNET_GTK_add_log_entry (_("Launched gnunetd\n"));
         }
@@ -331,8 +328,8 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
           GNUNET_GTK_add_log_entry (_("Launching gnunetd failed\n"));
         }
       if (fn != NULL)
-      g_free (fn);
-          cronCheckDaemon (NULL);
+        g_free (fn);
+      cronCheckDaemon (NULL);
     }
 }
 
@@ -432,17 +429,17 @@ init_daemon (struct GNUNET_GE_Context *e, struct GNUNET_GC_Configuration *c)
                                 ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'.\n"),
                                 daemon_config);
     }
-  
+
 #ifndef WITH_LIBGKSU2
   GtkWidget *startDaemonConfWizard;
   GtkWidget *startDaemonConfTool;
 
   startDaemonConfWizard
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "startDaemonConfWizard");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "startDaemonConfWizard");
   startDaemonConfTool
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "startDaemonConfTool");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "startDaemonConfTool");
   if (0 != ACCESS (daemon_config, W_OK))
     {
       gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
@@ -471,7 +468,9 @@ done_daemon ()
                           "applicationList");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
 
-  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
+  w =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "applicationList");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
 
 }
@@ -480,15 +479,16 @@ done_daemon ()
 * Launch 'gnunet-setup -d wizard-gtk' with needed rights
 */
 void
-on_startDaemonConfWizard_clicked_daemon (GtkWidget *widget, gpointer data)
+on_startDaemonConfWizard_clicked_daemon (GtkWidget * widget, gpointer data)
 {
   GtkWidget *filechooserbutton;
   char *conffile;
 
   filechooserbutton
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "gnunetdconfigFileChooserButton");
-  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "gnunetdconfigFileChooserButton");
+  conffile =
+    gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
   GNUNET_GTK_run_gnunet_setup (conffile, TRUE);
   GNUNET_free (conffile);
 }
@@ -497,15 +497,16 @@ on_startDaemonConfWizard_clicked_daemon (GtkWidget *widget, gpointer data)
 * Launch 'gnunet-setup -d gconfig' with needed rights
 */
 void
-on_startDaemonConfTool_clicked_daemon (GtkWidget *widget, gpointer data)
+on_startDaemonConfTool_clicked_daemon (GtkWidget * widget, gpointer data)
 {
   GtkWidget *filechooserbutton;
   char *conffile;
 
   filechooserbutton
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "gnunetdconfigFileChooserButton");
-  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "gnunetdconfigFileChooserButton");
+  conffile =
+    gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
   GNUNET_GTK_run_gnunet_setup (conffile, FALSE);
   GNUNET_free (conffile);
 }
@@ -514,8 +515,7 @@ on_startDaemonConfTool_clicked_daemon (GtkWidget *widget, gpointer data)
 * Update sensitivity of daemon buttons
 */
 void
-on_gnunetdconfigfile_set_daemon (GtkWidget *filechooserbutton,
-                                 gpointer data)
+on_gnunetdconfigfile_set_daemon (GtkWidget * filechooserbutton, gpointer data)
 {
 #ifndef WITH_LIBGKSU2
   GtkWidget *startDaemonConfWizard;
@@ -524,18 +524,19 @@ on_gnunetdconfigfile_set_daemon (GtkWidget *filechooserbutton,
   int ret;
 
   startDaemonConfWizard
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "startDaemonConfWizard");
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "startDaemonConfWizard");
   startDaemonConfTool
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "startDaemonConfTool");
-  conffile = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(filechooserbutton));
+    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "startDaemonConfTool");
+  conffile =
+    gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (filechooserbutton));
   if (0 == ACCESS (conffile, W_OK))
     {
       gtk_widget_set_sensitive (startDaemonConfWizard, TRUE);
       gtk_widget_set_sensitive (startDaemonConfTool, TRUE);
     }
-   else
+  else
     {
       gtk_widget_set_sensitive (startDaemonConfWizard, FALSE);
       gtk_widget_set_sensitive (startDaemonConfTool, FALSE);