whitespace-and-indentation

31 files changed, 812 insertions, 513 deletions

diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index 5801e878..50c76b25 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1761,7 +1761,8 @@ lt_int_dyld_NSlookupSymbolInLinkedLibs (symbol, mh)
                     ltdl_NSAddImage ((char *) (((struct dylib_command *) lc)->
                                                dylib.name.offset +
                                                (unsigned long) lc),
-                                     NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED +
+                                     NSADDIMAGNUNET_GEOPTION_RETURN_ONLY_IF_LOADED
+                                     +
                                      NSADDIMAGNUNET_GEOPTION_WITH_SEARCHING +
                                      NSADDIMAGNUNET_GEOPTION_RETURN_ON_ERROR);
                 }
@@ -2957,7 +2958,8 @@ load_deplibs (handle, deplibs)
     {
       int j = 0;
 
-      handle->deplibs = (lt_dlhandle *) LT_EGNUNET_malloc (lt_dlhandle *, depcount);
+      handle->deplibs =
+        (lt_dlhandle *) LT_EGNUNET_malloc (lt_dlhandle *, depcount);
       if (!handle->deplibs)
         goto cleanup;
 
@@ -3076,7 +3078,8 @@ try_dlopen (phandle, filename)
   /* dlopen self? */
   if (!filename)
     {
-      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
+      *phandle =
+        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         return 1;
 
@@ -3321,7 +3324,8 @@ try_dlopen (phandle, filename)
       LT_DLGNUNET_free (line);
 
       /* allocate the handle */
-      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
+      *phandle =
+        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         ++errors;
 
@@ -3366,7 +3370,8 @@ try_dlopen (phandle, filename)
   else
     {
       /* not a libtool module */
-      *phandle = (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
+      *phandle =
+        (lt_dlhandle) LT_EGNUNET_malloc (struct lt_dlhandle_struct, 1);
       if (*phandle == 0)
         {
           ++errors;
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;
 }
 
diff --git a/src/core/eggtrayicon.c b/src/core/eggtrayicon.c
index 73620b3f..c855c960 100644
--- a/src/core/eggtrayicon.c
+++ b/src/core/eggtrayicon.c
@@ -544,7 +544,8 @@ egg_tray_icon_send_message (EggTrayIcon * icon,
       ev.window = (Window) gtk_plug_get_id (GTK_PLUG (icon));
       ev.format = 8;
       ev.message_type = XInternAtom (xdisplay,
-                                     "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA", False);
+                                     "_NET_SYSTEM_TRAY_MESSAGNUNET_GEDATA",
+                                     False);
       if (len > 20)
         {
           memcpy (&ev.data, message, 20);
@@ -607,7 +608,9 @@ tray_clicked (GtkWidget * widget, GdkEvent * event)
       if (event_button->button == 1)
         {
           GtkWidget *root;
-          root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+          root =
+            glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                  "mainWindow");
           GdkWindowState main_window_state;
           if (gtk_window_is_active (GTK_WINDOW (root)))
             gtk_widget_hide (root);
@@ -645,7 +648,8 @@ initTrayIcon ()
   char *iconPath;
 
   trayContextMenuXML =
-    glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu", PACKAGNUNET_GENAME);
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "trayContextMenu",
+                   PACKAGNUNET_GENAME);
   trayContextMenu =
     glade_xml_get_widget (trayContextMenuXML, "trayContextMenu");
   tray_quit = glade_xml_get_widget (trayContextMenuXML, "tray_quit");
diff --git a/src/core/main.c b/src/core/main.c
index ac648f87..a6663223 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -40,16 +40,16 @@ static char *cfgFilename = GNUNET_DEFAULT_CLIENT_CONFIG_FILE;
  * All gnunet-gtk command line options
  */
 static struct GNUNET_CommandLineOption gnunetgtkOptions[] = {
-  GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),  /* -c */
+  GNUNET_COMMAND_LINE_OPTION_CFG_FILE (&cfgFilename),   /* -c */
 #ifdef WINDOWS
   {'d', "debug", NULL,
    gettext_noop ("run in debug mode"),
    0, &GNUNET_getopt_configure_set_one, &debug_mode},
 #endif
-  GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),       /* -h */
-  GNUNET_COMMAND_LINE_OPTION_HOSTNAME, /* -H */
-  GNUNET_COMMAND_LINE_OPTION_LOGGING,  /* -L */
-  GNUNET_COMMAND_LINE_OPTION_VERSION (VERSION),        /* -v */
+  GNUNET_COMMAND_LINE_OPTION_HELP (gettext_noop ("GNUnet GTK user interface.")),        /* -h */
+  GNUNET_COMMAND_LINE_OPTION_HOSTNAME,  /* -H */
+  GNUNET_COMMAND_LINE_OPTION_LOGGING,   /* -L */
+  GNUNET_COMMAND_LINE_OPTION_VERSION (VERSION), /* -v */
   GNUNET_COMMAND_LINE_OPTION_VERBOSE,
   GNUNET_COMMAND_LINE_OPTION_END,
 };
@@ -122,18 +122,21 @@ main (int argc, char *const *argv)
   GNUNET_GTK_initialize_common_library (ectx, cfg, &GNUNET_GTK_main_quit);
   /* configure GTK logging */
   GNUNET_GC_get_configuration_value_string (cfg,
-                                     "LOGGING",
-                                     "USER-LEVEL", "WARNING", &log);
+                                            "LOGGING",
+                                            "USER-LEVEL", "WARNING", &log);
   mask = GNUNET_GEgetKIND (log);
   GNUNET_free (log);
   mask |= mask - 1;             /* set all bits... */
   mask |= GNUNET_GEUSER | GNUNET_GEBULK | GNUNET_GEIMMEDIATE;
   if (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
-                                               "LOGGING", "DEVELOPER", GNUNET_NO))
+                                                             "LOGGING",
+                                                             "DEVELOPER",
+                                                             GNUNET_NO))
     mask |= GNUNET_GEDEVELOPER | GNUNET_GEREQUEST;
   my_ctx = GNUNET_GTK_create_gtk_logger (mask);
   GNUNET_GEsetDefaultContext (my_ctx);
-  root = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
+  root =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainWindow");
   gtk_window_maximize (GTK_WINDOW (root));
 #ifndef WINDOWS
   initTrayIcon ();
diff --git a/src/include/gnunetgtk_common.h b/src/include/gnunetgtk_common.h
index 30c2a27d..f0893c45 100644
--- a/src/include/gnunetgtk_common.h
+++ b/src/include/gnunetgtk_common.h
@@ -44,7 +44,8 @@
 #endif
 
 void GNUNET_GTK_initialize_common_library (struct GNUNET_GEContext *ectx,
-                          struct GNUNET_GC_Configuration *cfg, void *callback);
+                                           struct GNUNET_GC_Configuration
+                                           *cfg, void *callback);
 
 void GNUNET_GTK_shutdown_plugins (void);
 
@@ -100,7 +101,8 @@ void *GNUNET_GTK_save_call (GNUNET_ThreadMainFunction func, void *arg);
  * keep save calls going while something else
  * happens).
  */
-void *GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb, void *arg);
+void *GNUNET_GTK_run_with_save_calls (GNUNET_ThreadMainFunction cb,
+                                      void *arg);
 
 /**
  * Bind handlers defined by the various
@@ -120,7 +122,8 @@ char *GNUNET_GTK_validate_utf8 (char *msg);
  * Gtk callback to save the main window state (tray icon use)
  */
 void GNUNET_GTK_save_main_window_state (GtkWidget * main_window,
-                          GdkEventWindowState * event, gpointer user_data);
+                                        GdkEventWindowState * event,
+                                        gpointer user_data);
 
 /**
  * Get the last main window state when restoring (tray icon use)
@@ -142,8 +145,8 @@ gboolean GNUNET_GTK_run_gnunet_setup (gboolean run_wizard);
  * during the iteration are tolerated.
  */
 void GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
-                                          GtkTreeSelectionForeachFunc func,
-                                          gpointer data);
+                                                 GtkTreeSelectionForeachFunc
+                                                 func, gpointer data);
 
 /**
  * Identical to "gtk_tree_model_foreach",
@@ -151,7 +154,8 @@ void GNUNET_GTK_tree_selection_selected_foreach (GtkTreeSelection * selection,
  * during the iteration are tolerated.
  */
 void GNUNET_GTK_tree_model_foreach (GtkTreeModel * model,
-                             GtkTreeSelectionForeachFunc func, gpointer data);
+                                    GtkTreeSelectionForeachFunc func,
+                                    gpointer data);
 
 
 struct GNUNET_CronManager *GNUNET_GTK_get_cron_manager (void);
diff --git a/src/plugins/about/about.c b/src/plugins/about/about.c
index b075ad59..4e859bb2 100644
--- a/src/plugins/about/about.c
+++ b/src/plugins/about/about.c
@@ -38,7 +38,9 @@ on_about_clicked_about (GtkWidget * dummy, gpointer data)
   GtkWidget *ad;
   GladeXML *axml;
 
-  axml = glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog", PACKAGNUNET_GENAME);
+  axml =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "aboutDialog",
+                   PACKAGNUNET_GENAME);
   ad = glade_xml_get_widget (axml, "aboutDialog");
   gtk_dialog_run (GTK_DIALOG (ad));
   gtk_widget_destroy (ad);
@@ -50,7 +52,8 @@ init_about ()
 {
   GtkWidget *tab;
 
-  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "aboutButton");
+  tab =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "aboutButton");
   gtk_widget_show (tab);
 }
 
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);
 
 }
diff --git a/src/plugins/fs/collection.c b/src/plugins/fs/collection.c
index 9aef61c6..de195001 100644
--- a/src/plugins/fs/collection.c
+++ b/src/plugins/fs/collection.c
@@ -97,12 +97,17 @@ createCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       nameLine = glade_xml_get_widget (metaXML, "collectionIdentifierEntry");
       collectionName = gtk_entry_get_text (GTK_ENTRY (nameLine));
       root = NULL;
-      if (GNUNET_OK == GNUNET_CO_collection_start (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* priority */
-                                    updateInterval, collectionName, meta))
+      if (GNUNET_OK == GNUNET_CO_collection_start (gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,     /* priority */
+                                                   updateInterval,
+                                                   collectionName, meta))
         {
-          w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "createCollection");
+          w =
+            glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                  "createCollection");
           gtk_widget_set_sensitive (w, FALSE);
-          w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "deleteCollection");
+          w =
+            glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                                  "deleteCollection");
           gtk_widget_set_sensitive (w, TRUE);
         }
       else
@@ -133,15 +138,21 @@ deleteCollection_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   if (GNUNET_OK == GNUNET_CO_collection_stop ())
     {
-      w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "createCollection");
+      w =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "createCollection");
       gtk_widget_set_sensitive (w, TRUE);
-      w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "deleteCollection");
+      w =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "deleteCollection");
       gtk_widget_set_sensitive (w, FALSE);
       GNUNET_GTK_show_info_message (GNUNET_NO, _("Collection stopped.\n"));
     }
   else
     {
-      GNUNET_GTK_show_info_message (GNUNET_YES, _("Failed to stop collection (consult logs).\n"));
+      GNUNET_GTK_show_info_message (GNUNET_YES,
+                                    _
+                                    ("Failed to stop collection (consult logs).\n"));
     }
 }
 
@@ -154,11 +165,15 @@ fs_collection_start ()
   h = GNUNET_CO_collection_get_name ();
   if (NULL != h)
     {
-      w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "createCollection");
+      w =
+        glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                              "createCollection");
       GNUNET_free (h);
     }
   else
-    w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "deleteCollection");
+    w =
+      glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                            "deleteCollection");
   gtk_widget_set_sensitive (w, FALSE);
 }
 
diff --git a/src/plugins/fs/content_tracking.c b/src/plugins/fs/content_tracking.c
index 85a4e560..8fff6c28 100644
--- a/src/plugins/fs/content_tracking.c
+++ b/src/plugins/fs/content_tracking.c
@@ -74,7 +74,9 @@ on_clearAvailableContentButton_clicked_fs (GtkWidget * dummy1,
   GtkTreeModel *model;
 
   DEBUG_BEGIN ();
-  contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "availableContentList");
+  contentList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "availableContentList");
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
   GNUNET_URITRACK_clear (ectx, cfg);
   GNUNET_GTK_save_call (&clearContentList, model);
@@ -87,12 +89,13 @@ on_trackingCheckButton_toggled_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   GtkWidget *trackCheckButton;
 
   trackCheckButton
-    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "trackingCheckButton");
-  GNUNET_URITRACK_toggle_tracking (ectx,
-                      cfg,
-                      gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
-                                                    (trackCheckButton)) ==
-                      TRUE ? GNUNET_YES : GNUNET_NO);
+    =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "trackingCheckButton");
+  GNUNET_URITRACK_toggle_tracking (ectx, cfg,
+                                   gtk_toggle_button_get_active
+                                   (GTK_TOGGLE_BUTTON (trackCheckButton)) ==
+                                   TRUE ? GNUNET_YES : GNUNET_NO);
 }
 
 
@@ -114,19 +117,21 @@ updateView (void *cls)
   GtkWidget *contentList;
   GtkTreeModel *model;
 
