1 files changed, 102 insertions, 94 deletions

diff --git a/src/fs/gnunet-fs-gtk-event_handler.c b/src/fs/gnunet-fs-gtk-event_handler.c
index 631c3426..ac734af5 100644
--- a/src/fs/gnunet-fs-gtk-event_handler.c
+++ b/src/fs/gnunet-fs-gtk-event_handler.c
@@ -161,24 +161,23 @@ stop_download (struct DownloadEntry *de, int is_suspend)
   GtkTreePath *path;
   GtkTreeModel *tm;
   struct SearchResult *search_result;
- 
+
   path = gtk_tree_row_reference_get_path (de->rr);
   tm = gtk_tree_row_reference_get_model (de->rr);
   if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
     GNUNET_break (0);
   else
-    {
-      gtk_tree_model_get (tm, &iter,
-                          9, &search_result, -1);
-      /*Always fails on downloads started by Download URI*/
-      /*GNUNET_assert (search_result->download == de);*/
-      search_result->download = NULL;
-      if (NULL == search_result->result) 
-        (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
-      else
-        change_download_colour (de, "white");
-    }
-  gtk_tree_path_free (path);  
+  {
+    gtk_tree_model_get (tm, &iter, 9, &search_result, -1);
+    /*Always fails on downloads started by Download URI */
+    /*GNUNET_assert (search_result->download == de); */
+    search_result->download = NULL;
+    if (NULL == search_result->result)
+      (void) gtk_tree_store_remove (GTK_TREE_STORE (tm), &iter);
+    else
+      change_download_colour (de, "white");
+  }
+  gtk_tree_path_free (path);
   gtk_tree_row_reference_free (de->rr);
   GNUNET_FS_uri_destroy (de->uri);
   GNUNET_CONTAINER_meta_data_destroy (de->meta);
@@ -332,7 +331,7 @@ mark_download_completed (struct DownloadEntry *de, uint64_t size,
                          const char *filename)
 {
   struct AddDirectoryEntryContext ade;
-  
+
   de->is_done = GNUNET_YES;
   (void) mark_download_progress (de, size, size, NULL, 0, 0, 0);
   if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (de->meta)) &&
@@ -481,7 +480,7 @@ download_lost_parent (struct DownloadEntry *de, uint64_t size,
   GtkTreeModel *tm_old;
   GtkTreeIter iter_old;
   GtkTreeIter child;
-  GtkTreeModel * model;
+  GtkTreeModel *model;
 
   rr_old = de->rr;
   tab = GNUNET_GTK_add_to_uri_tab (&iter, &de->sr, de->meta, de->uri);
@@ -498,19 +497,19 @@ download_lost_parent (struct DownloadEntry *de, uint64_t size,
   if (NULL == path)
   {
     GNUNET_break (0);
-    return NULL; 
+    return NULL;
   }
   if (TRUE != gtk_tree_model_get_iter (tm_old, &iter_old, path))
   {
     GNUNET_break (0);
     gtk_tree_path_free (path);
-    return NULL; 
+    return NULL;
   }
   gtk_tree_path_free (path);
   move_children (tm_old, &iter_old, model, &iter);
-  while (TRUE == gtk_tree_model_iter_children (model, &child, &iter))    
+  while (TRUE == gtk_tree_model_iter_children (model, &child, &iter))
     delete_stale_subtree (model, &child);
-   if (size > completed)
+  if (size > completed)
   {
     if (is_active)
       change_download_colour (de, "yellow");
@@ -540,8 +539,7 @@ download_lost_parent (struct DownloadEntry *de, uint64_t size,
 static struct DownloadEntry *
 setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                 struct SearchResult *sr, struct GNUNET_FS_DownloadContext *dc,
-                const struct GNUNET_FS_Uri *uri,
-                const char *filename,
+                const struct GNUNET_FS_Uri *uri, const char *filename,
                 const struct GNUNET_CONTAINER_MetaData *meta, uint64_t size,
                 uint64_t completed)
 {
@@ -556,12 +554,12 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
     de->uri = GNUNET_FS_uri_dup (uri);
   }
   de->dc = dc;
-  de->sr = sr;  
+  de->sr = sr;
   if (NULL != sr)
   {
     GNUNET_assert (sr->download == NULL);
     sr->download = de;
-  } 
+  }
   de->pde = pde;
   if ((meta != NULL) && (de->meta == NULL))
     de->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
@@ -593,7 +591,7 @@ setup_download (struct DownloadEntry *de, struct DownloadEntry *pde,
                       (guint) ((size >
                                 0) ? (100 * completed /
                                       size) : 100) /* progress */ ,
-                      6, filename_utf8 /* filename/description */ ,
+                      6, filename_utf8 /* filename/description */ ,
                       8, "blue" /* status colour: pending */ ,
                       -1);
   GNUNET_free_non_null (filename_utf8);
@@ -626,8 +624,7 @@ start_download (GtkTreeView * tree_view, GtkTreePath * path,
     return;
   }
   gtk_tree_model_get (tm, &iter, 0, &meta, 1, &uri, 9, &sr, 10, &mime, -1);
-  if (! (GNUNET_FS_uri_test_chk (uri) ||
-         GNUNET_FS_uri_test_loc (uri)) )
+  if (!(GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)))
   {
     /* can only download chk/loc URIs, ignore */
     g_free (mime);
@@ -787,9 +784,9 @@ search_list_on_menu (GtkWidget * widget, GdkEvent * event, gpointer user_data)
       tm = gtk_tree_view_get_model (tv);
       if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
       {
-        /* model empty? */
-        current_context_search_tab = NULL;
-        return FALSE;
+        /* model empty? */
+        current_context_search_tab = NULL;
+        return FALSE;
       }
       gtk_tree_model_get (tm, &iter, 9, &sr, -1);
       current_context_row_reference = gtk_tree_row_reference_new (tm, path);
@@ -989,7 +986,7 @@ handle_publish_stop (struct PublishEntry *ent)
   }
   if (NULL != ent->pc)
   {
-     /* get piter from parent */
+    /* get piter from parent */
     path = gtk_tree_row_reference_get_path (ent->rr);
     tm = gtk_tree_row_reference_get_model (ent->rr);
     if (TRUE != gtk_tree_model_get_iter (tm, &iter, path))
@@ -1046,8 +1043,8 @@ clear_downloads (GtkButton * button, gpointer user_data)
   do
   {
     gtk_tree_model_get (tm, &iter, 9, &sr, -1);
-    if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))    
-      GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);      
+    if ((sr->download != NULL) && (sr->download->is_done == GNUNET_YES))
+      GNUNET_FS_download_stop (sr->download->dc, GNUNET_YES);
   }
   while (TRUE == gtk_tree_model_iter_next (tm, &iter));
 }
