1 files changed, 167 insertions, 178 deletions

diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index b92b50a3..d924b26b 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -98,93 +98,93 @@ updateSearchSummary (SearchList * searchContext)
 }
 
 static GdkPixbuf *
-make_ranking_pixbuf(int availability_rank,
-                    unsigned int availability_certainty,
-                    unsigned int applicability_rank,
-                    unsigned int kwords)
+make_ranking_pixbuf (int availability_rank,
+                     unsigned int availability_certainty,
+                     unsigned int applicability_rank, unsigned int kwords)
 {
   GdkPixbuf *pixbuf;
-  guchar * pixels;
-  guchar * pixel;
+  guchar *pixels;
+  guchar *pixel;
   int n_channels;
   int rowstride;
   unsigned int x;
   unsigned int y;
 
 #define P_HEIGHT 21
-#define P_WIDTH 60 
-  pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB,
-                          TRUE, /* alpha */
-                          8, /* bits per sample */
-                          P_WIDTH, /* width */
-                          P_HEIGHT /* height */
-                          );
+#define P_WIDTH 60
+  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE,    /* alpha */
+                           8,   /* bits per sample */
+                           P_WIDTH,     /* width */
+                           P_HEIGHT     /* height */
+    );
   n_channels = gdk_pixbuf_get_n_channels (pixbuf);
-  pixels = gdk_pixbuf_get_pixels(pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride(pixbuf);
-  for (x=0;x<P_WIDTH;x++)
-    for (y=0;y<P_HEIGHT;y++)
+  pixels = gdk_pixbuf_get_pixels (pixbuf);
+  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
+  for (x = 0; x < P_WIDTH; x++)
+    for (y = 0; y < P_HEIGHT; y++)
       {
-        pixel = pixels + y * rowstride + x * n_channels;
+        pixel = pixels + y * rowstride + x * n_channels;
 #define PX_RED 0
 #define PX_GREEN 1
 #define PX_BLUE 2
 #define PX_ALPHA 3
-        pixel[PX_RED]   = 0;
-        pixel[PX_GREEN] = 0;
-        pixel[PX_BLUE]  = 0;
-        pixel[PX_ALPHA] = 0;
-        if (y < P_HEIGHT / 2)
-          {
-            /* applicability */
-            if (x * kwords < applicability_rank * P_WIDTH)
-              {
-                pixel[PX_RED]   = 0;
-                pixel[PX_GREEN] = 0;
-                pixel[PX_BLUE]  = 255;
-                pixel[PX_ALPHA] = 255;
-              }
-          }
-        else if ( (y > P_HEIGHT / 2) &&
-                  ( (y-P_HEIGHT/2) * GNUNET_FSUI_MAX_PROBES 
-                    < availability_certainty * P_HEIGHT / 2) )
-          {
-            /* availability */
-            if (availability_rank < 0)
-              {
-                if ( (x * GNUNET_FSUI_MAX_PROBES > (GNUNET_FSUI_MAX_PROBES+availability_rank) * P_WIDTH/2) &&
-                     (x <= P_WIDTH/2) )
-                  {
-                    pixel[PX_RED]   = 255;
-                    pixel[PX_GREEN] = 0;
-                    pixel[PX_BLUE]  = 0;
-                    pixel[PX_ALPHA] = 255;
-                  }
-              }
-            else if (availability_rank > 0)
-              {
-                if ( (x >= P_WIDTH/2) &&
-                     ( (x - (P_WIDTH/2)) * GNUNET_FSUI_MAX_PROBES < availability_rank * P_WIDTH/2) )
-                  {
-                    pixel[PX_RED]   = 0;
-                    pixel[PX_GREEN] = 255;
-                    pixel[PX_BLUE]  = 0;
-                    pixel[PX_ALPHA] = 255;
-                  }
-              }
-            else
-              {
-                if (x == P_WIDTH / 2)
-                  {
-                    /* yellow */
-                    pixel[PX_RED]   = 255;
-                    pixel[PX_GREEN] = 255;
-                    pixel[PX_BLUE]  = 0;
-                    pixel[PX_ALPHA] = 255;
-                  }
-              }
-          }
-      } 
+        pixel[PX_RED] = 0;
+        pixel[PX_GREEN] = 0;
+        pixel[PX_BLUE] = 0;
+        pixel[PX_ALPHA] = 0;
+        if (y < P_HEIGHT / 2)
+          {
+            /* applicability */
+            if (x * kwords < applicability_rank * P_WIDTH)
+              {
+                pixel[PX_RED] = 0;
+                pixel[PX_GREEN] = 0;
+                pixel[PX_BLUE] = 255;
+                pixel[PX_ALPHA] = 255;
+              }
+          }
+        else if ((y > P_HEIGHT / 2) &&
+                 ((y - P_HEIGHT / 2) * GNUNET_FSUI_MAX_PROBES
+                  < availability_certainty * P_HEIGHT / 2))
+          {
+            /* availability */
+            if (availability_rank < 0)
+              {
+                if ((x * GNUNET_FSUI_MAX_PROBES >
+                     (GNUNET_FSUI_MAX_PROBES +
+                      availability_rank) * P_WIDTH / 2) && (x <= P_WIDTH / 2))
+                  {
+                    pixel[PX_RED] = 255;
+                    pixel[PX_GREEN] = 0;
+                    pixel[PX_BLUE] = 0;
+                    pixel[PX_ALPHA] = 255;
+                  }
+              }
+            else if (availability_rank > 0)
+              {
+                if ((x >= P_WIDTH / 2) &&
+                    ((x - (P_WIDTH / 2)) * GNUNET_FSUI_MAX_PROBES <
+                     availability_rank * P_WIDTH / 2))
+                  {
+                    pixel[PX_RED] = 0;
+                    pixel[PX_GREEN] = 255;
+                    pixel[PX_BLUE] = 0;
+                    pixel[PX_ALPHA] = 255;
+                  }
+              }
+            else
+              {
+                if (x == P_WIDTH / 2)
+                  {
+                    /* yellow */
+                    pixel[PX_RED] = 255;
+                    pixel[PX_GREEN] = 255;
+                    pixel[PX_BLUE] = 0;
+                    pixel[PX_ALPHA] = 255;
+                  }
+              }
+          }
+      }
   return pixbuf;
 }
 