-  contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "availableContentList");
+  contentList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "availableContentList");
   model = gtk_tree_view_get_model (GTK_TREE_VIEW (contentList));
   filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
-                                        EXTRACTOR_FILENAME,
-                                        EXTRACTOR_TITLE,
-                                        EXTRACTOR_DESCRIPTION,
-                                        EXTRACTOR_SUBJECT,
-                                        EXTRACTOR_ARTIST,
-                                        EXTRACTOR_AUTHOR,
-                                        EXTRACTOR_PUBLISHER,
-                                        EXTRACTOR_CREATOR,
-                                        EXTRACTOR_PRODUCER,
-                                        EXTRACTOR_UNKNOWN, -1);
+                                                       EXTRACTOR_FILENAME,
+                                                       EXTRACTOR_TITLE,
+                                                       EXTRACTOR_DESCRIPTION,
+                                                       EXTRACTOR_SUBJECT,
+                                                       EXTRACTOR_ARTIST,
+                                                       EXTRACTOR_AUTHOR,
+                                                       EXTRACTOR_PUBLISHER,
+                                                       EXTRACTOR_CREATOR,
+                                                       EXTRACTOR_PRODUCER,
+                                                       EXTRACTOR_UNKNOWN, -1);
   if (filename == NULL)
     {
       filename = GNUNET_strdup (_("no name given"));
@@ -154,7 +159,8 @@ updateView (void *cls)
                       NAMESPACE_HSIZE, size_h,
                       NAMESPACE_URISTRING, uriString,
                       NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
-                      NAMESPACE_META, GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+                      NAMESPACE_META,
+                      GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
diff --git a/src/plugins/fs/directory.c b/src/plugins/fs/directory.c
index c1c7b8cd..5524899c 100644
--- a/src/plugins/fs/directory.c
+++ b/src/plugins/fs/directory.c
@@ -94,8 +94,9 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   if (dn == NULL)
     return;
   if ((GNUNET_YES != GNUNET_disk_file_test (NULL,
-                              dn)) ||
-      (GNUNET_OK != GNUNET_disk_file_size (NULL, dn, &directory_data_len, GNUNET_YES)))
+                                            dn)) ||
+      (GNUNET_OK !=
+       GNUNET_disk_file_size (NULL, dn, &directory_data_len, GNUNET_YES)))
     {
       GNUNET_GTK_add_log_entry (_("Error accessing file `%s'."), dn);
       GNUNET_free (dn);
@@ -112,7 +113,8 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   directory_data = MMAP (NULL, dlen, PROT_READ, MAP_SHARED, fd, 0);
   if (directory_data == MAP_FAILED)
     {
-      GNUNET_GTK_add_log_entry (_("Error mapping file `%s' into memory."), dn);
+      GNUNET_GTK_add_log_entry (_("Error mapping file `%s' into memory."),
+                                dn);
       CLOSE (fd);
       GNUNET_free (dn);
       return;
@@ -124,7 +126,8 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   list = fs_search_started (NULL, uri, 0, 0, NULL, GNUNET_FSUI_COMPLETED);
   GNUNET_ECRS_uri_destroy (uri);
   GNUNET_ECRS_directory_list_contents (NULL,
-                      directory_data, directory_data_len, &md, &spcb, list);
+                                       directory_data, directory_data_len,
+                                       &md, &spcb, list);
   if (md != NULL)
     GNUNET_ECRS_meta_data_destroy (md);
   MUNMAP (directory_data, dlen);
@@ -133,17 +136,22 @@ on_open_menu_activate_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   /* switch view -- select directory */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
+    =
+    GTK_NOTEBOOK (glade_xml_get_widget
+                  (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   gtk_notebook_set_current_page (notebook,
                                  gtk_notebook_page_num (notebook,
                                                         list->searchpage));
 
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"));
+    =
+    GTK_NOTEBOOK (glade_xml_get_widget
+                  (GNUNET_GTK_get_main_glade_XML (), "fsnotebook"));
   gtk_notebook_set_current_page (notebook,
                                  gtk_notebook_page_num (notebook,
                                                         glade_xml_get_widget
-                                                        (GNUNET_GTK_get_main_glade_XML (),
+                                                        (GNUNET_GTK_get_main_glade_XML
+                                                         (),
                                                          "fsdownloadvbox")));
 }
 
diff --git a/src/plugins/fs/download.c b/src/plugins/fs/download.c
index 229fdfe8..e3db84f8 100644
--- a/src/plugins/fs/download.c
+++ b/src/plugins/fs/download.c
@@ -102,7 +102,8 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   if (S_ISDIR (buf.st_mode))
     {
       fn =
-        GNUNET_malloc (strlen (list->filename) + strlen (GNUNET_DIRECTORY_EXT) + 1);
+        GNUNET_malloc (strlen (list->filename) +
+                       strlen (GNUNET_DIRECTORY_EXT) + 1);
       strcpy (fn, list->filename);
       if (fn[strlen (fn) - 1] == '/')
         fn[strlen (fn) - 1] = '\0';
@@ -134,14 +135,17 @@ refreshDirectoryViewFromDisk (DownloadList * list)
   data = MMAP (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
   if ((data == MAP_FAILED) || (data == NULL))
     {
-      GNUNET_GELOG_STRERROR_FILE (ectx, GNUNET_GEERROR | GNUNET_GEADMIN | GNUNET_GEBULK, "mmap", f);
+      GNUNET_GELOG_STRERROR_FILE (ectx,
+                                  GNUNET_GEERROR | GNUNET_GEADMIN |
+                                  GNUNET_GEBULK, "mmap", f);
       CLOSE (fd);
       GNUNET_free_non_null (fn);
       return;
     }
   GNUNET_free_non_null (fn);
   meta = NULL;
-  GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta, &addFilesToDirectory, list);
+  GNUNET_ECRS_directory_list_contents (ectx, data, size, &meta,
+                                       &addFilesToDirectory, list);
   MUNMAP (data, size);
   CLOSE (fd);
   if (meta != NULL)
@@ -242,9 +246,9 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
              solution is to #ifndef it */
 #ifndef MINGW
           GNUNET_GEBREAK (ectx,
-                    gtk_tree_row_reference_get_model (dl_parent->
-                                                      searchViewRowReference)
-                    == model);
+                          gtk_tree_row_reference_get_model (dl_parent->
+                                                            searchViewRowReference)
+                          == model);
 #endif
           path =
             gtk_tree_row_reference_get_path (dl_parent->
@@ -284,8 +288,8 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
               gtk_tree_store_set (sl_parent->tree,
                                   &iter,
                                   SEARCH_CELL_BG_COLOR,
-                                  getColorCode (GNUNET_URITRACK_DOWNLOAD_STARTED),
-                                  -1);
+                                  getColorCode
+                                  (GNUNET_URITRACK_DOWNLOAD_STARTED), -1);
               break;
             }
           valid = gtk_tree_model_iter_next (model, &iter);
@@ -301,7 +305,8 @@ fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
   list->fsui_list = fsui_dl;
   list->total = total;
   list->is_directory = GNUNET_ECRS_meta_data_test_for_directory (fi->meta);
-  list->has_terminated = ((state != GNUNET_FSUI_ACTIVE) && (state != GNUNET_FSUI_PENDING));
+  list->has_terminated = ((state != GNUNET_FSUI_ACTIVE)
+                          && (state != GNUNET_FSUI_PENDING));
   list->next = download_head;
   download_head = list;
   if ((list->is_directory == GNUNET_YES) && (completed != 0))
@@ -342,7 +347,8 @@ fs_download_update (DownloadList * list,
     {
       meta = NULL;
       GNUNET_ECRS_directory_list_contents (ectx,
-                          data, size, &meta, &addFilesToDirectory, list);
+                                           data, size, &meta,
+                                           &addFilesToDirectory, list);
       if (meta != NULL)
         GNUNET_ECRS_meta_data_destroy (meta);
     }
@@ -370,7 +376,8 @@ fs_download_completed (DownloadList * downloadContext)
       gtk_tree_store_set (downloadContext->searchList->tree,
                           &iter,
                           SEARCH_CELL_BG_COLOR,
-                          getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED), -1);
+                          getColorCode (GNUNET_URITRACK_DOWNLOAD_COMPLETED),
+                          -1);
     }
   downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
@@ -398,7 +405,8 @@ fs_download_aborted (DownloadList * downloadContext)
       gtk_tree_store_set (downloadContext->searchList->tree,
                           &iter,
                           SEARCH_CELL_BG_COLOR,
-                          getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED), -1);
+                          getColorCode (GNUNET_URITRACK_DOWNLOAD_ABORTED),
+                          -1);
     }
   downloadContext->has_terminated = GNUNET_YES;
   refreshDirectoryViewFromDisk (downloadContext);
@@ -532,15 +540,15 @@ init_download_helper (void *cls)
   SDC *sdc = cls;
 
   GNUNET_FSUI_download_start (ctx,
-                      sdc->anonymity,
-                      sdc->recursive,
-                      sdc->idc_uri,
-                      sdc->idc_meta,
-                      sdc->idc_final_download_destination,
-                      (sdc->searchContext !=
-                       NULL) ? sdc->searchContext->fsui_list : NULL,
-                      (sdc->parentContext !=
-                       NULL) ? sdc->parentContext->fsui_list : NULL);
+                              sdc->anonymity,
+                              sdc->recursive,
+                              sdc->idc_uri,
+                              sdc->idc_meta,
+                              sdc->idc_final_download_destination,
+                              (sdc->searchContext !=
+                               NULL) ? sdc->searchContext->fsui_list : NULL,
+                              (sdc->parentContext !=
+                               NULL) ? sdc->parentContext->fsui_list : NULL);
   return NULL;
 }
 
@@ -579,7 +587,8 @@ initiateDownload (GtkTreeModel * model,
                       SEARCH_INTERNAL, &sdc.searchContext,
                       SEARCH_INTERNAL_PARENT, &sdc.parentContext, -1);
   if ((sdc.idc_uri == NULL) ||
-      (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri) || GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
+      (!(GNUNET_ECRS_uri_test_chk (sdc.idc_uri)
+         || GNUNET_ECRS_uri_test_loc (sdc.idc_uri))))
     {
       GNUNET_GEBREAK (ectx, 0);
       GNUNET_free_non_null (idc_name);
@@ -612,25 +621,27 @@ initiateDownload (GtkTreeModel * model,
       char *filehash;
 
       GNUNET_GEASSERT (NULL,
-                 strlen (sdc.uri_name) >
-                 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX));
+                       strlen (sdc.uri_name) >
+                       strlen (GNUNET_ECRS_URI_PREFIX) +
+                       strlen (GNUNET_ECRS_FILE_INFIX));
       GNUNET_free_non_null (idc_name);
       filehash =
         GNUNET_strdup (&sdc.
-                uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
-                         strlen (GNUNET_ECRS_FILE_INFIX)]);
+                       uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+                                strlen (GNUNET_ECRS_FILE_INFIX)]);
       filehash[16] = 0;
       idc_name = GNUNET_strdup (filehash);
       GNUNET_free_non_null (filehash);
 #else
       GNUNET_GEASSERT (NULL,
-                 strlen (sdc.uri_name) >
-                 strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX));
+                       strlen (sdc.uri_name) >
+                       strlen (GNUNET_ECRS_URI_PREFIX) +
+                       strlen (GNUNET_ECRS_FILE_INFIX));
       GNUNET_free_non_null (idc_name);
       idc_name =
         GNUNET_strdup (&sdc.
-                uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
-                         strlen (GNUNET_ECRS_FILE_INFIX)]);
+                       uri_name[strlen (GNUNET_ECRS_URI_PREFIX) +
+                                strlen (GNUNET_ECRS_FILE_INFIX)]);
 #endif
     }
 
