3 files changed, 59 insertions, 41 deletions

diff --git a/src/common/helper.c b/src/common/helper.c
index 46d99c71..0abe2f06 100644
--- a/src/common/helper.c
+++ b/src/common/helper.c
@@ -191,7 +191,9 @@ connector (const gchar * handler_name,
   method = NULL;
   while (plug != NULL)
     {
-      method = GNUNET_plugin_resolve_function (plug->library, handler_name, GNUNET_NO);
+      method =
+        GNUNET_plugin_resolve_function (plug->library, handler_name,
+                                        GNUNET_NO);
       if (method != NULL)
         break;
       plug = plug->next;
@@ -205,8 +207,9 @@ connector (const gchar * handler_name,
           (TRUE != g_module_symbol (module, handler_name, &method)))
         {
           GNUNET_GELOG (ectx,
-                  GNUNET_GEWARNING | GNUNET_GEDEVELOPER | GNUNET_GEIMMEDIATE,
-                  _("Failed to find handler for `%s'\n"), handler_name);
+                        GNUNET_GEWARNING | GNUNET_GEDEVELOPER |
+                        GNUNET_GEIMMEDIATE,
+                        _("Failed to find handler for `%s'\n"), handler_name);
           g_module_close (module);
           return;
         }
@@ -299,7 +302,8 @@ unloadPlugin (void *p)
 
 void
 GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
-                     struct GNUNET_GC_Configuration *c, void *callback)
+                                      struct GNUNET_GC_Configuration *c,
+                                      void *callback)
 {
   char *load;
   char *path;
@@ -316,7 +320,8 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
   /* load the interface */
   path = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
   filename =
-    GNUNET_malloc (strlen (path) + strlen ("/../gnunet-gtk/gnunet-gtk.glade") + 2);
+    GNUNET_malloc (strlen (path) +
+                   strlen ("/../gnunet-gtk/gnunet-gtk.glade") + 2);
   strcpy (filename, path);
   GNUNET_free (path);
   strcat (filename, "/../gnunet-gtk/gnunet-gtk.glade");
@@ -331,13 +336,14 @@ GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *e,
   mainXML = glade_xml_new (gladeFile, "mainWindow", PACKAGNUNET_GENAME);
   if (mainXML == NULL)
     GNUNET_GEDIE_STRERROR_FILE (ectx,
-                          GNUNET_GEFATAL | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
-                          "glade_xml_new", gladeFile);
+                                GNUNET_GEFATAL | GNUNET_GEUSER |
+                                GNUNET_GEIMMEDIATE, "glade_xml_new",
+                                gladeFile);
   /* load the plugins */
   GNUNET_GC_get_configuration_value_string (cfg,
-                                     "GNUNET-GTK",
-                                     "PLUGINS",
-                                     "about daemon fs stats", &load);
+                                            "GNUNET-GTK",
+                                            "PLUGINS",
+                                            "about daemon fs stats", &load);
   loadPlugins (load);
   GNUNET_free (load);
   GNUNET_GTK_connect_glade_with_plugins (mainXML);
@@ -422,7 +428,9 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
   cls.arg = arg;
   doneThread = GNUNET_thread_create (&shutdownCode, &cls, 64 * 1024);
   if (doneThread == NULL)
-    GNUNET_GEDIE_STRERROR (ectx, GNUNET_GEFATAL | GNUNET_GEADMIN | GNUNET_GEBULK, "pthread_create");
+    GNUNET_GEDIE_STRERROR (ectx,
+                           GNUNET_GEFATAL | GNUNET_GEADMIN | GNUNET_GEBULK,
+                           "pthread_create");
   if (!GNUNET_thread_test_self (mainThread))
     {
       /* another thread will run the save calls */
@@ -435,7 +443,7 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
           GNUNET_mutex_lock (sclock);
           if (pscCount > 0)
             {
-              i = GNUNET_random_u32(GNUNET_RANDOM_QUALITY_WEAK, pscCount);
+              i = GNUNET_random_u32 (GNUNET_RANDOM_QUALITY_WEAK, pscCount);
               if (TRUE == g_idle_remove_by_data (psc[i]))
                 saveCallWrapper (psc[i]);
             }
@@ -444,7 +452,8 @@ GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg)
               i = -1;
             }
           GNUNET_mutex_unlock (sclock);
-          if ((i == -1) && (GNUNET_OK != GNUNET_semaphore_down (cls.sig, GNUNET_NO)))
+          if ((i == -1)
+              && (GNUNET_OK != GNUNET_semaphore_down (cls.sig, GNUNET_NO)))
             {
               GNUNET_thread_sleep (50 * GNUNET_CRON_MILLISECONDS);
             }