@@ -211,34 +211,26 @@ 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_size (info->
-                                                                       uri) :
-    0;
+    || GNUNET_ECRS_uri_test_loc (info->uri) ?
+    GNUNET_ECRS_uri_get_file_size (info->uri) : 0;
   pixbuf = getThumbnailFromMetaData (info->meta);
   size_h = GNUNET_get_byte_size_as_fancy_string (size);
-  rankbuf = make_ranking_pixbuf(0, 0, 1,
-                                GNUNET_ECRS_uri_get_keyword_count_from_ksk(searchContext->uri));
-  gtk_tree_store_set (searchContext->tree,
-                      iter,
-                      SEARCH_NAME, name,
-                      SEARCH_SIZE, size,
-                      SEARCH_HSIZE, size_h,
-                      SEARCH_MIME, mime,
-                      SEARCH_DESC, desc,
-                      SEARCH_PIXBUF, pixbuf,
+  rankbuf = make_ranking_pixbuf (0, 0, 1,
+                                 GNUNET_ECRS_uri_get_keyword_count_from_ksk
+                                 (searchContext->uri));
+  gtk_tree_store_set (searchContext->tree, iter, SEARCH_NAME, name,
+                      SEARCH_SIZE, size, SEARCH_HSIZE, size_h, SEARCH_MIME,
+                      mime, 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,
-                      SEARCH_STATUS, getStatusName (state), 
-                      SEARCH_APPLICABILITY_RANK, 1, 
-                      SEARCH_RANK_SORT, (long long) 1,
-                      SEARCH_RANK_PIXBUF, rankbuf,
-                      -1);
-  g_object_unref(rankbuf);
+                      SEARCH_CELL_FG_COLOR, "black", SEARCH_INTERNAL,
+                      searchContext, SEARCH_INTERNAL_PARENT, downloadParent,
+                      SEARCH_STATUS, getStatusName (state),
+                      SEARCH_APPLICABILITY_RANK, 1, SEARCH_RANK_SORT,
+                      (long long) 1, SEARCH_RANK_PIXBUF, rankbuf, -1);
+  g_object_unref (rankbuf);
   if (pixbuf != NULL)
     g_object_unref (pixbuf);
   GNUNET_free (size_h);