@@ -655,10 +666,10 @@ initiateDownload (GtkTreeModel * model,
   cname = NULL;
 
   GNUNET_GC_get_configuration_value_filename (cfg,
-                                       "FS",
-                                       "INCOMINGDIR",
-                                       "$HOME/gnunet-downloads/",
-                                       &final_download_dir);
+                                              "FS",
+                                              "INCOMINGDIR",
+                                              "$HOME/gnunet-downloads/",
+                                              &final_download_dir);
   if (strlen (dname) > 0)
     {
       tmp = GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
@@ -705,7 +716,7 @@ initiateDownload (GtkTreeModel * model,
   /* construct completed/directory/real-filename */
   sdc.idc_final_download_destination =
     GNUNET_malloc (strlen (final_download_dir) + 2 + strlen (idc_name) +
-            strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
+                   strlen (GNUNET_DIRECTORY_EXT) + strlen (dirPath));
   strcpy (sdc.idc_final_download_destination, final_download_dir);
   if (sdc.
       idc_final_download_destination[strlen
@@ -725,7 +736,8 @@ initiateDownload (GtkTreeModel * model,
     }
   else
     {
-      GNUNET_GTK_add_log_entry (_("ERROR: already downloading `%s'"), idc_name);
+      GNUNET_GTK_add_log_entry (_("ERROR: already downloading `%s'"),
+                                idc_name);
     }
   GNUNET_free (sdc.uri_name);
   GNUNET_free (dirPath);
@@ -746,7 +758,8 @@ on_downloadButton_clicked_fs (GtkWidget * treeview,
   GtkTreeSelection *selection;
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
-  GNUNET_GTK_tree_selection_selected_foreach (selection, &initiateDownload, NULL);
+  GNUNET_GTK_tree_selection_selected_foreach (selection, &initiateDownload,
+                                              NULL);
 }
 
 
@@ -782,7 +795,7 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
   if (GNUNET_ECRS_uri_test_ksk (sdc.idc_uri))
     {
       GNUNET_GTK_add_log_entry (_
-                   ("Please use the search function for keyword (KSK) URIs!"));
+                                ("Please use the search function for keyword (KSK) URIs!"));
       GNUNET_free (urid);
       GNUNET_ECRS_uri_destroy (sdc.idc_uri);
       return;
@@ -795,12 +808,13 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
       return;
     }
   GNUNET_GC_get_configuration_value_filename (cfg,
-                                       "FS",
-                                       "INCOMINGDIR",
-                                       "$HOME/gnunet-downloads/",
-                                       &final_download_dir);
+                                              "FS",
+                                              "INCOMINGDIR",
+                                              "$HOME/gnunet-downloads/",
+                                              &final_download_dir);
   GNUNET_disk_directory_create (ectx, final_download_dir);
-  dname = &uris[strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)];
+  dname =
+    &uris[strlen (GNUNET_ECRS_URI_PREFIX) + strlen (GNUNET_ECRS_FILE_INFIX)];
   sdc.idc_final_download_destination =
     GNUNET_malloc (strlen (final_download_dir) + strlen (dname) + 2);
   strcpy (sdc.idc_final_download_destination, final_download_dir);
@@ -814,7 +828,9 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
 
   GNUNET_GTK_add_log_entry (_("Downloading `%s'\n"), uris);
   sdc.idc_meta = GNUNET_ECRS_meta_data_create ();
-  sdc.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (), "fsstatusAnonymitySpin");
+  sdc.anonymity =
+    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                        "fsstatusAnonymitySpin");
   sdc.recursive = GNUNET_NO;
   sdc.searchContext = NULL;
   sdc.parentContext = NULL;
@@ -826,7 +842,8 @@ on_statusDownloadURIEntry_editing_done_fs (GtkWidget * entry,
 
 struct FCBC
 {
-  int (*method) (struct GNUNET_FSUI_Context * ctx, struct GNUNET_FSUI_DownloadList * list);
+  int (*method) (struct GNUNET_FSUI_Context * ctx,
+                 struct GNUNET_FSUI_DownloadList * list);
   struct GNUNET_FSUI_DownloadList *argument;
 };
 
@@ -862,7 +879,7 @@ on_clearCompletedDownloadsButton_clicked_fs (void *unused,
                                              GtkWidget * clearButton)
 {
   GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (download_summary),
-                          &clearCompletedDownloadCallback, NULL);
+                                 &clearCompletedDownloadCallback, NULL);
 }
 
 static void
@@ -886,7 +903,9 @@ on_abortDownloadButton_clicked_fs (void *unused, GtkWidget * abortButton)
   GtkTreeSelection *selection;
   GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList");
+  downloadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeDownloadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);
@@ -898,7 +917,9 @@ on_stopDownloadButton_clicked_fs (void *unused, GtkWidget * stopButton)
   GtkTreeSelection *selection;
   GtkWidget *downloadList;
 
-  downloadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList");
+  downloadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeDownloadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (downloadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallDownloadCallback, &GNUNET_FSUI_download_abort);
diff --git a/src/plugins/fs/download.h b/src/plugins/fs/download.h
index 5dd3428f..5baf4c6e 100644
--- a/src/plugins/fs/download.h
+++ b/src/plugins/fs/download.h
@@ -39,7 +39,8 @@ DownloadList *fs_download_started (struct GNUNET_FSUI_DownloadList *fsui_dl,
                                    const GNUNET_ECRS_FileInfo * fi,
                                    const char *filename,
                                    unsigned long long completed,
-                                   GNUNET_CronTime eta, GNUNET_FSUI_State state);
+                                   GNUNET_CronTime eta,
+                                   GNUNET_FSUI_State state);
 
 void fs_download_update (DownloadList * downloadContext,
                          unsigned long long completed,
diff --git a/src/plugins/fs/extensions/musicinsert.c b/src/plugins/fs/extensions/musicinsert.c
index 8b2ceac3..bafeba77 100644
--- a/src/plugins/fs/extensions/musicinsert.c
+++ b/src/plugins/fs/extensions/musicinsert.c
@@ -78,7 +78,8 @@ void
 show_musicinsertdialog ()
 {
   musicinsertXML =
-    glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog", PACKAGNUNET_GENAME);
+    glade_xml_new (MUSICINSERTXMLFILE, "musicinsertdialog",
+                   PACKAGNUNET_GENAME);
   glade_xml_signal_autoconnect (musicinsertXML);
 /* libglade*/
 
@@ -481,7 +482,7 @@ insertfiles ()
     {
       gchar *error_message =
         GNUNET_strdup (_
-                ("No files to insert ! Please add files to the list before validating."));
+                       ("No files to insert ! Please add files to the list before validating."));
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -516,12 +517,14 @@ insertfiles ()
   n = 0;
   while (dirkeywords[n])
     {
-      GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, dirkeywords[n]);
+      GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS,
+                                   dirkeywords[n]);
       n++;
     }
   /* Add a standard keyword to allow finding all available music albums
    * on AFS in one search */
-  GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS, "music album");
+  GNUNET_ECRS_meta_data_inser (dirmetadata, EXTRACTOR_KEYWORDS,
+                               "music album");
 
 
   /* Manage files metadatas */
@@ -545,7 +548,8 @@ insertfiles ()
   useforallflags = gtk_toggle_button_get_active (commentstogglebutton) << 3;
 
   filesmetadatas =
-    g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *), 20);
+    g_array_sized_new (FALSE, FALSE, sizeof (struct GNUNET_ECRS_MetaData *),
+                       20);
   files = g_array_sized_new (FALSE, FALSE, sizeof (gchar *), 20);
   i = 0;
   do
@@ -567,21 +571,29 @@ insertfiles ()
 
 
       if (tempmetas[1])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, tempmetas[1]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
+                                     tempmetas[1]);
       if ((useforallflags & 0x1) && dirmetas[0])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, dirmetas[0]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
+                                     dirmetas[0]);
       else if (!(useforallflags & 0x1) && tempmetas[2])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_TITLE, tempmetas[2]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_TITLE,
+                                     tempmetas[2]);
       if ((useforallflags & 0x2) && dirmetas[1])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ARTIST, dirmetas[1]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ARTIST,
+                                     dirmetas[1]);
       else if (!(useforallflags & 0x2) && tempmetas[3])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME, tempmetas[3]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FILENAME,
+                                     tempmetas[3]);
       if (tempmetas[4])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ALBUM, tempmetas[4]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_ALBUM,
+                                     tempmetas[4]);
       if (tempmetas[5])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_MIMETYPE, tempmetas[5]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_MIMETYPE,
+                                     tempmetas[5]);
       if (tempmetas[6])
-        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FORMAT, tempmetas[6]);
+        GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_FORMAT,
+                                     tempmetas[6]);
 
       if (!(useforallflags & 0x1))
         {
@@ -589,7 +601,7 @@ insertfiles ()
           while (dirkeywords[n])
             {
               GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS,
-                                  dirkeywords[n]);
+                                           dirkeywords[n]);
               n++;
             }
         }
@@ -600,13 +612,15 @@ insertfiles ()
           while (tempkeywords[n])
             {
               GNUNET_ECRS_meta_data_inser (tempmetadata,
-                                  EXTRACTOR_KEYWORDS, tempkeywords[n]);
+                                           EXTRACTOR_KEYWORDS,
+                                           tempkeywords[n]);
               n++;
             }
           g_strfreev (tempkeywords);
           /* Add a standard keyword to allow finding all available music files
            * on AFS in one search */
-          GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS, "music");
+          GNUNET_ECRS_meta_data_inser (tempmetadata, EXTRACTOR_KEYWORDS,
+                                       "music");
         }
 
       GNUNET_free (tempmetas);
@@ -748,7 +762,8 @@ on_diraddbutton_clicked (GtkButton * button, gpointer user_data)
     }
   else
     {
-      gchar *error_message = GNUNET_strdup (_("Could not open the directory :\n"));
+      gchar *error_message =
+        GNUNET_strdup (_("Could not open the directory :\n"));
       GtkWidget *message_dialog =
         gtk_message_dialog_new (GTK_WINDOW (musicinsertdialog),
                                 GTK_DIALOG_DESTROY_WITH_PARENT,
diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 6026ad7d..015f26c5 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -212,7 +212,7 @@ saveEventProcessor (void *cls)
     case GNUNET_FSUI_upload_progress:
       fs_upload_update (event->data.UploadProgress.uc.cctx,
                         event->data.UploadProgress.completed,
-                        event->data.UploadProgress.total);
+                        event->data.UploadProgress.total);
       break;
     case GNUNET_FSUI_upload_completed:
       fs_upload_complete (event->data.UploadCompleted.uc.cctx,
@@ -251,8 +251,8 @@ saveEventProcessor (void *cls)
     default:
       GNUNET_GEBREAK (ectx, 0);
       GNUNET_GELOG (ectx,
-              GNUNET_GEERROR,
-              _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
+                    GNUNET_GEERROR,
+                    _("Unhandled (unknown) FSUI event: %u.\n"), event->type);
       break;
     }
   return ret;
@@ -277,12 +277,17 @@ on_upload_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList")));
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelUploadButton");
+                                  (GNUNET_GTK_get_main_glade_XML (),
+                                   "activeUploadsList")));
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "cancelUploadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopUploadButton");
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "stopUploadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -301,12 +306,17 @@ on_download_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList")));
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "abortDownloadButton");
+                                  (GNUNET_GTK_get_main_glade_XML (),
+                                   "activeDownloadsList")));
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "abortDownloadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopDownloadButton");
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "stopDownloadButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -325,12 +335,17 @@ on_search_summary_selection_changed (gpointer signal, gpointer cls)
   selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW
                                  (glade_xml_get_widget
-                                  (GNUNET_GTK_get_main_glade_XML (), "activeSearchesSummary")));
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "cancelSearchButton");
+                                  (GNUNET_GTK_get_main_glade_XML (),
+                                   "activeSearchesSummary")));
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "cancelSearchButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
-  button = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "stopSearchButton");
+  button =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "stopSearchButton");
   gtk_widget_set_sensitive (button,
                             gtk_tree_selection_count_selected_rows (selection)
                             > 0);
@@ -423,16 +438,20 @@ fs_summary_start ()
 
   /* keyword list setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                                 "fssearchKeywordComboBoxEntry"));
+    =
+    GTK_COMBO_BOX_ENTRY (glade_xml_get_widget
+                         (GNUNET_GTK_get_main_glade_XML (),
+                          "fssearchKeywordComboBoxEntry"));
   model = gtk_list_store_new (1, G_TYPE_STRING /* search string */ );
   gtk_combo_box_set_model (GTK_COMBO_BOX (searchCB), GTK_TREE_MODEL (model));
   gtk_combo_box_entry_set_text_column (searchCB, 0);
 
   /* search namespace selection setup */
   searchCB
-    = GTK_COMBO_BOX_ENTRY (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                                 "searchNamespaceComboBoxEntry"));
+    =
+    GTK_COMBO_BOX_ENTRY (glade_xml_get_widget
+                         (GNUNET_GTK_get_main_glade_XML (),
+                          "searchNamespaceComboBoxEntry"));
 
   model = gtk_list_store_new (NS_SEARCH_NUM, G_TYPE_STRING,     /* what we show */
                               G_TYPE_STRING,    /* GNUNET_EncName of namespace */
@@ -442,8 +461,10 @@ fs_summary_start ()
   gtk_combo_box_entry_set_text_column (searchCB, NS_SEARCH_DESCRIPTION);
 
   /* search summary setup */
-  searchList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                                    "activeSearchesSummary"));
+  searchList =
+    GTK_TREE_VIEW (glade_xml_get_widget
+                   (GNUNET_GTK_get_main_glade_XML (),
+                    "activeSearchesSummary"));
   search_summary = gtk_list_store_new (SEARCH_SUMMARY_NUM, G_TYPE_STRING,       /* name */
                                        G_TYPE_INT,      /* # results */
                                        G_TYPE_POINTER); /* internal: search list */
@@ -486,8 +507,9 @@ fs_summary_start ()
   gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* download summary setup */