@@ -1281,8 +1278,8 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
   }
   desc =
       GNUNET_CONTAINER_meta_data_get_first_by_types (meta,
-                                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME, 
-                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
+                                                     EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME,
+                                                     EXTRACTOR_METATYPE_PACKAGE_NAME,
                                                      EXTRACTOR_METATYPE_TITLE,
                                                      EXTRACTOR_METATYPE_BOOK_TITLE,
                                                      EXTRACTOR_METATYPE_FILENAME,
@@ -1298,7 +1295,10 @@ GNUNET_GTK_add_search_result (struct SearchTab *tab, GtkTreeIter * iter,
   else
   {
     char *utf8_desc = NULL;
-    utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc, strlen (desc) + 1);
+
+    utf8_desc =
+        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+                                            strlen (desc) + 1);
     GNUNET_free (desc);
     if (utf8_desc != NULL)
       desc = utf8_desc;
@@ -1485,7 +1485,10 @@ update_search_result (struct SearchResult *sr,
   else
   {
     char *utf8_desc = NULL;
-    utf8_desc = GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc, strlen (desc) + 1);
+
+    utf8_desc =
+        GNUNET_FS_GTK_dubious_meta_to_utf8 (EXTRACTOR_METAFORMAT_UTF8, desc,
+                                            strlen (desc) + 1);
     GNUNET_free (desc);
     if (utf8_desc != NULL)
       desc = utf8_desc;
@@ -1590,7 +1593,7 @@ stop_publishing (GtkButton * button, gpointer user_data)
   GtkNotebook *notebook;
   int index;
   int i;
- 
+
   GNUNET_assert (tab == publish_tab);
   tm = GTK_TREE_MODEL (publish_tab->ts);
   if (TRUE == gtk_tree_model_iter_children (tm, &iter, NULL))
@@ -1599,16 +1602,16 @@ stop_publishing (GtkButton * button, gpointer user_data)
     {
       gtk_tree_model_get (tm, &iter, 4, &ent, -1);
       if (NULL != (pc = ent->pc))
-        {
-          ent->pc = NULL;
-          GNUNET_FS_publish_stop (pc);
-        }
+      {
+        ent->pc = NULL;
+        GNUNET_FS_publish_stop (pc);
+      }
     }
     while (TRUE == gtk_tree_model_iter_next (tm, &iter));
   }
   notebook =
-    GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                  ("GNUNET_GTK_main_window_notebook"));
+      GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+                    ("GNUNET_GTK_main_window_notebook"));
   index = -1;
   for (i = gtk_notebook_get_n_pages (notebook) - 1; i >= 0; i--)
     if (publish_tab->frame == gtk_notebook_get_nth_page (notebook, i))