@@ -301,11 +293,12 @@ fs_search_result_received (SearchList * searchContext,
  * @param availability_rank availability estimate
  * @param applicability_rank relevance
  */
-void fs_search_update (SearchList * searchContext,
-                       const GNUNET_ECRS_FileInfo * info,
-                       int availability_rank,
-                       unsigned int availability_certainty,
-                       unsigned int applicability_rank)
+void
+fs_search_update (SearchList * searchContext,
+                  const GNUNET_ECRS_FileInfo * info,
+                  int availability_rank,
+                  unsigned int availability_certainty,
+                  unsigned int applicability_rank)
 {
   GtkTreeStore *model;
   GtkTreeIter iter;
@@ -314,7 +307,7 @@ void fs_search_update (SearchList * searchContext,
   long long rank;
   unsigned int kwords;
 
-  kwords = GNUNET_ECRS_uri_get_keyword_count_from_ksk(searchContext->uri);
+  kwords = GNUNET_ECRS_uri_get_keyword_count_from_ksk (searchContext->uri);
   model = GTK_TREE_STORE (gtk_tree_view_get_model (searchContext->treeview));
   /* find existing entry */
   if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter))
@@ -324,31 +317,33 @@ void fs_search_update (SearchList * searchContext,
           have = NULL;
           gtk_tree_model_get (GTK_TREE_MODEL (model),
                               &iter, SEARCH_URI, &have, -1);
-          if ( (have != NULL) && 
-               (GNUNET_ECRS_uri_test_equal (have, info->uri)) )
-            {
-              /* gotcha, create pixbuf and rank info! */
-              rank = (int) applicability_rank + (int) (availability_rank * (int) availability_certainty * 65536);
-              pixbuf = make_ranking_pixbuf(availability_rank,
-                                           availability_certainty,
-                                           applicability_rank,
-                                           kwords);
-              gtk_tree_store_set(searchContext->tree,
-                                 &iter,
-                                 SEARCH_AVAILABILITY_RANK, availability_rank,
-                                 SEARCH_AVAILABILITY_CERTAINTY, availability_certainty,
-                                 SEARCH_APPLICABILITY_RANK, applicability_rank,
-                                 SEARCH_RANK_PIXBUF, pixbuf,
-                                 SEARCH_RANK_SORT, rank,
-                                 -1);
-              g_object_unref (pixbuf);
-              return; /* done! */
-            }
+          if ((have != NULL) &&
+              (GNUNET_ECRS_uri_test_equal (have, info->uri)))
+            {
+              /* gotcha, create pixbuf and rank info! */
+              rank =
+                (int) applicability_rank +
+                (int) (availability_rank * (int) availability_certainty *
+                       65536);
+              pixbuf =
+                make_ranking_pixbuf (availability_rank,
+                                     availability_certainty,
+                                     applicability_rank, kwords);
+              gtk_tree_store_set (searchContext->tree, &iter,
+                                  SEARCH_AVAILABILITY_RANK, availability_rank,
+                                  SEARCH_AVAILABILITY_CERTAINTY,
+                                  availability_certainty,
+                                  SEARCH_APPLICABILITY_RANK,
+                                  applicability_rank, SEARCH_RANK_PIXBUF,
+                                  pixbuf, SEARCH_RANK_SORT, rank, -1);
+              g_object_unref (pixbuf);
+              return;           /* done! */
+            }
         }
       while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
     }
   /* not found!? */
-  GNUNET_GE_BREAK(NULL, 0);
+  GNUNET_GE_BREAK (NULL, 0);
 }
 
 