-  downloadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                                      "activeDownloadsList"));
+  downloadList =
+    GTK_TREE_VIEW (glade_xml_get_widget
+                   (GNUNET_GTK_get_main_glade_XML (), "activeDownloadsList"));
   download_summary = gtk_tree_store_new (DOWNLOAD_NUM, G_TYPE_STRING,   /* name (full-path file name) */
                                          G_TYPE_STRING, /* name (user-friendly name) */
                                          G_TYPE_UINT64, /* size */
@@ -553,10 +575,10 @@ fs_summary_start ()
   gtk_tree_view_column_set_resizable (column, TRUE);
 
   /* upload summary setup */
-  uploadList = GTK_TREE_VIEW (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                                                    "activeUploadsList"));
-  g_signal_connect_swapped (uploadList,
-                            "button-press-event",
+  uploadList =
+    GTK_TREE_VIEW (glade_xml_get_widget
+                   (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList"));
+  g_signal_connect_swapped (uploadList, "button-press-event",
                             G_CALLBACK (upload_click_handler), uploadList);
   upload_summary = gtk_tree_store_new (UPLOAD_NUM, G_TYPE_STRING,       /* filename */
                                        G_TYPE_INT,      /* progress */
@@ -594,7 +616,9 @@ fs_summary_start ()
                                       TRUE);
   /* upload entry setup */
   uploadEntry
-    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "uploadFilenameComboBoxEntry");
+    =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "uploadFilenameComboBoxEntry");
 
   model = gtk_list_store_new (1, G_TYPE_STRING);
   gtk_combo_box_set_model (GTK_COMBO_BOX (uploadEntry),
@@ -644,15 +668,16 @@ init_fs (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
   GNUNET_CO_init (ectx, cfg);
   tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsnotebook");
   gtk_widget_show (tab);
-  book = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook");
+  book =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "mainnotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (book));
   gtk_notebook_set_current_page (GTK_NOTEBOOK (book), 1);
   gtk_notebook_set_current_page (GTK_NOTEBOOK (book), num);
   fs_summary_start ();
   fs_collection_start ();
   fs_namespace_start ();
-  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8, /* FIXME: allow user to configure download parallelism */
-                    GNUNET_YES, &eventProcessor, NULL);
+  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 8,  /* FIXME: allow user to configure download parallelism */
+                           GNUNET_YES, &eventProcessor, NULL);
 }
 
 static void *
@@ -692,13 +717,15 @@ getColorCode (enum GNUNET_URITRACK_STATE state)
     return "cyan";
   if ((state & GNUNET_URITRACK_DOWNLOAD_STARTED) &&
       (0 == (state &
-             (GNUNET_URITRACK_DOWNLOAD_COMPLETED | GNUNET_URITRACK_DOWNLOAD_ABORTED))))
+             (GNUNET_URITRACK_DOWNLOAD_COMPLETED |
+              GNUNET_URITRACK_DOWNLOAD_ABORTED))))
     return "yellow";
   if (state & GNUNET_URITRACK_DOWNLOAD_COMPLETED)
     return "springgreen";
   if (state & GNUNET_URITRACK_DOWNLOAD_ABORTED)
     return "red";
-  if (state & (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
+  if (state &
+      (GNUNET_URITRACK_SEARCH_RESULT | GNUNET_URITRACK_DIRECTORY_FOUND))
     return "gray";
   return "white";
 }
diff --git a/src/plugins/fs/helper.c b/src/plugins/fs/helper.c
index 5b3e801a..cb0298ce 100644
--- a/src/plugins/fs/helper.c
+++ b/src/plugins/fs/helper.c
@@ -92,7 +92,7 @@ parseTime (const char *t, GNUNET_Int32Time * param)
       else if (0 == strncasecmp (&t[start], "h", strlen ("h")))
         ret += GNUNET_CRON_HOURS * val;
       else
-        return GNUNET_SYSERR;          /* parse error */
+        return GNUNET_SYSERR;   /* parse error */
       while (t[pos] == ' ')
         pos++;
     }
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 4308dc41..ba7a31e1 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -139,7 +139,8 @@ publishKeyword (const char *data, void *cls)
 
 void
 createKeywordListTreeView (GladeXML * xml,
-                           const char *name, const struct GNUNET_ECRS_URI *init)
+                           const char *name,
+                           const struct GNUNET_ECRS_URI *init)
 {
   GtkTreeView *keywordList;
   GtkListStore *keymodel;
@@ -322,7 +323,8 @@ getMetaDataFromList (GladeXML * xml,
 
   preview = glade_xml_get_widget (xml, previewName);
 
-  if (GTK_IMAGNUNET_GEPIXBUF == gtk_image_get_storage_type (GTK_IMAGE (preview)))
+  if (GTK_IMAGNUNET_GEPIXBUF ==
+      gtk_image_get_storage_type (GTK_IMAGE (preview)))
     {
       pixbuf = gtk_image_get_pixbuf (GTK_IMAGE (preview));
       if (pixbuf == NULL)
@@ -357,7 +359,8 @@ getMetaDataFromList (GladeXML * xml,
               binary = EXTRACTOR_binaryEncode ((const unsigned char *) thumb,
                                                length);
               free (thumb);
-              GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_THUMBNAIL_DATA, binary);
+              GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_THUMBNAIL_DATA,
+                                           binary);
               GNUNET_free (binary);
             }
         }
@@ -413,7 +416,8 @@ updateIntervalToString (GNUNET_Int32Time interval)
     return strdup (_("--sporadic update--"));
   if (interval == GNUNET_ECRS_SBLOCK_UPDATE_NONE)
     return strdup (_("--no update--"));
-  return GNUNET_get_time_interval_as_fancy_string (interval * GNUNET_CRON_SECONDS);
+  return GNUNET_get_time_interval_as_fancy_string (interval *
+                                                   GNUNET_CRON_SECONDS);
 }
 
 int
@@ -432,7 +436,8 @@ parseTimeInterval (const char *timeSpec, GNUNET_Int32Time * interval)
 
 int
 tryParseTimeInterval (GladeXML * xml,
-                      const char *intervalComboBoxEntry, GNUNET_Int32Time * interval)
+                      const char *intervalComboBoxEntry,
+                      GNUNET_Int32Time * interval)
 {
   return parseTimeInterval (getEntryLineValue (xml,
                                                intervalComboBoxEntry),
@@ -467,14 +472,14 @@ getFileNameFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
   char *name;
 
   name = GNUNET_ECRS_meta_data_get_first_by_types (meta,
-                                    EXTRACTOR_FILENAME,
-                                    EXTRACTOR_TITLE,
-                                    EXTRACTOR_ARTIST,
-                                    EXTRACTOR_AUTHOR,
-                                    EXTRACTOR_PUBLISHER,
-                                    EXTRACTOR_CREATOR,
-                                    EXTRACTOR_PRODUCER,
-                                    EXTRACTOR_UNKNOWN, -1);
+                                                   EXTRACTOR_FILENAME,
+                                                   EXTRACTOR_TITLE,
+                                                   EXTRACTOR_ARTIST,
+                                                   EXTRACTOR_AUTHOR,
+                                                   EXTRACTOR_PUBLISHER,
+                                                   EXTRACTOR_CREATOR,
+                                                   EXTRACTOR_PRODUCER,
+                                                   EXTRACTOR_UNKNOWN, -1);
   if (name == NULL)
     {
       name = GNUNET_strdup (_("no name given"));
@@ -495,13 +500,14 @@ getDescriptionFromMetaData (const struct GNUNET_ECRS_MetaData *meta)
   char *desc;
 
   desc = GNUNET_ECRS_meta_data_get_first_by_types (meta,
-                                    EXTRACTOR_DESCRIPTION,
-                                    EXTRACTOR_GENRE,
-                                    EXTRACTOR_ALBUM,
-                                    EXTRACTOR_COMMENT,
-                                    EXTRACTOR_SUBJECT,
-                                    EXTRACTOR_FORMAT,
-                                    EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
+                                                   EXTRACTOR_DESCRIPTION,
+                                                   EXTRACTOR_GENRE,
+                                                   EXTRACTOR_ALBUM,
+                                                   EXTRACTOR_COMMENT,
+                                                   EXTRACTOR_SUBJECT,
+                                                   EXTRACTOR_FORMAT,
+                                                   EXTRACTOR_SIZE,
+                                                   EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
     desc = GNUNET_strdup ("");
   return GNUNET_GTK_validate_utf8 (desc);
diff --git a/src/plugins/fs/meta.h b/src/plugins/fs/meta.h
index d7475150..7bbfaee0 100644
--- a/src/plugins/fs/meta.h
+++ b/src/plugins/fs/meta.h
@@ -53,10 +53,11 @@ void handleMetaDataListUpdate (GladeXML * xml,
 void handleListRemove (GladeXML * xml, const char *listName);
 
 struct GNUNET_ECRS_MetaData *getMetaDataFromList (GladeXML * xml,
-                                           const char *name,
-                                           const char *preview);
+                                                  const char *name,
+                                                  const char *preview);
 
-struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml, const char *name);
+struct GNUNET_ECRS_URI *getKeywordURIFromList (GladeXML * xml,
+                                               const char *name);
 
 char *updateIntervalToString (GNUNET_Int32Time interval);
 
diff --git a/src/plugins/fs/namespace.c b/src/plugins/fs/namespace.c
index a61e9d2d..dd424ee3 100644
--- a/src/plugins/fs/namespace.c
+++ b/src/plugins/fs/namespace.c
@@ -320,14 +320,14 @@ addNamespaceContentToModel (void *cls,
 
   DEBUG_BEGIN ();
   filename = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
-                                        EXTRACTOR_FILENAME,
-                                        EXTRACTOR_TITLE,
-                                        EXTRACTOR_ARTIST,
-                                        EXTRACTOR_AUTHOR,
-                                        EXTRACTOR_PUBLISHER,
-                                        EXTRACTOR_CREATOR,
-                                        EXTRACTOR_PRODUCER,
-                                        EXTRACTOR_UNKNOWN, -1);
+                                                       EXTRACTOR_FILENAME,
+                                                       EXTRACTOR_TITLE,
+                                                       EXTRACTOR_ARTIST,
+                                                       EXTRACTOR_AUTHOR,
+                                                       EXTRACTOR_PUBLISHER,
+                                                       EXTRACTOR_CREATOR,
+                                                       EXTRACTOR_PRODUCER,
+                                                       EXTRACTOR_UNKNOWN, -1);
   if (filename == NULL)
     filename = GNUNET_strdup (_("no name given"));
   else
@@ -338,13 +338,14 @@ addNamespaceContentToModel (void *cls,
         dotdot[0] = dotdot[1] = '_';
     }
   desc = GNUNET_ECRS_meta_data_get_first_by_types (fi->meta,
-                                    EXTRACTOR_DESCRIPTION,
-                                    EXTRACTOR_GENRE,
-                                    EXTRACTOR_ALBUM,
-                                    EXTRACTOR_COMMENT,
-                                    EXTRACTOR_SUBJECT,
-                                    EXTRACTOR_FORMAT,
-                                    EXTRACTOR_SIZE, EXTRACTOR_KEYWORDS, -1);
+                                                   EXTRACTOR_DESCRIPTION,
+                                                   EXTRACTOR_GENRE,
+                                                   EXTRACTOR_ALBUM,
+                                                   EXTRACTOR_COMMENT,
+                                                   EXTRACTOR_SUBJECT,
+                                                   EXTRACTOR_FORMAT,
+                                                   EXTRACTOR_SIZE,
+                                                   EXTRACTOR_KEYWORDS, -1);
   if (desc == NULL)
     desc = GNUNET_strdup ("");
   mime = GNUNET_ECRS_meta_data_get_by_type (fi->meta, EXTRACTOR_MIMETYPE);
@@ -384,7 +385,8 @@ addNamespaceContentToModel (void *cls,
                       IN_NAMESPACE_PUB_FREQ_STRING, freq,
                       IN_NAMESPACE_PUB_DATE_STRING, date,
                       IN_NAMESPACE_URI, GNUNET_ECRS_uri_duplicate (fi->uri),
-                      IN_NAMESPACE_META, GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
+                      IN_NAMESPACE_META,
+                      GNUNET_ECRS_meta_data_duplicate (fi->meta), -1);
   GNUNET_free (size_h);
   GNUNET_free (filename);
   GNUNET_free (uriString);
@@ -409,7 +411,9 @@ addTabForNamespace (void *unused,
   GtkWidget *notebook;
   GtkWidget *del_menu;
 
-  if (GNUNET_OK != GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName, namespaceId))
+  if (GNUNET_OK !=
+      GNUNET_ECRS_namespace_test_exists (NULL, cfg, namespaceName,
+                                         namespaceId))
     return GNUNET_OK;
   DEBUG_BEGIN ();
   label = gtk_label_new (namespaceName);
@@ -422,16 +426,20 @@ addTabForNamespace (void *unused,
   head = list;
   /* update sensitivity of add button */
   on_namespaceContentSelectionChanged (NULL, NULL);
-  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
-  gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
-                            list->namespacepage, label);
+  notebook =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "localNamespacesNotebook");
+  gtk_notebook_append_page (GTK_NOTEBOOK (notebook), list->namespacepage,
+                            label);
   gtk_widget_show (notebook);
   GNUNET_NS_namespace_list_contents
     (ectx, cfg, namespaceName, &addNamespaceContentToModel, list->model);
   DEBUG_END ();
   /* enable "delete" menu entry */
 
-  del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceDelete");
+  del_menu =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, TRUE);
   return GNUNET_OK;
 }
@@ -489,7 +497,9 @@ frame_destroy (GtkWidget * tree)
       while (gtk_tree_model_iter_next (pos->model, &iter));
     }
   GNUNET_free (pos);
-  del_menu = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceDelete");
+  del_menu =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "namespaceDelete");
   gtk_widget_set_sensitive (del_menu, head != NULL);
 }
 
