1 files changed, 67 insertions, 36 deletions

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;
 };