@@ -1643,40 +1646,40 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
       /* create new tab */
       publish_tab = GNUNET_malloc (sizeof (struct PublishTab));
       publish_tab->builder =
-        GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
+          GNUNET_GTK_get_new_builder ("gnunet_fs_gtk_publish_tab.glade");
       df = GTK_WINDOW (gtk_builder_get_object
-                       (publish_tab->builder, "_publish_frame_window"));
+                       (publish_tab->builder, "_publish_frame_window"));
       publish_tab->frame = gtk_bin_get_child (GTK_BIN (df));
       g_object_ref (publish_tab->frame);
       gtk_container_remove (GTK_CONTAINER (df), publish_tab->frame);
       gtk_widget_destroy (GTK_WIDGET (df));
-      
+
       /* load tab_label */
       df = GTK_WINDOW (gtk_builder_get_object
-                       (publish_tab->builder, "_publish_label_window"));
+                       (publish_tab->builder, "_publish_label_window"));
       tab_label = gtk_bin_get_child (GTK_BIN (df));
       g_object_ref (tab_label);
       gtk_container_remove (GTK_CONTAINER (df), tab_label);
       gtk_widget_destroy (GTK_WIDGET (df));
-      
+
       /* get refs to widgets */
       close_button =
-        GTK_WIDGET (gtk_builder_get_object
-                    (publish_tab->builder, "_publish_label_close_button"));
+          GTK_WIDGET (gtk_builder_get_object
+                      (publish_tab->builder, "_publish_label_close_button"));
       g_signal_connect (G_OBJECT (close_button), "clicked",
-                        G_CALLBACK (stop_publishing), publish_tab);
+                        G_CALLBACK (stop_publishing), publish_tab);
       /* FIXME: we don't actually need the closure anymore,
-         so we could have glade connect the above signal... */
+       * so we could have glade connect the above signal... */
       /* make visible */
       notebook =
-        GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
-                      ("GNUNET_GTK_main_window_notebook"));
+          GTK_NOTEBOOK (GNUNET_FS_GTK_get_main_window_object
+                        ("GNUNET_GTK_main_window_notebook"));
       gtk_notebook_insert_page (notebook, publish_tab->frame, tab_label, 0);
       gtk_widget_show (GTK_WIDGET (notebook));
       gtk_notebook_set_current_page (notebook, 0);
       publish_tab->ts =
-        GTK_TREE_STORE (gtk_builder_get_object
-                        (publish_tab->builder, "_publish_frame_tree_store"));
+          GTK_TREE_STORE (gtk_builder_get_object
+                          (publish_tab->builder, "_publish_frame_tree_store"));
       pitrptr = NULL;
     }
     else