@@ -507,7 +517,9 @@ namespaceDelete_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   gint ret;
 
   DEBUG_BEGIN ();
-  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
+  notebook =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
   if (num == -1)
     {
@@ -589,12 +601,13 @@ addToNamespaceCB (GtkTreeModel * model,
       GNUNET_GEBREAK (ectx, 0);
       return;
     }
-  resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000,  /* FIXME: priority */
-                                 GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
-                                 cls->namespaceName,
-                                 cls->updateInterval,
-                                 cls->lastId,
-                                 &cls->thisId, cls->nextId, dst, meta);
+  resultURI = GNUNET_NS_add_to_namespace (ectx, cfg, cls->anonymityLevel, 1000, /* FIXME: priority */
+                                          GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
+                                          cls->namespaceName,
+                                          cls->updateInterval,
+                                          cls->lastId,
+                                          &cls->thisId, cls->nextId, dst,
+                                          meta);
   if (resultURI != NULL)
     {
       list = head;
@@ -614,15 +627,17 @@ addToNamespaceCB (GtkTreeModel * model,
                                       &cls->thisId,
                                       cls->nextId,
                                       cls->updateInterval,
-                                      cls->updateInterval + GNUNET_get_time_int32 (NULL));
+                                      cls->updateInterval +
+                                      GNUNET_get_time_int32 (NULL));
         }
       GNUNET_ECRS_uri_destroy (resultURI);
     }
   else
     {
       GNUNET_GTK_show_info_message (GNUNET_YES,
-                   _("Failed to insert content into namespace "
-                     "(consult logs).\n"));
+                                    _
+                                    ("Failed to insert content into namespace "
+                                     "(consult logs).\n"));
     }
   DEBUG_END ();
 }
@@ -658,7 +673,9 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   IUC cls;
   gint num;
 
-  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
+  notebook =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
   GNUNET_GEASSERT (ectx, num != -1);
   page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
@@ -687,8 +704,8 @@ on_namespaceInsertButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
     {
       if (GNUNET_OK != tryParseTimeInterval (metaXML,
-                                      "updateIntervalComboBoxEntry",
-                                      &cls.updateInterval))
+                                             "updateIntervalComboBoxEntry",
+                                             &cls.updateInterval))
         {
           /* this should be impossible - GNUNET_OK button is
              deactivated while parse errors are there */
@@ -764,7 +781,9 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
 
   DEBUG_BEGIN ();
   /* find out which namespace this is about */
-  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "localNamespacesNotebook");
+  notebook =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "localNamespacesNotebook");
   num = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
   GNUNET_GEASSERT (ectx, num != -1);
   page = gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook), num);
@@ -817,10 +836,12 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   nextEntryLine = glade_xml_get_widget (metaXML, "nextIdentifierEntry");
   if ((cls.updateInterval != GNUNET_ECRS_SBLOCK_UPDATE_SPORADIC) &&
       (GNUNET_OK == GNUNET_NS_compute_next_identifier (NULL,
-                               cfg,
-                               cls.namespaceName,
-                               &lastId,
-                               &cls.thisId, cls.updateInterval, &nextId)))
+                                                       cfg,
+                                                       cls.namespaceName,
+                                                       &lastId,
+                                                       &cls.thisId,
+                                                       cls.updateInterval,
+                                                       &nextId)))
     {
       GNUNET_hash_to_enc (&nextId, &nextnext);
       gtk_entry_set_text (GTK_ENTRY (nextEntryLine), (char *) &nextnext);
@@ -848,8 +869,8 @@ on_namespaceUpdateButton_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
   cls.nextId = &nextId;
 
   if (GNUNET_OK != tryParseTimeInterval (metaXML,
-                                  "namespaceUpdateIntervalComboBoxEntry",
-                                  &cls.updateInterval))
+                                         "namespaceUpdateIntervalComboBoxEntry",
+                                         &cls.updateInterval))
     {
       /* This should be impossible since the
          the GNUNET_OK button is deactivated while parse errors are present */
@@ -892,13 +913,17 @@ fs_namespace_start ()
 
   DEBUG_BEGIN ();
   trackCheckButton
-    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "trackingCheckButton");
+    =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "trackingCheckButton");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (trackCheckButton),
                                 GNUNET_URITRACK_get_tracking_status (ectx,
-                                                      cfg) ==
+                                                                     cfg) ==
                                 GNUNET_YES ? TRUE : FALSE);
 
-  contentList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "availableContentList");
+  contentList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "availableContentList");
 
   model = gtk_list_store_new (NAMESPACE_NUM, G_TYPE_STRING,     /* name */
                               G_TYPE_UINT64,    /* size */
@@ -963,7 +988,8 @@ fs_namespace_start ()
                                       TRUE);
   GNUNET_URITRACK_register_track_callback (ectx, cfg, &updateViewSave, NULL);
   GNUNET_NS_namespace_list_all (ectx, cfg, &addTabForNamespace, NULL);
-  GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb, NULL);
+  GNUNET_NS_register_discovery_callback (ectx, cfg, &namespace_discovered_cb,
+                                         NULL);
   DEBUG_END ();
 }
 
diff --git a/src/plugins/fs/namespace_create.c b/src/plugins/fs/namespace_create.c
index f4713694..c443b7bf 100644
--- a/src/plugins/fs/namespace_create.c
+++ b/src/plugins/fs/namespace_create.c
@@ -218,8 +218,9 @@ create_namespace_clicked_fs (GtkWidget * dummy1, GtkWidget * dummy2)
       nameLine = glade_xml_get_widget (metaXML, "namespaceNameEntry");
       namespaceName = gtk_entry_get_text (GTK_ENTRY (nameLine));
       root = GNUNET_NS_namespace_create (ectx, cfg, gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), 1000,    /* FIXME: priority */
-                                 GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,   /* FIXME: expiration */
-                                 namespaceName, meta, keywordURI, &rootEntry);
+                                         GNUNET_get_time () + 2 * GNUNET_CRON_YEARS,    /* FIXME: expiration */
+                                         namespaceName, meta, keywordURI,
+                                         &rootEntry);
       if (root != NULL)
         {
           GNUNET_ECRS_uri_get_namespace_from_sks (root, &namespaceId);
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index f54159c2..a764f707 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -53,8 +53,12 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
   int newrating;
 
   DEBUG_BEGIN ();
-  spin = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceRatingSpinButton");
-  ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "searchNamespaceComboBoxEntry");
+  spin =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "namespaceRatingSpinButton");
+  ncbe =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "searchNamespaceComboBoxEntry");
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   description = NULL;
   encStr = NULL;
@@ -76,7 +80,8 @@ on_namespaceRatingSpinButton_changed_fs (GtkWidget * dummy,
             {
               newrating = gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin));
               rating = GNUNET_NS_namespace_rank (ectx,
-                                         cfg, encStr, newrating - rating);
+                                                 cfg, encStr,
+                                                 newrating - rating);
               if (rating != newrating)
                 {
                   /* concurrent modification? */
@@ -125,8 +130,12 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
   GNUNET_EncName enc;
 
   DEBUG_BEGIN ();
-  spin = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "namespaceRatingSpinButton");
-  ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "searchNamespaceComboBoxEntry");
+  spin =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "namespaceRatingSpinButton");
+  ncbe =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "searchNamespaceComboBoxEntry");
   model = gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe));
   descStr = NULL;
   encStr = NULL;
@@ -150,7 +159,8 @@ on_searchNamespaceComboBoxEntry_changed_fs (GtkWidget * dummy,
           keyword
             = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
                                     "fssearchKeywordComboBoxEntry");
-          if (GNUNET_OK == GNUNET_NS_namespace_get_root (ectx, cfg, encStr, &root))
+          if (GNUNET_OK ==
+              GNUNET_NS_namespace_get_root (ectx, cfg, encStr, &root))
             {
               GNUNET_hash_to_enc (&root, &enc);
               gtk_entry_set_text (GTK_ENTRY
@@ -202,7 +212,9 @@ saveDiscovery (void *cls)
   char *encName;
 
   DEBUG_BEGIN ();
-  ncbe = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "searchNamespaceComboBoxEntry");
+  ncbe =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "searchNamespaceComboBoxEntry");
   model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (ncbe)));
   GNUNET_hash_to_enc (nni->namespaceId, &enc);
   if (nni->md == NULL)
@@ -214,17 +226,17 @@ saveDiscovery (void *cls)
     {
       dmd = GNUNET_ECRS_meta_data_duplicate (nni->md);
       desc = GNUNET_ECRS_meta_data_get_first_by_types (dmd,
-                                        EXTRACTOR_DESCRIPTION,
-                                        EXTRACTOR_TITLE,
-                                        EXTRACTOR_AUTHOR,
-                                        EXTRACTOR_GENRE,
-                                        EXTRACTOR_SUBJECT,
-                                        EXTRACTOR_CREATOR,
-                                        EXTRACTOR_PRODUCER,
-                                        EXTRACTOR_GROUP,
-                                        EXTRACTOR_CREATED_FOR,
-                                        EXTRACTOR_SUMMARY,
-                                        EXTRACTOR_OWNER, -1);
+                                                       EXTRACTOR_DESCRIPTION,
+                                                       EXTRACTOR_TITLE,
+                                                       EXTRACTOR_AUTHOR,
+                                                       EXTRACTOR_GENRE,
+                                                       EXTRACTOR_SUBJECT,
+                                                       EXTRACTOR_CREATOR,
+                                                       EXTRACTOR_PRODUCER,
+                                                       EXTRACTOR_GROUP,
+                                                       EXTRACTOR_CREATED_FOR,
+                                                       EXTRACTOR_SUMMARY,
+                                                       EXTRACTOR_OWNER, -1);
       if (desc == NULL)
         desc = GNUNET_strdup ("");
     }
@@ -250,7 +262,9 @@ saveDiscovery (void *cls)
     }
   if (found == GNUNET_NO)
     {
-      GNUNET_GTK_show_info_message (GNUNET_YES, _("Namespace found: %s - %.*s\n"), desc, 20, &enc);
+      GNUNET_GTK_show_info_message (GNUNET_YES,
+                                    _("Namespace found: %s - %.*s\n"), desc,
+                                    20, &enc);
       gtk_list_store_append (model, &iter);
       gtk_list_store_set (model,
                           &iter,
diff --git a/src/plugins/fs/namespace_search.h b/src/plugins/fs/namespace_search.h
index 4a1beff5..8a628297 100644
--- a/src/plugins/fs/namespace_search.h
+++ b/src/plugins/fs/namespace_search.h
@@ -39,7 +39,8 @@
 int namespace_discovered_cb (void *cls,
                              const char *namespaceName,
                              const GNUNET_HashCode * namespaceId,
-                             const struct GNUNET_ECRS_MetaData *md, int rating);
+                             const struct GNUNET_ECRS_MetaData *md,
+                             int rating);
 
 
 
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 3addb5dd..055f126d 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -119,7 +119,10 @@ addEntryToSearchTree (SearchList * searchContext,
   desc = getDescriptionFromMetaData (info->meta);
   name = getFileNameFromMetaData (info->meta);
   size = GNUNET_ECRS_uri_test_chk (info->uri)
-    || GNUNET_ECRS_uri_test_loc (info->uri) ? GNUNET_ECRS_uri_get_file_siz (info->uri) : 0;
+    || GNUNET_ECRS_uri_test_loc (info->
+                                 uri) ? GNUNET_ECRS_uri_get_file_siz (info->
+                                                                      uri) :
+    0;
   pixbuf = getThumbnailFromMetaData (info->meta);
   size_h = GNUNET_get_byte_size_as_fancy_string (size);
   gtk_tree_store_set (searchContext->tree,
@@ -131,13 +134,14 @@ addEntryToSearchTree (SearchList * searchContext,
                       SEARCH_DESC, desc,
                       SEARCH_PIXBUF, pixbuf,
                       SEARCH_URI, GNUNET_ECRS_uri_duplicate (info->uri),
-                      SEARCH_META, GNUNET_ECRS_meta_data_duplicate (info->meta),
+                      SEARCH_META,
+                      GNUNET_ECRS_meta_data_duplicate (info->meta),
                       SEARCH_CELL_BG_COLOR, getColorCode (state),
-                      SEARCH_CELL_FG_COLOR, "black",
-                      SEARCH_INTERNAL, searchContext,
-                      SEARCH_INTERNAL_PARENT, downloadParent, -1);
+                      SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
+                      searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
+                      -1);
   if (pixbuf != NULL)
-    g_object_unref(pixbuf);
+    g_object_unref (pixbuf);
   GNUNET_free (size_h);
   GNUNET_free (name);
   GNUNET_free (desc);
@@ -165,8 +169,9 @@ fs_search_result_received (SearchList * searchContext,
   if ((state & (GNUNET_URITRACK_INSERTED |
                 GNUNET_URITRACK_INDEXED)) &&
       (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (cfg,
-                                                "GNUNET-GTK",
-                                                "DISABLE-OWN", GNUNET_YES)))
+                                                              "GNUNET-GTK",
+                                                              "DISABLE-OWN",
+                                                              GNUNET_YES)))
     return;
   model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
   gtk_tree_store_append (model, &iter, NULL);
@@ -289,10 +294,12 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
   while (gtk_tree_model_iter_next (model, &iter));
   meta = GNUNET_ECRS_meta_data_create ();
   GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_KEYWORDS, list->searchString);
