From 07bee8131cf9164be6988ed1a74a613cf10bf51f Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sun, 03 Feb 2013 17:50:00 +0000
Subject: move Share on menu items to Copy to menu

---
diff --git a/src/jarabe/journal/palettes.py b/src/jarabe/journal/palettes.py
index 0b272f4..e03bc61 100644
--- a/src/jarabe/journal/palettes.py
+++ b/src/jarabe/journal/palettes.py
@@ -115,16 +115,6 @@ class ObjectPalette(Palette):
             self.menu.append(menu_item)
             menu_item.show()
 
-        menu_item = MenuItem(_('Share on'))
-        icon = Icon(icon_name='activity-web', xo_color=color,
-                    icon_size=Gtk.IconSize.MENU)
-        menu_item.set_image(icon)
-        self.menu.append(menu_item)
-        menu_item.show()
-        share_menu = ShareMenu(metadata)
-        menu_item.set_submenu(share_menu)
-        menu_item.show()
-
         menu_item = MenuItem(_('Send to'), 'document-send')
         self.menu.append(menu_item)
         menu_item.show()
@@ -206,24 +196,6 @@ class ObjectPalette(Palette):
                                     mime_type)
 
 
-class ShareMenu(Gtk.Menu):
-    __gtype_name__ = 'JournalShareMenu'
-
-    __gsignals__ = {
-        'share-error': (GObject.SignalFlags.RUN_FIRST, None,
-                         ([str, str])),
-    }
-
-    def __init__(self, metadata):
-        Gtk.Menu.__init__(self)
-
-        self._metadata = metadata
-
-        for account in oam.OnlineAccountsManager.configured_accounts():
-            menu = account.get_share_menu(metadata)
-            self.append(menu)
-
-
 class CopyMenu(Gtk.Menu):
     __gtype_name__ = 'JournalCopyMenu'
 
@@ -281,6 +253,10 @@ class CopyMenu(Gtk.Menu):
             self.append(volume_menu)
             volume_menu.show()
 
+        for account in oam.OnlineAccountsManager.configured_accounts():
+            menu = account.get_share_menu(metadata)
+            self.append(menu)
+
     def __volume_error_cb(self, menu_item, message, severity):
         self.emit('volume-error', message, severity)
 
--
cgit v0.9.1