1 files changed, 56 insertions, 34 deletions

diff --git a/src/plugins/daemon/daemon.c b/src/plugins/daemon/daemon.c
index 537f19c5..73d39c0e 100644
--- a/src/plugins/daemon/daemon.c
+++ b/src/plugins/daemon/daemon.c
@@ -57,7 +57,8 @@ updateAppModelSafe (void *unused)
   apps = NULL;
   sock = GNUNET_client_connection_create (ectx, cfg);
   if (sock != NULL)
-    apps = GNUNET_get_daemon_configuration_value (sock, "GNUNETD", "APPLICATIONS");
+    apps =
+      GNUNET_get_daemon_configuration_value (sock, "GNUNETD", "APPLICATIONS");
   if (apps != NULL)
     {
       next = apps;
@@ -79,7 +80,8 @@ updateAppModelSafe (void *unused)
             }
           if (strlen (pos) > 0)
             {
-              desc = GNUNET_get_daemon_configuration_value (sock, "ABOUT", pos);
+              desc =
+                GNUNET_get_daemon_configuration_value (sock, "ABOUT", pos);
 
               gtk_list_store_append (model, &iter);
               gtk_list_store_set (model,
@@ -91,11 +93,13 @@ updateAppModelSafe (void *unused)
       while (next != NULL);
       GNUNET_free (apps);
     }
-  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), GTK_TREE_MODEL (model));
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection
                                (GTK_TREE_VIEW (w)), GTK_SELECTION_NONE);
-  g_object_unref(model);
+  g_object_unref (model);
   GNUNET_client_connection_destroy (sock);
   return NULL;
 }
@@ -129,18 +133,25 @@ doUpdateMenus (void *arg)
   if (once)
     {
       once = 0;
-      killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
-      launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "startDaemon");
-      statsEntryYes = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapYes");
-      statsEntryNo = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapNo");
-      statsEntryError
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusPixmapError");
-      chooser
-        = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                "gnunetdconfigFileChooserButton");
-      GNUNET_GC_get_configuration_value_string (cfg,
-                                         "NETWORK",
-                                         "HOST", "localhost", &host);
+      killEntry =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
+      launchEntry =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "startDaemon");
+      statsEntryYes =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "statusPixmapYes");
+      statsEntryNo =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "statusPixmapNo");
+      statsEntryError =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "statusPixmapError");
+      chooser =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "gnunetdconfigFileChooserButton");
+      GNUNET_GC_get_configuration_value_string (cfg, "NETWORK", "HOST",
+                                                "localhost", &host);
       if (strcmp (host, "localhost") == 0)
         isLocal = TRUE;
       else
@@ -163,8 +174,8 @@ doUpdateMenus (void *arg)
                 canStart = 0;
               user = NULL;
               GNUNET_GC_get_configuration_value_string (dcfg,
-                                                 "GNUNETD",
-                                                 "USER", "", &user);
+                                                        "GNUNETD",
+                                                        "USER", "", &user);
               if (strlen (user) > 0)
                 {
 #ifndef WINDOWS
@@ -237,7 +248,8 @@ on_startDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   GtkWidget *chooser;
   char *fn;
 
-  launchEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "startDaemon");
+  launchEntry =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "startDaemon");
   gtk_widget_set_sensitive (launchEntry, FALSE);
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
@@ -274,13 +286,15 @@ on_stopDaemon_clicked_daemon (GtkWidget * widget, gpointer data)
   GtkWidget *killEntry = NULL;
   struct GNUNET_ClientServerConnection *sock;
 
-  killEntry = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
+  killEntry =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDaemon");
   gtk_widget_set_sensitive (killEntry, FALSE);
 
   if (GNUNET_OK == GNUNET_test_daemon_running (ectx, cfg))
     {
       sock = GNUNET_client_connection_create (ectx, cfg);
-      if (GNUNET_OK != GNUNET_client_connection_request_daemon_shutdown (sock))
+      if (GNUNET_OK !=
+          GNUNET_client_connection_request_daemon_shutdown (sock))
         {
           GtkWidget *dialog;
 
@@ -313,7 +327,9 @@ init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
 
   ectx = e;
   cfg = c;
-  apps = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "applicationList");
+  apps =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "applicationList");
   model = gtk_list_store_new (1, G_TYPE_STRING);
   gtk_tree_view_set_model (GTK_TREE_VIEW (apps), GTK_TREE_MODEL (model));
   renderer = gtk_cell_renderer_text_new ();
@@ -333,14 +349,16 @@ init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
   gtk_tree_view_column_set_resizable (gtk_tree_view_get_column
                                       (GTK_TREE_VIEW (apps), col - 1), TRUE);
 
-  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "daemonScrolledWindow");
+  tab =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "daemonScrolledWindow");
   gtk_widget_show (tab);
   daemon_config = NULL;
   GNUNET_GC_get_configuration_value_filename (cfg,
-                                       "DAEMON",
-                                       "CONFIGFILE",
-                                       GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
-                                       &daemon_config);
+                                              "DAEMON",
+                                              "CONFIGFILE",
+                                              GNUNET_DEFAULT_DAEMON_CONFIG_FILE,
+                                              &daemon_config);
   if (GNUNET_YES == GNUNET_disk_file_test (NULL, daemon_config))
     {
       gtk_file_chooser_set_filename (GTK_FILE_CHOOSER
@@ -352,15 +370,16 @@ init_daemon (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
   else
     {
       GNUNET_GTK_add_log_entry (_
-                   ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
-                   daemon_config);
+                                ("Configuration file for GNUnet daemon `%s' does not exist! Run `gnunet-setup -d'."),
+                                daemon_config);
     }
   GNUNET_free (daemon_config);
 
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS, NULL);
-  GNUNET_cron_add_job (cron,
-                &updateAppModel, 5 * GNUNET_CRON_MINUTES, 5 * GNUNET_CRON_MINUTES, NULL);
+  GNUNET_cron_add_job (cron, &cronCheckDaemon, 0, 15 * GNUNET_CRON_SECONDS,
+                       NULL);
+  GNUNET_cron_add_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES,
+                       5 * GNUNET_CRON_MINUTES, NULL);
 }
 
 void
@@ -368,9 +387,12 @@ done_daemon ()
 {
   GtkWidget *w;
 
-  GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS, NULL);
+  GNUNET_cron_del_job (cron, &cronCheckDaemon, 15 * GNUNET_CRON_SECONDS,
+                       NULL);
   GNUNET_cron_del_job (cron, &updateAppModel, 5 * GNUNET_CRON_MINUTES, 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);
 
 }