-  GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_DESCRIPTION, _("Saved search results"));
+  GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_DESCRIPTION,
+                               _("Saved search results"));
   GNUNET_ECRS_meta_data_inser (meta, EXTRACTOR_SOFTWARE, "gnunet-gtk");
   if (GNUNET_OK != GNUNET_ECRS_directory_create (NULL,
-                                  &directory, &dir_len, fis_size, fis, meta))
+                                                 &directory, &dir_len,
+                                                 fis_size, fis, meta))
     {
       GNUNET_GTK_add_log_entry (_("Internal error."));
       GNUNET_GEBREAK (NULL, 0);
@@ -303,7 +310,8 @@ on_save_search_activate (void *cls, GtkWidget * searchEntry)
     }
   GNUNET_ECRS_meta_data_destroy (meta);
   GNUNET_array_grow (fis, fis_size, 0);
-  if (GNUNET_OK != GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
+  if (GNUNET_OK !=
+      GNUNET_disk_file_write (NULL, name, directory, dir_len, "644"))
     {
       GNUNET_GTK_add_log_entry (_("Error writing file `%s'."), name);
     }
@@ -361,7 +369,8 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                    const struct GNUNET_ECRS_URI * uri,
                    unsigned int anonymityLevel,
                    unsigned int resultCount,
-                   const GNUNET_ECRS_FileInfo * results, GNUNET_FSUI_State state)
+                   const GNUNET_ECRS_FileInfo * results,
+                   GNUNET_FSUI_State state)
 {
   SearchList *list;
   gint pages;
@@ -381,12 +390,16 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
       GNUNET_GEBREAK (ectx, 0);
       return NULL;
     }
-  GNUNET_GEASSERT (ectx, strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
+  GNUNET_GEASSERT (ectx,
+                   strlen (description) >= strlen (GNUNET_ECRS_URI_PREFIX));
   dhead = &description[strlen (GNUNET_ECRS_URI_PREFIX)];
-  if (0 == strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX, strlen (GNUNET_ECRS_SEARCH_INFIX)))
+  if (0 ==
+      strncmp (dhead, GNUNET_ECRS_SEARCH_INFIX,
+               strlen (GNUNET_ECRS_SEARCH_INFIX)))
     dhead = &dhead[strlen (GNUNET_ECRS_SEARCH_INFIX)];
   else if (0 == strncmp (dhead,
-                         GNUNET_ECRS_SUBSPACE_INFIX, strlen (GNUNET_ECRS_SUBSPACE_INFIX)))
+                         GNUNET_ECRS_SUBSPACE_INFIX,
+                         strlen (GNUNET_ECRS_SUBSPACE_INFIX)))
     dhead = &dhead[strlen (GNUNET_ECRS_SUBSPACE_INFIX)];
   list = GNUNET_malloc (sizeof (SearchList));
   memset (list, 0, sizeof (SearchList));
@@ -396,7 +409,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   list->next = search_head;
   search_head = list;
   list->searchXML
-    = glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame", PACKAGNUNET_GENAME);
+    =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "searchResultsFrame",
+                   PACKAGNUNET_GENAME);
   GNUNET_GTK_connect_glade_with_plugins (list->searchXML);
   list->searchpage
     = extractMainWidgetFromWindow (list->searchXML, "searchResultsFrame");
@@ -478,8 +493,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
 
   if (GNUNET_YES != GNUNET_GC_get_configuration_value_yesno (cfg,
-                                               "GNUNET-GTK",
-                                               "DISABLE-PREVIEWS", GNUNET_NO))
+                                                             "GNUNET-GTK",
+                                                             "DISABLE-PREVIEWS",
+                                                             GNUNET_NO))
     {
       renderer = gtk_cell_renderer_pixbuf_new ();
       col = gtk_tree_view_insert_column_with_attributes (list->treeview,
@@ -541,7 +557,9 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
 
   /* insert new page into search notebook */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
+    =
+    GTK_NOTEBOOK (glade_xml_get_widget
+                  (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   pages = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook));
   gtk_notebook_append_page (notebook, list->searchpage, list->tab_label);
   gtk_notebook_set_current_page (notebook, pages);
@@ -632,7 +650,9 @@ fs_search_stopped (SearchList * list)
 
   /* remove page from notebook */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
+    =
+    GTK_NOTEBOOK (glade_xml_get_widget
+                  (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   index = -1;
   for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
     if (list->searchpage == gtk_notebook_get_nth_page (notebook, i))
@@ -673,7 +693,8 @@ on_fssearchKeywordComboBoxEntry_changed_fs (gpointer dummy2,
 
   searchString = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
                                     "fssearchKeywordComboBoxEntry");
-  searchButton = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fssearchbutton");
+  searchButton =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fssearchbutton");
   gtk_widget_set_sensitive (searchButton, strlen (searchString) > 0);
 }
 
@@ -689,7 +710,8 @@ static void *
 search_start_helper (void *cls)
 {
   FSSS *fsss = cls;
-  GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->max, fsss->delay, fsss->uri);
+  GNUNET_FSUI_search_start (ctx, fsss->anonymity, fsss->max, fsss->delay,
+                            fsss->uri);
   return NULL;
 }
 
@@ -715,8 +737,8 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
   if ((searchString == NULL) || (strlen (searchString) == 0))
     {
       GNUNET_GELOG (ectx,
-              GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
-              _("Need a keyword to search!\n"));
+                    GNUNET_GEERROR | GNUNET_GEUSER | GNUNET_GEIMMEDIATE,
+                    _("Need a keyword to search!\n"));
       return;
     }
   /* add the keyword to the list of keywords that have
@@ -736,7 +758,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
   fsss.uri = NULL;
   /* check for namespace search */
   searchNamespaceGtkCB
-    = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "searchNamespaceComboBoxEntry");
+    =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "searchNamespaceComboBoxEntry");
   if (TRUE ==
       gtk_combo_box_get_active_iter (GTK_COMBO_BOX (searchNamespaceGtkCB),
                                      &iter))
@@ -765,9 +789,10 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
         {
           char *ustring;
 
-          ustring = GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
-                            strlen (GNUNET_ECRS_URI_PREFIX) +
-                            strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
+          ustring =
+            GNUNET_malloc (strlen (searchString) + sizeof (GNUNET_EncName) +
+                           strlen (GNUNET_ECRS_URI_PREFIX) +
+                           strlen (GNUNET_ECRS_SUBSPACE_INFIX) + 10);
           strcpy (ustring, GNUNET_ECRS_URI_PREFIX);
           strcat (ustring, GNUNET_ECRS_SUBSPACE_INFIX);
           strcat (ustring, ns);
@@ -777,9 +802,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
           if (fsss.uri == NULL)
             {
               GNUNET_GELOG (ectx,
-                      GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
-                      _("Failed to create namespace URI from `%s'.\n"),
-                      ustring);
+                            GNUNET_GEERROR | GNUNET_GEBULK | GNUNET_GEUSER,
+                            _("Failed to create namespace URI from `%s'.\n"),
+                            ustring);
             }
           GNUNET_free (ustring);
         }
@@ -797,7 +822,9 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
     }
   /* check if search is already running */
   notebook
-    = GTK_NOTEBOOK (glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
+    =
+    GTK_NOTEBOOK (glade_xml_get_widget
+                  (GNUNET_GTK_get_main_glade_XML (), "downloadNotebook"));
   pages = gtk_notebook_get_n_pages (notebook);
   list = search_head;
   while (list != NULL)
@@ -819,16 +846,20 @@ on_fssearchbutton_clicked_fs (gpointer dummy2, GtkWidget * searchButton)
     }
   fsss.anonymity = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
                                        "searchAnonymitySelectionSpinButton");
-  fsss.max = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (), "maxResultsSpinButton");
-  fsss.delay = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                   "searchDelaySpinButton") * GNUNET_CRON_SECONDS;
+  fsss.max =
+    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                        "maxResultsSpinButton");
+  fsss.delay =
+    getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                        "searchDelaySpinButton") * GNUNET_CRON_SECONDS;
   GNUNET_GTK_run_with_save_calls (search_start_helper, &fsss);
   GNUNET_ECRS_uri_destroy (fsss.uri);
 }
 
 struct FCBC
 {
-  int (*method) (struct GNUNET_FSUI_Context * ctx, struct GNUNET_FSUI_SearchList * list);
+  int (*method) (struct GNUNET_FSUI_Context * ctx,
+                 struct GNUNET_FSUI_SearchList * list);
   struct GNUNET_FSUI_SearchList *argument;
 };
 