@@ -361,10 +356,10 @@ on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
   GtkTreePath *path;
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *uri;
-  struct GNUNET_ECRS_MetaData * meta;
+  struct GNUNET_ECRS_MetaData *meta;
   char *str;
-  GladeXML * xml;
-  GtkWidget * dialog;
+  GladeXML *xml;
+  GtkWidget *dialog;
 
   path = NULL;
   if (FALSE == gtk_tree_view_get_path_at_pos (list->treeview,
@@ -386,21 +381,14 @@ on_search_display_metadata_activate (void *cls, GtkWidget * searchEntry)
   uri = NULL;
   meta = NULL;
   gtk_tree_model_get (GTK_TREE_MODEL (list->tree),
-                      &iter,
-                      SEARCH_URI, &uri, 
-                      SEARCH_META, &meta,
-                      -1);
+                      &iter, SEARCH_URI, &uri, SEARCH_META, &meta, -1);
   str = GNUNET_ECRS_uri_to_string (uri);
-  xml = glade_xml_new(GNUNET_GTK_get_glade_filename (),
-                      "metaDisplayDialog",
-                      PACKAGE_NAME);
+  xml = glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                       "metaDisplayDialog", PACKAGE_NAME);
   GNUNET_GTK_connect_glade_with_plugins (xml);
-  dialog = glade_xml_get_widget (xml, "metaDisplayDialog"); 
-  gtk_window_set_title(GTK_WINDOW(dialog), str);
-  createMetaDataListTreeView(xml,
-                             "metaDisplayDialogTreeView",
-                             NULL,
-                             meta);
+  dialog = glade_xml_get_widget (xml, "metaDisplayDialog");
+  gtk_window_set_title (GTK_WINDOW (dialog), str);
+  createMetaDataListTreeView (xml, "metaDisplayDialogTreeView", NULL, meta);
   gtk_dialog_run (GTK_DIALOG (dialog));
   GNUNET_free_non_null (str);
   gtk_widget_destroy (dialog);
