Merge lp:~voldyman/pantheon-terminal/copy-uri-mouse into lp:~elementary-apps/pantheon-terminal/trunk

[Akshay Shekher]

according to Pim's comment user should be able to copy link by right clicking on the link.

functionality added.

[David Gomes (davidgomes)]

review: Approve

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2012-07-30 20:26:02 +0000
+++ src/PantheonTerminalWindow.vala	2012-07-31 07:53:19 +0000
@@ -33,6 +33,7 @@
         public Granite.Widgets.DynamicNotebook notebook;
         FontDescription system_font;
         private Button add_button;
+        private Gtk.Clipboard clipboard;
 
         private GLib.List <TerminalWidget> terminals = new GLib.List <TerminalWidget> ();
 
@@ -88,6 +89,8 @@
             main_actions.set_translation_domain ("pantheon-terminal");
             main_actions.add_actions (main_entries, this);
 
+            clipboard = Gtk.Clipboard.get (Gdk.Atom.intern ("CLIPBOARD", false));
+
             ui = new Gtk.UIManager ();
 
             try {
@@ -362,7 +365,10 @@
         }
 
         void action_copy () {
-            current_terminal.copy_clipboard ();
+            if (current_terminal.uri != null)
+                clipboard.set_text (current_terminal.uri, current_terminal.uri.length);
+            else
+                current_terminal.copy_clipboard ();
         }
 
         void action_paste () {
 
=== modified file 'src/TerminalWidget.vala'
--- src/TerminalWidget.vala	2012-07-30 20:26:02 +0000
+++ src/TerminalWidget.vala	2012-07-31 07:53:19 +0000
@@ -27,6 +27,7 @@
         GLib.Pid child_pid;
         private PantheonTerminalWindow window;
         public Granite.Widgets.Tab tab;
+        public string? uri;
 
         public TerminalWidget (Gtk.ActionGroup main_actions, Gtk.UIManager ui, PantheonTerminalWindow parent_window) {
             /* Set up the parents */
@@ -43,9 +44,9 @@
             menu.show_all ();
 
             button_press_event.connect ((event) => {
+                uri = get_link ((long)event.x, (long)event.y);
                 switch (event.button) {
                     case Gdk.BUTTON_PRIMARY:
-                        string? uri = get_link ((long)event.x, (long)event.y);
                         if (uri != null) {
                             try {
                                 Gtk.show_uri (null, (!)uri, Gtk.get_current_event_time());
@@ -56,6 +57,9 @@
                         }
                         return false;
                     case Gdk.BUTTON_SECONDARY :
+                        if (uri != null) {
+                            main_actions.get_action ("Copy").set_sensitive (true);
+                        }
                         menu.select_first (false);
                         menu.popup (null, null, null, event.button, event.time);
                         return true;