diff --git a/src/plugins/fs/search.h b/src/plugins/fs/search.h
index 301544d2..b0dcf719 100644
--- a/src/plugins/fs/search.h
+++ b/src/plugins/fs/search.h
@@ -38,7 +38,8 @@
  */
 void addEntryToSearchTree (SearchList * searchContext,
                            DownloadList * downloadParent,
-                           const GNUNET_ECRS_FileInfo * info, GtkTreeIter * iter);
+                           const GNUNET_ECRS_FileInfo * info,
+                           GtkTreeIter * iter);
 
 /**
  * Add the given result to the model (search result
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 89c3c7b3..1f3b9743 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -50,7 +50,7 @@ static GladeXML *metaXML;
 
 void
 fs_upload_update (UploadList * list, unsigned long long completed,
-                  unsigned long long total)
+                  unsigned long long total)
 {
   GtkTreeIter iter;
   GtkTreePath *path;
@@ -81,9 +81,7 @@ fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri)
   gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary), &iter, path);
   gtk_tree_path_free (path);
   gtk_tree_store_set (upload_summary, &iter,
-                      UPLOAD_URISTRING, us,
-                      UPLOAD_PROGRESS, 100, 
-                      -1);
+                      UPLOAD_URISTRING, us, UPLOAD_PROGRESS, 100, -1);
   GNUNET_free (us);
 }
 
@@ -141,7 +139,7 @@ fs_upload_started (struct GNUNET_FSUI_UploadList *fsui,
   GtkTreePath *path;
   int progress;
   GtkTreeIter par;
-  char * u;
+  char *u;
 
   ret = GNUNET_malloc (sizeof (UploadList));
   memset (ret, 0, sizeof (UploadList));
@@ -162,21 +160,23 @@ fs_upload_started (struct GNUNET_FSUI_UploadList *fsui,
     {
       gtk_tree_store_append (upload_summary, &iter, NULL);
     }
-  if ( (total != 0) && (state != GNUNET_FSUI_COMPLETED_JOINED) )
+  if ((total != 0) && (state != GNUNET_FSUI_COMPLETED_JOINED))
     progress = 100 * completed / total;
   else
     progress = 100;
   if (uri != NULL)
-    u = GNUNET_ECRS_uri_to_string(uri);
+    u = GNUNET_ECRS_uri_to_string (uri);
   else
-    u = GNUNET_strdup("");
-  gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename, UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, u,
+    u = GNUNET_strdup ("");
+  gtk_tree_store_set (upload_summary, &iter, UPLOAD_FILENAME, filename,
+                      UPLOAD_PROGRESS, progress, UPLOAD_URISTRING, u,
                       UPLOAD_INTERNAL, ret, -1);
-  GNUNET_free(u);
+  GNUNET_free (u);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (upload_summary), &iter);
   ret->summaryViewRowReference
     = gtk_tree_row_reference_new (GTK_TREE_MODEL (upload_summary), path);
-  ret->has_terminated = ((state != GNUNET_FSUI_ACTIVE) && (state != GNUNET_FSUI_PENDING));
+  ret->has_terminated = ((state != GNUNET_FSUI_ACTIVE)
+                         && (state != GNUNET_FSUI_PENDING));
 
   ret->next = upload_head;
   upload_head = ret;
@@ -342,16 +342,12 @@ start_upload_helper (void *cls)
   FSUC *fsuc = cls;
 
   GNUNET_FSUI_upload_star (ctx,
-                    fsuc->filename,
-                    (GNUNET_FSUI_DirectoryScanCallback) & GNUNET_disk_directory_scan,
-                    ectx,
-                    fsuc->anonymity,
-                    fsuc->priority,
-                    fsuc->index,
-                    fsuc->extract,
-                    fsuc->deep_index,
-                    fsuc->expire,
-                    fsuc->meta, fsuc->gkeywordURI, fsuc->keywordURI);
+                           fsuc->filename,
+                           (GNUNET_FSUI_DirectoryScanCallback) &
+                           GNUNET_disk_directory_scan, ectx, fsuc->anonymity,
+                           fsuc->priority, fsuc->index, fsuc->extract,
+                           fsuc->deep_index, fsuc->expire, fsuc->meta,
+                           fsuc->gkeywordURI, fsuc->keywordURI);
   return NULL;
 }
 
@@ -369,13 +365,17 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
 
   extractors = EXTRACTOR_loadDefaultLibraries ();
   config = NULL;
-  GNUNET_GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "", &config);
+  GNUNET_GC_get_configuration_value_string (cfg, "FS", "EXTRACTORS", "",
+                                            &config);
   if (strlen (config) > 0)
     extractors = EXTRACTOR_loadConfigLibraries (extractors, config);
   GNUNET_free (config);
-  filename = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (), "uploadFilenameComboBoxEntry");
-  metaXML
-    = glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog", PACKAGNUNET_GENAME);
+  filename =
+    getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
+                       "uploadFilenameComboBoxEntry");
+  metaXML =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (), "metaDataDialog",
+                   PACKAGNUNET_GENAME);
   GNUNET_GTK_connect_glade_with_plugins (metaXML);
   dialog = glade_xml_get_widget (metaXML, "metaDataDialog");
   meta = GNUNET_ECRS_meta_data_create ();
@@ -415,11 +415,15 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
                                            "uploadAnonymityLevelSpinButton");
       fsuc.priority = getSpinButtonValue (GNUNET_GTK_get_main_glade_XML (),
                                           "contentPrioritySpinButton");
-      fsuc.index = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (), "indexbutton");
-      fsuc.extract = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                           "doExtractCheckButton");
-      fsuc.deep_index = getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
-                                              "deepIndexCheckButton");
+      fsuc.index =
+        getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                              "indexbutton");
+      fsuc.extract =
+        getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                              "doExtractCheckButton");
+      fsuc.deep_index =
+        getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (),
+                              "deepIndexCheckButton");
       fsuc.expire = GNUNET_get_time () + 2 * GNUNET_CRON_YEARS;
       fsuc.meta = getMetaDataFromList (metaXML,
                                        "metaDataDialogMetaDataList",
@@ -427,7 +431,8 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
       fsuc.keywordURI = getKeywordURIFromList (metaXML,
                                                "metaDataDialogKeywordList");
       fsuc.gkeywordURI = GNUNET_ECRS_string_to_uri (ectx,
-                                           GNUNET_ECRS_URI_PREFIX GNUNET_ECRS_SEARCH_INFIX);
+                                                    GNUNET_ECRS_URI_PREFIX
+                                                    GNUNET_ECRS_SEARCH_INFIX);
       fsuc.filename = GNUNET_strdup (filename);
       GNUNET_GTK_run_with_save_calls (&start_upload_helper, &fsuc);
       GNUNET_free (fsuc.filename);
@@ -455,7 +460,8 @@ selectFile (const char *oldfilename)
   dialog = GTK_FILE_CHOOSER (glade_xml_get_widget (uploadXML,
                                                    "uploadfilechooserdialog"));
   gtk_file_chooser_set_filename (dialog, oldfilename);
-  if (getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (), "scopeRecursiveButton"))
+  if (getToggleButtonValue
+      (GNUNET_GTK_get_main_glade_XML (), "scopeRecursiveButton"))
     gtk_file_chooser_set_action (dialog,
                                  GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
   if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_CANCEL)
@@ -472,7 +478,8 @@ selectFile (const char *oldfilename)
 static char *
 selectFile (const char *oldfilename)
 {
-  if (getToggleButtonValue (GNUNET_GTK_get_main_glade_XML (), "scopeFileOnlyButton"))
+  if (getToggleButtonValue
+      (GNUNET_GTK_get_main_glade_XML (), "scopeFileOnlyButton"))
     return plibc_ChooseFile (_("Choose the file you want to publish."),
                              OFN_FILEMUSTEXIST | OFN_SHAREAWARE);
   return plibc_ChooseDir (_("Choose the directory you want to publish."),
@@ -518,7 +525,8 @@ on_mainFileSharingInsertBrowseButton_clicked_fs (GtkWidget * browseButton,
 
 struct FCBC
 {
-  int (*method) (struct GNUNET_FSUI_Context * ctx, struct GNUNET_FSUI_UploadList * list);
+  int (*method) (struct GNUNET_FSUI_Context * ctx,
+                 struct GNUNET_FSUI_UploadList * list);
   struct GNUNET_FSUI_UploadList *argument;
 };
 
@@ -562,7 +570,9 @@ on_uploadFilenameComboBoxEntry_changed_fs (gpointer dummy2,
   int ok;
   GtkWidget *toggle;
 
-  filename = getEntryLineValue (GNUNET_GTK_get_main_glade_XML (), "uploadFilenameComboBoxEntry");
+  filename =
+    getEntryLineValue (GNUNET_GTK_get_main_glade_XML (),
+                       "uploadFilenameComboBoxEntry");
   ok = (0 == stat (filename, &buf));
   if (ok)
     ok = (0 == ACCESS (filename, R_OK));
@@ -581,7 +591,9 @@ on_uploadFilenameComboBoxEntry_changed_fs (gpointer dummy2,
           gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), 1);
         }
     }
-  uploadButton = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "fsinsertuploadbutton");
+  uploadButton =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "fsinsertuploadbutton");
   gtk_widget_set_sensitive (uploadButton, ok);
 }
 
@@ -590,7 +602,7 @@ on_clearCompletedUploadsButton_clicked_fs (void *unused,
                                            GtkWidget * clearButton)
 {
   GNUNET_GTK_tree_model_foreach (GTK_TREE_MODEL (upload_summary),
-                          &clearCompletedUploadCallback, NULL);
+                                 &clearCompletedUploadCallback, NULL);
 }
 
 static void
@@ -614,7 +626,9 @@ on_abortUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
   GtkTreeSelection *selection;
   GtkWidget *uploadList;
 
-  uploadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList");
+  uploadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeUploadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
@@ -626,7 +640,9 @@ on_stopUploadButton_clicked_fs (void *unused, GtkWidget * clearButton)
   GtkTreeSelection *selection;
   GtkWidget *uploadList;
 
-  uploadList = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "activeUploadsList");
+  uploadList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeUploadsList");
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (uploadList));
   GNUNET_GTK_tree_selection_selected_foreach
     (selection, &fsuiCallUploadCallback, &GNUNET_FSUI_upload_abort);
diff --git a/src/plugins/fs/upload.h b/src/plugins/fs/upload.h
index 2d513d3d..12ca649a 100644
--- a/src/plugins/fs/upload.h
+++ b/src/plugins/fs/upload.h
@@ -30,7 +30,7 @@
 #include "fs.h"
 
 void fs_upload_update (UploadList * list, unsigned long long completed,
-                       unsigned long long total);
+                       unsigned long long total);
 
 void fs_upload_complete (UploadList * list, struct GNUNET_ECRS_URI *uri);
 
diff --git a/src/plugins/peers/peers.c b/src/plugins/peers/peers.c
index 0b7b5a20..e25072b0 100644
--- a/src/plugins/peers/peers.c
+++ b/src/plugins/peers/peers.c
@@ -48,20 +48,22 @@ static GdkPixbuf *red;
 
 static GdkPixbuf *black;
 
-struct Flags {
-  struct Flags * next;
-  char * cc;
-  GdkPixbuf * flag;
+struct Flags
+{
+  struct Flags *next;
+  char *cc;
+  GdkPixbuf *flag;
 };
 
-static struct Flags * flags;
+static struct Flags *flags;
 
 static int
 collector (void *data,
            const GNUNET_PeerIdentity * identity,
            const void *address,
            unsigned int addr_len,
-           GNUNET_CronTime last_message, unsigned int trust, unsigned int bpmFromPeer)
+           GNUNET_CronTime last_message, unsigned int trust,
+           unsigned int bpmFromPeer)
 {
   GtkListStore *model = data;
   GtkTreeIter iter;
@@ -78,7 +80,7 @@ collector (void *data,
   GNUNET_CronTime now;
   int i;
   int found;
-  struct Flags * pos;
+  struct Flags *pos;
 
   GNUNET_hash_to_enc (&identity->hashPubKey, &enc);
   /* check if same peer is already in model! */
@@ -138,35 +140,38 @@ collector (void *data,
   if (cc != NULL)
     {
       pos = flags;
-      while (pos != NULL) {
-        if (0 == strcmp(pos->cc, cc)) {
-          flagBuf = pos->flag;
-          break;
-        }
-        pos = pos->next;
-      }
-      if (pos == NULL) {      
-        cc = GNUNET_strdup (cc);
-        for (i = 0; i < strlen (cc); i++)
-          cc[i] = tolower (cc[i]);
-        dir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
-        fn = GNUNET_malloc (strlen (dir) + 32);
-        strcpy (fn, dir);
-        strcat (fn,
-                DIR_SEPARATOR_STR ".."
-                DIR_SEPARATOR_STR "gnunet-gtk"
-                DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
-        strcat (fn, cc);
-        strcat (fn, ".png");
-        GNUNET_free (dir);
-        flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
-        GNUNET_free (fn);
-        pos = GNUNET_malloc(sizeof(struct Flags));
-        pos->cc = cc;
-        pos->flag = flagBuf;
-        pos->next = flags;
-        flags = pos;
-      }
+      while (pos != NULL)
+        {
+          if (0 == strcmp (pos->cc, cc))
+            {
+              flagBuf = pos->flag;
+              break;
+            }
+          pos = pos->next;
+        }
+      if (pos == NULL)
+        {
+          cc = GNUNET_strdup (cc);
+          for (i = 0; i < strlen (cc); i++)
+            cc[i] = tolower (cc[i]);
+          dir = GNUNET_get_installation_path (GNUNET_IPK_DATADIR);
+          fn = GNUNET_malloc (strlen (dir) + 32);
+          strcpy (fn, dir);
+          strcat (fn,
+                  DIR_SEPARATOR_STR ".."
+                  DIR_SEPARATOR_STR "gnunet-gtk"
+                  DIR_SEPARATOR_STR "flags" DIR_SEPARATOR_STR);
+          strcat (fn, cc);
+          strcat (fn, ".png");
+          GNUNET_free (dir);
+          flagBuf = gdk_pixbuf_new_from_file (fn, NULL);
+          GNUNET_free (fn);
+          pos = GNUNET_malloc (sizeof (struct Flags));
+          pos->cc = cc;
+          pos->flag = flagBuf;
+          pos->next = flags;
+          flags = pos;
+        }
     }
 
   /* get LED */
@@ -236,7 +241,8 @@ updatePeerInfoSafe (void *m)
   GtkSortType order;
   gint sort_column;
 
-  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
+  w =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
   old_model = gtk_tree_view_get_model (GTK_TREE_VIEW (w));
   if (old_model != NULL)
     {
@@ -259,7 +265,7 @@ updatePeerInfo (void *dummy)
 
   model = getPeerModel ();
   GNUNET_GTK_save_call (&updatePeerInfoSafe, model);
-  g_object_unref(G_OBJECT(model));
+  g_object_unref (G_OBJECT (model));
 }
 
 
@@ -276,7 +282,8 @@ init_peers (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
 
   ectx = e;
   cfg = c;
-  peers = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
+  peers =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (GTK_TREE_VIEW (peers),
                                                      -1,
@@ -379,17 +386,20 @@ init_peers (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
   GNUNET_free (fn);
   GNUNET_free (dir);
 
-  tab = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersScrolledWindow");
+  tab =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "peersScrolledWindow");
   gtk_widget_show (tab);
   cron = GNUNET_GTK_get_cron_manager ();
-  GNUNET_cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE, NULL);
+  GNUNET_cron_add_job (cron, &updatePeerInfo, REFRESH_RATE, REFRESH_RATE,
+                       NULL);
 }
 
 void
 done_peers ()
 {
   GtkWidget *w;
-  struct Flags * pos;
+  struct Flags *pos;
 
   GNUNET_cron_del_job (cron, &updatePeerInfo, REFRESH_RATE, NULL);
   if (red != NULL)
@@ -400,17 +410,19 @@ done_peers ()
     g_object_unref (black);
   if (yellow != NULL)
     g_object_unref (yellow);
-  w = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
+  w =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "peersTreeView");
   gtk_tree_view_set_model (GTK_TREE_VIEW (w), NULL);
 
-  while (flags != NULL) {
-    pos = flags->next;    
-    if (flags->flag != NULL)
-      g_object_unref(flags->flag);
-    GNUNET_free (flags->cc);
-    GNUNET_free(flags);
-    flags = pos;
-  }
+  while (flags != NULL)
+    {
+      pos = flags->next;
+      if (flags->flag != NULL)
+        g_object_unref (flags->flag);
+      GNUNET_free (flags->cc);
+      GNUNET_free (flags);
+      flags = pos;
+    }
 }
 
 
diff --git a/src/plugins/stats/functions.c b/src/plugins/stats/functions.c
index 6242637b..c586b0fa 100644
--- a/src/plugins/stats/functions.c
+++ b/src/plugins/stats/functions.c
@@ -68,15 +68,16 @@ getStatValue (long long *value,
             *lvalue = lastStatValues[i].lvalue;
           if (dtime != NULL)
             *dtime = lastStatValues[i].delta;
-          if ((monotone == GNUNET_YES) && (lvalue != NULL) && (*lvalue > *value))
-            return GNUNET_SYSERR;      /* gnunetd restart? */
+          if ((monotone == GNUNET_YES) && (lvalue != NULL)
+              && (*lvalue > *value))
+            return GNUNET_SYSERR;       /* gnunetd restart? */
           return GNUNET_OK;
         }
     }
 #if FUNCTIONS_DEBUG
   GNUNET_GELOG (ectx,
-          GNUNET_GEDEBUG | GNUNET_GEDEVELOPER | GNUNET_GEREQUEST,
-          "Statistic not found: `%s'\n", optName);
+                GNUNET_GEDEBUG | GNUNET_GEDEVELOPER | GNUNET_GEREQUEST,
+                "Statistic not found: `%s'\n", optName);
 #endif
   return GNUNET_SYSERR;
 }
