fixing 1376

2 files changed, 30 insertions, 49 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 9614aded..6c5efb3e 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -53,17 +53,6 @@ GtkTreeStore *download_summary;
 
 GtkTreeStore *upload_summary;
 
-/**
- * Last right-click event coordinates in summary.
- */
-static unsigned int last_x;
-
-/**
- * Last right-click event coordinates in summary.
- */
-static unsigned int last_y;
-
-
 void
 on_updateIntervalComboEntry_changed_fs (GtkWidget * button,
                                         GtkWidget * entryBox)
@@ -329,44 +318,6 @@ on_download_summary_selection_changed (gpointer signal, gpointer cls)
                             > 0);
 }
 
-int
-on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget * dummy2)
-{
-  GtkWidget *uploadsList =
-    glade_xml_get_widget (GNUNET_GTK_get_main_glade_XML (),
-                          "activeUploadsList");
-  GtkTreePath *path;
-  GtkTreeIter iter;
-  struct GNUNET_ECRS_URI *uri;
-  char *str;
-  GtkClipboard *clip;
-
-  path = NULL;
-  if (FALSE == gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (uploadsList),
-                                              last_x,
-                                              last_y,
-                                              &path, NULL, NULL, NULL))
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      return FALSE;
-    }
-  if (FALSE == gtk_tree_model_get_iter (GTK_TREE_MODEL (upload_summary),
-                                        &iter, path))
-    {
-      GNUNET_GE_BREAK (NULL, 0);
-      gtk_tree_path_free (path);
-      return FALSE;
-    }
-  gtk_tree_path_free (path);
-  uri = NULL;
-  gtk_tree_model_get (GTK_TREE_MODEL (upload_summary),
-                      &iter, UPLOAD_URISTRING, &str, -1);
-  clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
-  gtk_clipboard_set_text (clip, str, strlen (str));
-  GNUNET_free (str);
-  return FALSE;
-}
-
 /**
  * Setup the summary views (in particular the models
  * and the renderers).
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index a9103db9..4b17e2c6 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -666,6 +666,36 @@ on_clearCompletedUploads_clicked_fs (void *unused, GtkWidget * clearButton)
 }
 
 static void
+do_copy_uri (GtkTreeModel * model,
+             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_clipboard_set_text (clip, str, strlen (str));
+  GNUNET_free (str);
+}
+
+int
+on_upload_copy_uri_activate_fs (void *dummy1, GtkWidget * dummy2)
+{
+  GtkTreeSelection *selection;
+  GtkWidget *uploadList;
+
+  uploadList =
+    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);
+  return FALSE;
+}
+
+static void
 fsuiCallUploadCallback (GtkTreeModel * model,
                         GtkTreePath * path,
                         GtkTreeIter * iter, gpointer fsui_call)