@@ -480,13 +489,15 @@ GNUNET_GTK_notify (int type, const char *message, ...)
         {
           once = 1;
           GNUNET_GELOG (ectx,
-                  GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER | GNUNET_GEADMIN,
-                  _("Could not initialize libnotify\n"));
+                        GNUNET_GEWARNING | GNUNET_GEBULK | GNUNET_GEUSER |
+                        GNUNET_GEADMIN,
+                        _("Could not initialize libnotify\n"));
           return;
         }
     }
 
-  root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+  root =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
   if (gtk_window_is_active (GTK_WINDOW (root)) == FALSE)
     {
       if (type == GNUNET_GTK_NOTIFY_LEVEL_LOW)
@@ -514,8 +525,9 @@ GNUNET_GTK_notify (int type, const char *message, ...)
         {
           once = 1;
           GNUNET_GELOG (ectx,
-                  GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN | GNUNET_GEBULK,
-                  _("Could not send notification via libnotify\n"));
+                        GNUNET_GEWARNING | GNUNET_GEUSER | GNUNET_GEADMIN |
+                        GNUNET_GEBULK,
+                        _("Could not send notification via libnotify\n"));
         }
       g_object_unref (G_OBJECT (libnotify));
       notify_uninit ();
@@ -555,7 +567,8 @@ GNUNET_GTK_validate_utf8 (char *msg)
 */
 void
 GNUNET_GTK_save_main_window_state (GtkWidget * main_window,
-                     GdkEventWindowState * event, gpointer user_data)
+                                   GdkEventWindowState * event,
+                                   gpointer user_data)
 {
   main_window_state = (*event).new_window_state;
   return;
@@ -594,7 +607,7 @@ GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
     {
       error_message =
         GNUNET_strdup (_
-                ("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."));
+                       ("GKSu encountered an unknown error running the configuration tool (gnunet-setup)."));
     }
   else if (code && gerror)
     {
@@ -613,18 +626,18 @@ GNUNET_GTK_run_gnunet_setup (gboolean run_wizard)
 #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."));
+                   ("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;
 #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_MESSAGNUNET_GEWARNING,
-                                          GTK_BUTTONS_CLOSE,
-                                          _
-                                          ("Failed to run the configuration tool (gnunet-setup): %s"),
-                                          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_MESSAGNUNET_GEWARNING, 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);
diff --git a/src/common/iterators.c b/src/common/iterators.c
index 481e2a69..3eaf87ad 100644
--- a/src/common/iterators.c
+++ b/src/common/iterators.c
@@ -35,8 +35,8 @@
  */
 void
 GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
-                                     GtkTreeSelectionForeachFunc func,
-                                     gpointer data)
+                                            GtkTreeSelectionForeachFunc func,
+                                            gpointer data)
 {
   unsigned int i;
   unsigned int size;
@@ -95,7 +95,8 @@ collectAllRows (GtkTreeModel * model,
  */
 void
 GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
-                        GtkTreeSelectionForeachFunc func, gpointer data)
+                               GtkTreeSelectionForeachFunc func,
+                               gpointer data)
 {
   int i;
   GtkTreePath *path;
diff --git a/src/common/logging.c b/src/common/logging.c
index a749536d..aef6fa46 100644
--- a/src/common/logging.c
+++ b/src/common/logging.c
@@ -44,7 +44,9 @@ init ()
   if (statusXML != NULL)
     return;
   statusXML
-    = glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow", PACKAGNUNET_GENAME);
+    =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "statusWindow",
+                   PACKAGNUNET_GENAME);
   infoWindow = glade_xml_get_widget (statusXML, "statusWindow");
   infoWindowTextView
     = glade_xml_get_widget (statusXML, "messageWindowTextView");
@@ -126,22 +128,23 @@ saveAddLogEntry (void *args)
   static GtkWidget *s = NULL;
   static int once = 1;
   static guint id;
-  char * val;
+  char *val;
 
   init ();
   if (once)
     {
       once = 0;
-      s = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusbar");
+      s =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statusbar");
       id = gtk_statusbar_get_context_id (GTK_STATUSBAR (s), "LOG");
     }
   else
     gtk_statusbar_pop (GTK_STATUSBAR (s), id);
-  val = GNUNET_strdup((const char*) args);
-  if (strstr(val, "\n") != NULL)
-    strstr(val, "\n")[0] = '\0';
+  val = GNUNET_strdup ((const char *) args);
+  if (strstr (val, "\n") != NULL)
+    strstr (val, "\n")[0] = '\0';
   gtk_statusbar_push (GTK_STATUSBAR (s), id, val);
-  GNUNET_free(val);
+  GNUNET_free (val);
   return NULL;
 }
 
@@ -183,7 +186,8 @@ GNUNET_GTK_create_gtk_logger (GNUNET_GEKIND mask)
   struct GNUNET_GEContext *myLog;
 
   myLog = GNUNET_GEcreate_context_callback (mask,
-                                      &ge_gtk_log_handler, NULL, NULL, NULL);
+                                            &ge_gtk_log_handler, NULL, NULL,
+                                            NULL);
   return myLog;
 }