1 files changed, 95 insertions, 1 deletions

diff --git a/src/plugins/fs/fs.c b/src/plugins/fs/fs.c
index 58ddc34a..1bf8877f 100644
--- a/src/plugins/fs/fs.c
+++ b/src/plugins/fs/fs.c
@@ -51,6 +51,17 @@ 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;
+
+
 static void *
 saveEventProcessor(void * cls) {
   const FSUI_Event * event = cls;
@@ -178,7 +189,7 @@ saveEventProcessor(void * cls) {
     ret = fs_upload_started(event->data.UploadResumed.uc.pos,
                             event->data.UploadResumed.uc.pcctx,
                             event->data.UploadResumed.filename,
-                            NULL, /* FIXME: maybe completed!? */
+                            event->data.UploadResumed.uri,
                             event->data.UploadResumed.total,
                             event->data.UploadResumed.completed,
                             event->data.UploadResumed.state);
@@ -271,6 +282,85 @@ static void on_search_summary_selection_changed(gpointer signal,
                            gtk_tree_selection_count_selected_rows(selection) > 0);
 }
 
+static int 
+on_upload_copy_uri_activate(void * cls,
+                            GtkWidget * searchEntry) {
+  GtkTreeView * uploadList = cls;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+  struct ECRS_URI * uri;
+  char * str;
+  GtkClipboard * clip;
+
+  path = NULL;
+  if (FALSE == gtk_tree_view_get_path_at_pos(uploadList,
+                                             last_x,
+                                             last_y,
+                                             &path,
+                                             NULL,
+                                             NULL,
+                                             NULL)) {
+    GE_BREAK(NULL, 0);
+    return FALSE;
+  }
+  if (FALSE == gtk_tree_model_get_iter(GTK_TREE_MODEL(upload_summary),
+                                       &iter,
+                                       path)) {
+    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));
+  FREE(str);
+  return FALSE;
+} 
+
+static gint
+upload_click_handler(void * cls, 
+                     GdkEvent *event) {
+  GtkTreeView * uploadList = cls;
+  GtkMenu * menu;
+  GtkWidget * entry;
+  GdkEventButton * event_button;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+  if (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).
@@ -421,6 +511,10 @@ static void fs_summary_start() {
   /* upload summary setup */
   uploadList = GTK_TREE_VIEW(glade_xml_get_widget(getMainXML(),
                                                   "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 */