5 files changed, 22 insertions, 28 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index d927d3d6..198837bb 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -533,7 +533,7 @@ init_cron_job (void *arg)
 {
   GtkWidget *tab = arg;
 
-  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 64,  /* FIXME: allow user to configure download parallelism */
+  ctx = GNUNET_FSUI_start (ectx, cfg, "gnunet-gtk", 64, /* FIXME: allow user to configure download parallelism */
                            GNUNET_YES, &eventProcessor, NULL);
   GNUNET_GTK_save_call ((GNUNET_ThreadMainFunction) & gtk_widget_show, tab);
 }
diff --git a/src/plugins/fs/meta.c b/src/plugins/fs/meta.c
index 43e1531a..18eec4ed 100644
--- a/src/plugins/fs/meta.c
+++ b/src/plugins/fs/meta.c
@@ -38,7 +38,7 @@ publishMetaData (EXTRACTOR_KeywordType type, const char *data, void *cls)
   const char *stype;
   GtkTreeIter iter;
 
-  if (EXTRACTOR_isBinaryType(type))
+  if (EXTRACTOR_isBinaryType (type))
     return GNUNET_OK;
   stype = EXTRACTOR_getKeywordTypeAsString (type);
   if (stype == NULL)            /* wrong LE version!? */
@@ -188,10 +188,9 @@ createMetaTypeComboBox (GladeXML * xml, const char *name)
                            GTK_TREE_MODEL (keywordTypeModel));
   for (type = 0; type < EXTRACTOR_getHighestKeywordTypeNumber (); type++)
     {
-      if ( (type == EXTRACTOR_SPLIT) ||
-           (type == EXTRACTOR_LOWERCASE) ||
-           (EXTRACTOR_isBinaryType(type)) )
-        continue; /* these are not legal... */  
+      if ((type == EXTRACTOR_SPLIT) ||
+          (type == EXTRACTOR_LOWERCASE) || (EXTRACTOR_isBinaryType (type)))
+        continue;               /* these are not legal... */
       stype = EXTRACTOR_getKeywordTypeAsString (type);
       gtk_list_store_append (keywordTypeModel, &iter);
       gtk_list_store_set (keywordTypeModel,
diff --git a/src/plugins/fs/namespace_search.c b/src/plugins/fs/namespace_search.c
index a2966a7e..3dbf7862 100644
--- a/src/plugins/fs/namespace_search.c
+++ b/src/plugins/fs/namespace_search.c
@@ -264,15 +264,15 @@ saveDiscovery (void *cls)
     {
       GNUNET_GTK_show_info_message (_("Namespace `%s' found: %s.\n"),
                                     nni->namespaceName, desc);
-      fulldesc = GNUNET_malloc(strlen(desc) + strlen(nni->namespaceName) + 3);
-      strcpy(fulldesc, nni->namespaceName);
-      if (NULL == strstr(nni->namespaceName,
-                         desc))
-        {
-          /* append only if desc adds something new! */
-          strcat(fulldesc, ": ");
-          strcat(fulldesc, desc);      
-        }
+      fulldesc =
+        GNUNET_malloc (strlen (desc) + strlen (nni->namespaceName) + 3);
+      strcpy (fulldesc, nni->namespaceName);
+      if (NULL == strstr (nni->namespaceName, desc))
+        {
+          /* append only if desc adds something new! */
+          strcat (fulldesc, ": ");
+          strcat (fulldesc, desc);
+        }
       gtk_list_store_append (model, &iter);
       gtk_list_store_set (model,
                           &iter,
@@ -280,7 +280,7 @@ saveDiscovery (void *cls)
                           NS_SEARCH_NAME, nni->namespaceName,
                           NS_SEARCH_METADATA, dmd,
                           NS_SEARCH_RATING, nni->rating, -1);
-      GNUNET_free(fulldesc);
+      GNUNET_free (fulldesc);
     }
   else
     {
diff --git a/src/plugins/fs/status.c b/src/plugins/fs/status.c
index 45a0e540..aed88032 100644
--- a/src/plugins/fs/status.c
+++ b/src/plugins/fs/status.c
@@ -105,8 +105,7 @@ getStatusLogo (enum GNUNET_URITRACK_STATE state)
                                      (GError **) NULL);
   if (0 == state)
     return gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-                                     GTK_STOCK_NEW, 16, 0,
-                                     (GError **) NULL);
+                                     GTK_STOCK_NEW, 16, 0, (GError **) NULL);
   return NULL;
 }
 
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index d126c17a..54e93b0a 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -448,10 +448,9 @@ on_fsinsertuploadbutton_clicked_fs (gpointer dummy, GtkWidget * uploadButton)
     filenamerest--;
   GNUNET_meta_data_insert (meta, EXTRACTOR_FILENAME, filenamerest);
   keywordURI = GNUNET_meta_data_to_uri (meta);
+  while (GNUNET_OK == GNUNET_meta_data_delete (meta, EXTRACTOR_SPLIT, NULL));
   while (GNUNET_OK ==
-         GNUNET_meta_data_delete (meta, EXTRACTOR_SPLIT, NULL));
-  while (GNUNET_OK ==
-         GNUNET_meta_data_delete (meta, EXTRACTOR_LOWERCASE, NULL));  
+         GNUNET_meta_data_delete (meta, EXTRACTOR_LOWERCASE, NULL));
   createMetaDataListTreeView (metaXML,
                               "metaDataDialogMetaDataList",
                               "previewImage", meta);
@@ -671,15 +670,13 @@ on_clearCompletedUploads_clicked_fs (void *unused, GtkWidget * clearButton)
 
 static void
 do_copy_uri (GtkTreeModel * model,
-             GtkTreePath * path,
-             GtkTreeIter * iter, gpointer unused)
+             GtkTreePath * path, GtkTreeIter * iter, gpointer unused)
 {
   char *str;
   GtkClipboard *clip;
 
-  gtk_tree_model_get (model,
-                      iter, UPLOAD_URISTRING, &str, -1);
-  clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);  
+  gtk_tree_model_get (model, iter, UPLOAD_URISTRING, &str, -1);
+  clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
   gtk_clipboard_set_text (clip, str, strlen (str));
   GNUNET_free (str);
 }
@@ -694,8 +691,7 @@ on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget * dummy2)
     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, &do_copy_uri, NULL);
+  GNUNET_GTK_tree_selection_selected_foreach (selection, &do_copy_uri, NULL);
   return FALSE;
 }