[Xfce4-commits] <postler:master> Show only Copy Address when right-clicking a link

[Christian Dywan]

Updating branch refs/heads/master
         to aacc820a617892687eb10b3b74c2bab9e9ce48be (commit)
       from b0f29e009226d6be4a6bca062e2bb39bea63f3b5 (commit)

commit aacc820a617892687eb10b3b74c2bab9e9ce48be
Author: Christian Dywan <christian at twotoasts.de>
Date:   Thu Jan 20 19:14:06 2011 +0100

    Show only Copy Address when right-clicking a link
    
    The Copy item is most of the time insensitive and more
    confusing than helpful.

 postler/postler-content.vala |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/postler/postler-content.vala b/postler/postler-content.vala
index d852bc0..6d82701 100644
--- a/postler/postler-content.vala
+++ b/postler/postler-content.vala
@@ -219,7 +219,9 @@ public class Postler.Content : WebKit.WebView {
         Gtk.MenuItem menuitem;
 
         if (result.link_uri != null) {
-            menuitem = new Gtk.MenuItem.with_mnemonic (_("Copy _Address"));
+            menuitem = new Gtk.ImageMenuItem.with_mnemonic (_("Copy _Address"));
+            var icon = new Gtk.Image.from_stock (Gtk.STOCK_COPY, Gtk.IconSize.MENU);
+            (menuitem as Gtk.ImageMenuItem).set_image (icon);
             menuitem.activate.connect ((menuitem) => {
                 var clipboard = get_clipboard (Gdk.SELECTION_CLIPBOARD);
                 string address = result.link_uri;
@@ -230,12 +232,6 @@ public class Postler.Content : WebKit.WebView {
             });
             menuitem.show ();
             menu.append (menuitem);
-            menuitem = new Gtk.ImageMenuItem.from_stock (Gtk.STOCK_COPY, null);
-            menuitem.activate.connect ((menuitem) => {
-                copy_clipboard (); });
-            menuitem.show ();
-            menuitem.sensitive = can_copy_clipboard ();
-            menu.append (menuitem);
             return;
         }