@@ -571,7 +559,8 @@ search_click_handler (void *cls, GdkEvent * event)
   entry = gtk_menu_item_new_with_label (_("_Display metadata"));
   g_signal_connect_swapped (entry,
                             "activate",
-                            G_CALLBACK (on_search_display_metadata_activate), list);
+                            G_CALLBACK (on_search_display_metadata_activate),
+                            list);
   gtk_label_set_use_underline (GTK_LABEL
                                (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
   gtk_widget_show (entry);
@@ -626,7 +615,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   int i;
 
   /* check that search does not already exist
-     with fsui_list == NULL; 
+     with fsui_list == NULL;
      (and if so, hijack!) */
   list = search_head;
   while (list != NULL)
@@ -646,7 +635,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
     }
 
   /* build new entry */
-  if (GNUNET_ECRS_uri_test_ksk(uri))
+  if (GNUNET_ECRS_uri_test_ksk (uri))
     description = GNUNET_ECRS_ksk_uri_to_human_readable_string (uri);
   else
     description = GNUNET_NS_sks_uri_to_human_readable_string (ectx, cfg, uri);
@@ -677,8 +666,7 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   g_signal_connect_swapped (list->treeview,
                             "button-press-event",
                             G_CALLBACK (search_click_handler), list);
-  list->tree = gtk_tree_store_new (SEARCH_NUM,
-                                   G_TYPE_STRING,       /* name */
+  list->tree = gtk_tree_store_new (SEARCH_NUM, G_TYPE_STRING,   /* name */
                                    G_TYPE_UINT64,       /* size */
                                    G_TYPE_STRING,       /* human-readable size */
                                    G_TYPE_STRING,       /* mime-type */
@@ -691,12 +679,12 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                                    G_TYPE_POINTER,      /* internal: search list */
                                    G_TYPE_POINTER,      /* internal: download parent list */
                                    G_TYPE_STRING,       /* status */
-                                   G_TYPE_INT,          /* availability rank */
-                                   G_TYPE_UINT,         /* availability certainty */
-                                   G_TYPE_UINT,         /* applicability rank */
-                                   GDK_TYPE_PIXBUF,     /* ranking visualization */
-                                   G_TYPE_INT64         /* numeric sort */
-                                   );     
+                                   G_TYPE_INT,  /* availability rank */
+                                   G_TYPE_UINT, /* availability certainty */
+                                   G_TYPE_UINT, /* applicability rank */
+                                   GDK_TYPE_PIXBUF,     /* ranking visualization */
+                                   G_TYPE_INT64 /* numeric sort */
+    );
 
   gtk_tree_view_set_model (list->treeview, GTK_TREE_MODEL (list->tree));
   gtk_tree_selection_set_mode (gtk_tree_view_get_selection (list->treeview),
@@ -770,36 +758,39 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
   gtk_tree_view_column_set_reorderable (column, TRUE);
   gtk_tree_view_column_set_sort_column_id (column, SEARCH_MIME);
 
-#if 0  
+#if 0
   /* colums for data visualized graphically */
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_insert_column_with_attributes (list->treeview,
-                                               -1,
-                                               _("Availability"),
-                                               renderer,
-                                               "text", SEARCH_AVAILABILITY_RANK,
-                                               NULL);
+                                               -1,
+                                               _("Availability"),
+                                               renderer,
+                                               "text",
+                                               SEARCH_AVAILABILITY_RANK,
+                                               NULL);
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_insert_column_with_attributes (list->treeview,
-                                               -1,
-                                               _("Certainty"),
-                                               renderer,
-                                               "text", SEARCH_AVAILABILITY_CERTAINTY,
-                                               NULL);
+                                               -1,
+                                               _("Certainty"),
+                                               renderer,
+                                               "text",
+                                               SEARCH_AVAILABILITY_CERTAINTY,
+                                               NULL);
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_insert_column_with_attributes (list->treeview,
-                                               -1,
-                                               _("Applicability"),
-                                               renderer,
-                                               "text", SEARCH_APPLICABILITY_RANK,
-                                               NULL);
+                                               -1,
+                                               _("Applicability"),
+                                               renderer,
+                                               "text",
+                                               SEARCH_APPLICABILITY_RANK,
+                                               NULL);
   renderer = gtk_cell_renderer_text_new ();
   gtk_tree_view_insert_column_with_attributes (list->treeview,
-                                               -1,
-                                               _("Sort"),
-                                               renderer,
-                                               "text", SEARCH_RANK_SORT,
-                                               NULL);
+                                               -1,
+                                               _("Sort"),
+                                               renderer,
+                                               "text", SEARCH_RANK_SORT,
+                                               NULL);
 #endif
 
   renderer = gtk_cell_renderer_pixbuf_new ();
@@ -807,7 +798,8 @@ fs_search_started (struct GNUNET_FSUI_SearchList * fsui_list,
                                                      -1,
                                                      _("Ranking"),
                                                      renderer,
-                                                     "pixbuf", SEARCH_RANK_PIXBUF,
+                                                     "pixbuf",
+                                                     SEARCH_RANK_PIXBUF,
                                                      NULL);
   column = gtk_tree_view_get_column (list->treeview, col - 1);
   gtk_tree_view_column_set_resizable (column, FALSE);
@@ -913,10 +905,7 @@ freeIterSubtree (GtkTreeModel * tree, GtkTreeIter * iter)
       if (meta != NULL)
         GNUNET_ECRS_meta_data_destroy (meta);
       gtk_tree_store_set (GTK_TREE_STORE (tree),
-                          iter, 
-                          SEARCH_URI, NULL, 
-                          SEARCH_META, NULL,
-                          -1);
+                          iter, SEARCH_URI, NULL, SEARCH_META, NULL, -1);
       if (gtk_tree_model_iter_children (tree, &child, iter))
         freeIterSubtree (tree, &child);
     }
@@ -1229,7 +1218,7 @@ on_closeSearchButton_clicked_fs (GtkWidget * searchPage,
   GNUNET_GE_ASSERT (ectx, list != NULL);
   if (list->fsui_list == NULL)
     {
-      /* open directory or paused search; 
+      /* open directory or paused search;
          close directly */
       fs_search_stopped (list);
     }