@@ -1690,7 +1693,8 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
     /* create new iter from parent */
     path = gtk_tree_row_reference_get_path (parent->rr);
     if (TRUE !=
-        gtk_tree_model_get_iter (GTK_TREE_MODEL (publish_tab->ts), &piter, path))
+        gtk_tree_model_get_iter (GTK_TREE_MODEL (publish_tab->ts), &piter,
+                                 path))
     {
       GNUNET_break (0);
       return NULL;
@@ -1703,11 +1707,9 @@ setup_publish (struct GNUNET_FS_PublishContext *pc, const char *fn,
   ent->tab = publish_tab;
   fn_utf8 = GNUNET_GTK_from_loc_to_utf8 ((char *) fn);
   gtk_tree_store_insert_with_values (publish_tab->ts, &iter, pitrptr, G_MAXINT,
-                                     0, fn_utf8,
-                                     1, size_fancy, 2, "white", 3,
+                                     0, fn_utf8, 1, size_fancy, 2, "white", 3,
                                      (guint) 0 /* progress */ ,
-                                     4, ent,
-                                     -1);
+                                     4, ent, -1);
   GNUNET_free_non_null (fn_utf8);
   path = gtk_tree_model_get_path (GTK_TREE_MODEL (publish_tab->ts), &iter);
   GNUNET_assert (NULL != path);
@@ -1786,7 +1788,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
     return setup_download (info->value.download.cctx, info->value.download.pctx,
                            info->value.download.sctx, info->value.download.dc,
                            info->value.download.uri,
-                           info->value.download.filename,
+                           info->value.download.filename,
                            info->value.download.specifics.start.meta,
                            info->value.download.size,
                            info->value.download.completed);
@@ -1794,8 +1796,7 @@ GNUNET_GTK_fs_event_handler (void *cls,
     ret =
         setup_download (info->value.download.cctx, info->value.download.pctx,
                         info->value.download.sctx, info->value.download.dc,
-                        info->value.download.uri,
-                        info->value.download.filename,
+                        info->value.download.uri, info->value.download.filename,
                         info->value.download.specifics.resume.meta,
                         info->value.download.size,
                         info->value.download.completed);
@@ -1980,8 +1981,8 @@ GNUNET_GTK_main_window_notebook_switch_page_cb (GtkWidget * dummy,
 }
 
 static void
-copy_metadata_to_clipboard (GtkTreeModel *model, GtkTreePath *path,
-    GtkTreeIter *iter, gpointer user_data)
+copy_metadata_to_clipboard (GtkTreeModel * model, GtkTreePath * path,
+                            GtkTreeIter * iter, gpointer user_data)
 {
   gchar *type, *value;
   GList **l = (GList **) user_data;
@@ -1993,7 +1994,7 @@ copy_metadata_to_clipboard (GtkTreeModel *model, GtkTreePath *path,
 }
 
 void
-metadata_copy_selection_activated (GtkMenuItem *menuitem, gpointer user_data)
+metadata_copy_selection_activated (GtkMenuItem * menuitem, gpointer user_data)
 {
   GtkBuilder *builder;
   GtkTreeView *tree;
@@ -2003,11 +2004,12 @@ metadata_copy_selection_activated (GtkMenuItem *menuitem, gpointer user_data)
   gchar *s, *p;
 
   builder = GTK_BUILDER (user_data);
-  tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-      "GNUNET_GTK_main_window_metadata_treeview"));
+  tree =
+      GTK_TREE_VIEW (gtk_builder_get_object
+                     (builder, "GNUNET_GTK_main_window_metadata_treeview"));
 
   gtk_tree_selection_selected_foreach (gtk_tree_view_get_selection (tree),
-      copy_metadata_to_clipboard, &pairs);
+                                       copy_metadata_to_clipboard, &pairs);
 
   total_len = 0;
   pairs = g_list_reverse (pairs);
@@ -2018,12 +2020,13 @@ metadata_copy_selection_activated (GtkMenuItem *menuitem, gpointer user_data)
     if (!value)
       break;
     next = value->next;
-    total_len += strlen ((gchar *) type->data)
-        + strlen ((gchar *) value->data) + 2 /* ": " */ + (next ? 1 : 0) /* "\n" */;
+    total_len +=
+        strlen ((gchar *) type->data) + strlen ((gchar *) value->data) +
+        2 /* ": " */  + (next ? 1 : 0) /* "\n" */ ;
   }
   if (total_len > 0)
   {
-    total_len += 1; /* "\0" */
+    total_len += 1;             /* "\0" */
     s = g_new0 (gchar, total_len);
     p = s;
     for (l = pairs; l; l = next)
@@ -2057,8 +2060,8 @@ metadata_copy_selection_activated (GtkMenuItem *menuitem, gpointer user_data)
 }
 
 void
