1 files changed, 15 insertions, 37 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index ccc2e2a1..9219bf8e 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -358,10 +358,12 @@ on_search_summary_selection_changed (gpointer signal, gpointer cls)
                             > 0);
 }
 
-static int
-on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
+int
+on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget *dummy2)
 {
-  GtkTreeView *uploadList = cls;
+  GtkWidget *uploadsList =
+    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
+                          "activeUploadsList");
   GtkTreePath *path;
   GtkTreeIter iter;
   struct GNUNET_ECRS_URI *uri;
@@ -369,7 +371,7 @@ on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   GtkClipboard *clip;
 
   path = NULL;
-  if (FALSE == gtk_tree_view_get_path_at_pos (uploadList,
+  if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW(uploadsList),
                                               last_x,
                                               last_y,
                                               &path, NULL, NULL, NULL))
@@ -394,37 +396,6 @@ on_upload_copy_uri_activate (void *cls, GtkWidget * searchEntry)
   return FALSE;
 }
 
-static gint
-upload_click_handler (void *cls, GdkEvent * event)
-{
-  GtkTreeView *uploadList = cls;
-  GtkMenu *menu;
-  GtkWidget *entry;
-  GdkEventButton *event_button;
-
-  if ((event == NULL) || (event->type != GDK_BUTTON_PRESS))
-    return FALSE;
-  event_button = (GdkEventButton *) event;
-  if (event_button->button != 3)
-    return FALSE;
-  last_x = event_button->x;
-  last_y = event_button->y;
-  entry = gtk_menu_item_new_with_label (_("_Copy URI to Clipboard"));
-  g_signal_connect_swapped (entry,
-                            "activate",
-                            G_CALLBACK (on_upload_copy_uri_activate),
-                            uploadList);
-  gtk_label_set_use_underline (GTK_LABEL
-                               (gtk_bin_get_child (GTK_BIN (entry))), TRUE);
-  gtk_widget_show (entry);
-  menu = GTK_MENU (gtk_menu_new ());
-  gtk_menu_shell_append (GTK_MENU_SHELL (menu), entry);
-  gtk_menu_popup (menu,
-                  NULL,
-                  NULL, NULL, NULL, event_button->button, event_button->time);
-  return TRUE;
-}
-
 /**
  * Setup the summary views (in particular the models
  * and the renderers).
@@ -441,6 +412,7 @@ fs_summary_start ()
   GtkCellRenderer *renderer;
   GtkTreeViewColumn *column;
   int col;
+  GladeXML *contextMenuXML;
 
   /* keyword list setup */
   searchCB
@@ -530,6 +502,10 @@ fs_summary_start ()
                          "changed",
                          G_CALLBACK (&on_download_summary_selection_changed),
                          NULL, NULL, 0);
+  contextMenuXML =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                   "downloadsContextMenu", PACKAGE_NAME);
+  GNUNET_GTK_connect_glade_with_plugins (contextMenuXML);
 
   renderer = gtk_cell_renderer_text_new ();
   col = gtk_tree_view_insert_column_with_attributes (downloadList,
@@ -597,8 +573,6 @@ fs_summary_start ()
   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 */
                                        G_TYPE_STRING,   /* URI as string */
@@ -610,6 +584,10 @@ fs_summary_start ()
                          "changed",
                          G_CALLBACK (&on_upload_summary_selection_changed),
                          NULL, NULL, 0);
+  contextMenuXML =
+    glade_xml_new (GNUNET_GTK_get_glade_filename (),
+                   "uploadsContextMenu", PACKAGE_NAME);
+  GNUNET_GTK_connect_glade_with_plugins (contextMenuXML);
 
   renderer = gtk_cell_renderer_progress_new ();
   col = gtk_tree_view_insert_column_with_attributes (uploadList,