@@ -89,11 +90,14 @@ updateConnectionGoal (void *unused)
   char *availableUp;
 
   GNUNET_mutex_lock (lock);
-  cmh = GNUNET_get_daemon_configuration_value (sock, "gnunetd", "connection-max-hosts");
-  availableDown = GNUNET_get_daemon_configuration_value (sock,
-                                               "LOAD", "MAXNETDOWNBPSTOTAL");
-  availableUp = GNUNET_get_daemon_configuration_value (sock,
-                                             "LOAD", "MAXNETUPBPSTOTAL");
+  cmh =
+    GNUNET_get_daemon_configuration_value (sock, "gnunetd",
+                                           "connection-max-hosts");
+  availableDown =
+    GNUNET_get_daemon_configuration_value (sock, "LOAD",
+                                           "MAXNETDOWNBPSTOTAL");
+  availableUp =
+    GNUNET_get_daemon_configuration_value (sock, "LOAD", "MAXNETUPBPSTOTAL");
   GNUNET_mutex_unlock (lock);
   if (cmh == NULL)
     connectionGoal = 0;
@@ -120,7 +124,8 @@ getConnectedNodesStat (const void *closure, gfloat ** data)
 
   if (connectionGoal == 0)
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&val, NULL, NULL, "# of connected peers", GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&val, NULL, NULL, "# of connected peers", GNUNET_NO))
     return GNUNET_SYSERR;
   data[0][0] = ((gfloat) val) / connectionGoal;
   return GNUNET_OK;
@@ -134,15 +139,20 @@ getLoadStat (const void *closure, gfloat ** data)
   long long valu;
   long long vald;
 
-  if (GNUNET_OK != getStatValue (&valc, NULL, NULL, "% of allowed cpu load", GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&valc, NULL, NULL, "% of allowed cpu load", GNUNET_NO))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&vali, NULL, NULL, "% of allowed io load", GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&vali, NULL, NULL, "% of allowed io load", GNUNET_NO))
     return GNUNET_SYSERR;
   if (GNUNET_OK != getStatValue (&valu,
-                          NULL, NULL, "% of allowed network load (up)", GNUNET_NO))
+                                 NULL, NULL, "% of allowed network load (up)",
+                                 GNUNET_NO))
     return GNUNET_SYSERR;
   if (GNUNET_OK != getStatValue (&vald,
-                          NULL, NULL, "% of allowed network load (down)", GNUNET_NO))
+                                 NULL, NULL,
+                                 "% of allowed network load (down)",
+                                 GNUNET_NO))
     return GNUNET_SYSERR;
   data[0][0] = (gfloat) valc / 100.0;
   data[0][1] = (gfloat) vali / 100.0;
@@ -158,11 +168,13 @@ getQuotaStat (const void *closure, gfloat ** data)
   long long have;
 
   if (GNUNET_OK != getStatValue (&allowed,
-                          NULL, NULL, "# bytes allowed in datastore", GNUNET_NO))
+                                 NULL, NULL, "# bytes allowed in datastore",
+                                 GNUNET_NO))
     return GNUNET_SYSERR;
   if (allowed == 0)
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO))
+  if (GNUNET_OK !=
+      getStatValue (&have, NULL, NULL, "# bytes in datastore", GNUNET_NO))
     return GNUNET_SYSERR;
   data[0][0] = ((gfloat) have) / allowed;
   return GNUNET_OK;
@@ -186,33 +198,42 @@ getTrafficRecvStats (const void *closure, gfloat ** data)
   GNUNET_CronTime dtime;
   char *buffer;
 
-  if (GNUNET_OK != getStatValue (&total, &ltotal, &dtime, "# bytes received", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&total, &ltotal, &dtime, "# bytes received", GNUNET_YES))
     return GNUNET_SYSERR;
   if (GNUNET_OK != getStatValue (&noise,
-                          &lnoise, NULL, "# bytes of noise received", GNUNET_YES))
+                                 &lnoise, NULL, "# bytes of noise received",
+                                 GNUNET_YES))
     return GNUNET_SYSERR;
   buffer = GNUNET_malloc (512);
-  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", GNUNET_P2P_PROTO_GAP_RESULT);
-  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
+                   GNUNET_P2P_PROTO_GAP_RESULT);
+  if (GNUNET_OK !=
+      getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
     {
       content = 0;
       lcontent = 0;
     }
-  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", GNUNET_P2P_PROTO_HELLO);
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
+                   GNUNET_P2P_PROTO_HELLO);
   if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
     {
       hellos = 0;
       lhellos = 0;
     }
-  GNUNET_snprintf (buffer, 512, "# bytes received of type %d", GNUNET_P2P_PROTO_GAP_QUERY);
-  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
+  GNUNET_snprintf (buffer, 512, "# bytes received of type %d",
+                   GNUNET_P2P_PROTO_GAP_QUERY);
+  if (GNUNET_OK !=
+      getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
   if (GNUNET_OK != getStatValue (&rlimit,
-                          &lrlimit,
-                          NULL, "# total bytes per second receive limit", GNUNET_NO))
+                                 &lrlimit,
+                                 NULL,
+                                 "# total bytes per second receive limit",
+                                 GNUNET_NO))
     {
       rlimit = 0;
       lrlimit = 0;
@@ -267,34 +288,42 @@ getTrafficSendStats (const void *closure, gfloat ** data)
   char *buffer;
 
   if (GNUNET_OK != getStatValue (&total,
-                          &ltotal, &dtime, "# bytes transmitted", GNUNET_YES))
+                                 &ltotal, &dtime, "# bytes transmitted",
+                                 GNUNET_YES))
     return GNUNET_SYSERR;
-  if (GNUNET_OK != getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", GNUNET_YES))
+  if (GNUNET_OK !=
+      getStatValue (&noise, &lnoise, NULL, "# bytes noise sent", GNUNET_YES))
     return GNUNET_SYSERR;
   buffer = GNUNET_malloc (512);
   GNUNET_snprintf (buffer,
-            512, "# bytes transmitted of type %d", GNUNET_P2P_PROTO_GAP_RESULT);
-  if (GNUNET_OK != getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
+                   512, "# bytes transmitted of type %d",
+                   GNUNET_P2P_PROTO_GAP_RESULT);
+  if (GNUNET_OK !=
+      getStatValue (&content, &lcontent, NULL, buffer, GNUNET_YES))
     {
       content = 0;
       lcontent = 0;
     }
   GNUNET_snprintf (buffer,
-            512, "# bytes transmitted of type %d", GNUNET_P2P_PROTO_GAP_QUERY);
-  if (GNUNET_OK != getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
+                   512, "# bytes transmitted of type %d",
+                   GNUNET_P2P_PROTO_GAP_QUERY);
+  if (GNUNET_OK !=
+      getStatValue (&queries, &lqueries, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
-  GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d", GNUNET_P2P_PROTO_HELLO);
+  GNUNET_snprintf (buffer, 512, "# bytes transmitted of type %d",
+                   GNUNET_P2P_PROTO_HELLO);
   if (GNUNET_OK != getStatValue (&hellos, &lhellos, NULL, buffer, GNUNET_YES))
     {
       queries = 0;
       lqueries = 0;
     }
   if (GNUNET_OK != getStatValue (&slimit,
-                          &lslimit,
-                          NULL, "# total bytes per second send limit", GNUNET_NO))
+                                 &lslimit,
+                                 NULL, "# total bytes per second send limit",
+                                 GNUNET_NO))
     {
       slimit = 0;
       lslimit = 0;
@@ -353,19 +382,21 @@ getEffectivenessStats (const void *closure, gfloat ** data)
     }
   last = now;
   if (GNUNET_OK != getStatValue (&total,
-                          &ltotal,
-                          NULL,
-                          "# gap requests forwarded (counting each peer)",
-                          GNUNET_YES))
+                                 &ltotal,
+                                 NULL,
+                                 "# gap requests forwarded (counting each peer)",
+                                 GNUNET_YES))
     return GNUNET_SYSERR;
   if (GNUNET_OK != getStatValue (&success,
-                          &lsuccess,
-                          NULL, "# gap routing successes (total)", GNUNET_YES))
+                                 &lsuccess,
+                                 NULL, "# gap routing successes (total)",
+                                 GNUNET_YES))
     return GNUNET_SYSERR;
   if (GNUNET_OK != getStatValue (&local,
-                          &llocal,
-                          NULL,
-                          "# gap requests processed: local result", GNUNET_YES))
+                                 &llocal,
+                                 NULL,
+                                 "# gap requests processed: local result",
+                                 GNUNET_YES))
     return GNUNET_SYSERR;
   total -= ltotal;
   data[0][0] = 0.0;
@@ -448,7 +479,8 @@ updateStatValues (void *unused)
   now = GNUNET_get_time ();
   delta = now - lastUpdate;
   GNUNET_mutex_lock (lock);
-  if (GNUNET_OK == GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &delta))
+  if (GNUNET_OK ==
+      GNUNET_STATS_get_statistics (ectx, sock, &statsProcessor, &delta))
     lastUpdate = now;
   GNUNET_mutex_unlock (lock);
 }
@@ -532,19 +564,20 @@ init_functions (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c)
   ectx = e;
   cfg = c;
   GNUNET_GC_get_configuration_value_number (cfg,
-                                     "GNUNET-GTK",
-                                     "STATS-INTERVAL",
-                                     1,
-                                     99 * GNUNET_CRON_YEARS,
-                                     30 * GNUNET_CRON_SECONDS, &UPDATE_INTERVAL);
+                                            "GNUNET-GTK",
+                                            "STATS-INTERVAL",
+                                            1,
+                                            99 * GNUNET_CRON_YEARS,
+                                            30 * GNUNET_CRON_SECONDS,
+                                            &UPDATE_INTERVAL);
   sock = GNUNET_client_connection_create (ectx, cfg);
   lock = GNUNET_mutex_create (GNUNET_NO);
   cron = GNUNET_GTK_get_cron_manager ();
   GNUNET_cron_add_job (cron,
-                &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL, NULL);
-  GNUNET_cron_add_job (cron,
-                &updateConnectionGoal,
-                5 * GNUNET_CRON_MINUTES, 5 * GNUNET_CRON_MINUTES, NULL);
+                       &updateStatValues, UPDATE_INTERVAL, UPDATE_INTERVAL,
+                       NULL);
+  GNUNET_cron_add_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_MINUTES,
+                       5 * GNUNET_CRON_MINUTES, NULL);
 }
 
 void
@@ -552,7 +585,8 @@ done_functions ()
 {
   int i;
 
-  GNUNET_cron_del_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_MINUTES, NULL);
+  GNUNET_cron_del_job (cron, &updateConnectionGoal, 5 * GNUNET_CRON_MINUTES,
+                       NULL);
   GNUNET_cron_del_job (cron, &updateStatValues, UPDATE_INTERVAL, NULL);
   GNUNET_mutex_destroy (lock);
   GNUNET_client_connection_destroy (sock);
diff --git a/src/plugins/stats/functions.h b/src/plugins/stats/functions.h
index 0131e69c..1ec9b095 100644
--- a/src/plugins/stats/functions.h
+++ b/src/plugins/stats/functions.h
@@ -51,7 +51,8 @@ typedef struct SE_
 
 extern StatEntry stats[];
 
-void init_functions (struct GNUNET_GEContext *e, struct GNUNET_GC_Configuration *c);
+void init_functions (struct GNUNET_GEContext *e,
+                     struct GNUNET_GC_Configuration *c);
 
 void done_functions (void);
 
diff --git a/src/plugins/stats/statistics.c b/src/plugins/stats/statistics.c
index 047afb35..04b2fb66 100644
--- a/src/plugins/stats/statistics.c
+++ b/src/plugins/stats/statistics.c
@@ -430,7 +430,8 @@ create_sys_view (int statIdx, const ProcConfig * config)
 
 
 void
-init_stats (struct GNUNET_GEContext *ectx, struct GNUNET_GC_Configuration *cfg)
+init_stats (struct GNUNET_GEContext *ectx,
+            struct GNUNET_GC_Configuration *cfg)
 {
   GtkWidget *sys_box;
   GtkWidget *label;
@@ -439,13 +440,15 @@ init_stats (struct GNUNET_GEContext *ectx, struct GNUNET_GC_Configuration *cfg)
   int i;
 
   GNUNET_GC_get_configuration_value_number (cfg,
-                                     "GNUNET-GTK",
-                                     "STATS-INTERVAL",
-                                     1,
-                                     99 * GNUNET_CRON_YEARS,
-                                     30 * GNUNET_CRON_SECONDS, &UPDATE_INTERVAL);
+                                            "GNUNET-GTK",
+                                            "STATS-INTERVAL",
+                                            1,
+                                            99 * GNUNET_CRON_YEARS,
+                                            30 * GNUNET_CRON_SECONDS,
+                                            &UPDATE_INTERVAL);
   init_functions (ectx, cfg);
-  notebook = glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
+  notebook =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (), "statsNotebook");
   memset (&config, 0, sizeof (ProcConfig));
   gdk_color_parse ("black", &config.bg_color);
   gdk_color_parse ("gray", &config.frame_color);