-metadata_menu_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in,
-    gpointer user_data)
+metadata_menu_popup_position (GtkMenu * menu, gint * x, gint * y,
+                              gboolean * push_in, gpointer user_data)
 {
   GtkBuilder *builder;
   GtkTreeView *tree;
@@ -2071,8 +2074,9 @@ metadata_menu_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in
 
   builder = GTK_BUILDER (user_data);
 
-  tree = GTK_TREE_VIEW (gtk_builder_get_object (builder,
-      "GNUNET_GTK_main_window_metadata_treeview"));
+  tree =
+      GTK_TREE_VIEW (gtk_builder_get_object
+                     (builder, "GNUNET_GTK_main_window_metadata_treeview"));
 
   gtk_widget_get_allocation (GTK_WIDGET (tree), &tree_allocation);
 
@@ -2092,6 +2096,7 @@ metadata_menu_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in
   if (rows->data)
   {
     GdkRectangle r;
+
     p = (GtkTreePath *) rows->data;
     gtk_tree_view_get_cell_area (tree, p, NULL, &r);
     popup_x += r.x;
@@ -2106,8 +2111,8 @@ metadata_menu_popup_position (GtkMenu *menu, gint *x, gint *y, gboolean *push_in
 }
 
 static void
-do_metadata_popup_menu (GtkWidget *widget, GdkEventButton *event,
-    gpointer user_data)
+do_metadata_popup_menu (GtkWidget * widget, GdkEventButton * event,
+                        gpointer user_data)
 {
   GtkMenu *menu;
   GtkBuilder *builder;
@@ -2119,25 +2124,28 @@ do_metadata_popup_menu (GtkWidget *widget, GdkEventButton *event,
   menu = GTK_MENU (gtk_builder_get_object (builder, "metadata_popup_menu"));
 
   if (event)
-    {
-      button = event->button;
-      event_time = event->time;
-    }
+  {
+    button = event->button;
+    event_time = event->time;
+  }
   else
-    {
-      button = 0;
-      event_time = gtk_get_current_event_time ();
-    }
+  {
+    button = 0;
+    event_time = gtk_get_current_event_time ();
+  }
 
-  gtk_menu_popup (menu, NULL, NULL, mpf, user_data, 
-                  button, event_time);
+  gtk_menu_popup (menu, NULL, NULL, mpf, user_data, button, event_time);
 }
 
 gboolean
-GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget *widget,
-    GdkEventButton *event, gpointer user_data)
+GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget *
+                                                                widget,
+                                                                GdkEventButton *
+                                                                event,
+                                                                gpointer
+                                                                user_data)
 {
- /* Ignore double-clicks and triple-clicks */
+  /* Ignore double-clicks and triple-clicks */
   if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
   {
     do_metadata_popup_menu (widget, event, user_data);
@@ -2148,8 +2156,8 @@ GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb (GtkWidget *widge
 }
 
 gboolean
-GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb (GtkWidget *widget,
-    gpointer user_data)
+GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb (GtkWidget * widget,
+                                                        gpointer user_data)
 {
   do_metadata_popup_menu (widget, NULL, user_data);
   return TRUE;