no need to maintain two different subclasses for MenuItem

3 files changed, 10 insertions, 39 deletions

diff --git a/extensions/web/facebook/facebook_online_account.py b/extensions/web/facebook/facebook_online_account.py
index 3b5c393..a0054d2 100644
--- a/extensions/web/facebook/facebook_online_account.py
+++ b/extensions/web/facebook/facebook_online_account.py
@@ -109,11 +109,11 @@ class FacebookOnlineAccount(online_account.OnlineAccount):
         return self._client.get_string(self.ACCESS_TOKEN_KEY)
 
 
-class _FacebookShareMenu(online_account.OnlineShareMenu):
+class _FacebookShareMenu(online_account.OnlineMenu):
     __gtype_name__ = 'JournalFacebookMenu'
 
     def __init__(self, metadata, is_active):
-        online_account.OnlineShareMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         if is_active:
             icon_name = 'facebook-share'
@@ -197,9 +197,9 @@ class _FacebookShareMenu(online_account.OnlineShareMenu):
             pixbuf.savev(image_path, 'png', [], [])
 
 
-class _FacebookRefreshMenu(online_account.OnlineRefreshMenu):
+class _FacebookRefreshMenu(online_account.OnlineMenu):
     def __init__(self, is_active):
-        online_account.OnlineRefreshMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         self._is_active = is_active
         self._metadata = None
diff --git a/extensions/web/twitter/twitter_online_account.py b/extensions/web/twitter/twitter_online_account.py
index b45f747..de9142a 100644
--- a/extensions/web/twitter/twitter_online_account.py
+++ b/extensions/web/twitter/twitter_online_account.py
@@ -115,11 +115,11 @@ class TwitterOnlineAccount(online_account.OnlineAccount):
                 self._client.get_string(self.ACCESS_SECRET_KEY))
 
 
-class _TwitterShareMenu(online_account.OnlineShareMenu):
+class _TwitterShareMenu(online_account.OnlineMenu):
     __gtype_name__ = 'JournalTwitterMenu'
 
     def __init__(self, metadata, is_active):
-        online_account.OnlineShareMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         if is_active:
             icon_name = 'twitter-share'
@@ -184,9 +184,9 @@ class _TwitterShareMenu(online_account.OnlineShareMenu):
             pixbuf.savev(image_path, 'png', [], [])
 
 
-class _TwitterRefreshMenu(online_account.OnlineRefreshMenu):
+class _TwitterRefreshMenu(online_account.OnlineMenu):
     def __init__(self, is_active):
-        online_account.OnlineRefreshMenu.__init__(self, ONLINE_ACCOUNT_NAME)
+        online_account.OnlineMenu.__init__(self, ONLINE_ACCOUNT_NAME)
 
         self._is_active = is_active
         self._metadata = None
diff --git a/src/jarabe/web/online_account.py b/src/jarabe/web/online_account.py
index cf2515c..aeb9bd9 100644
--- a/src/jarabe/web/online_account.py
+++ b/src/jarabe/web/online_account.py
@@ -25,7 +25,7 @@ import logging
 from gi.repository import GObject
 
 from sugar3.graphics.menuitem import MenuItem
-from sugar3.graphics.toolbutton import ToolButton
+
 
 class OnlineAccount(GObject.GObject):
     def get_description(self):
@@ -44,42 +44,13 @@ class OnlineAccount(GObject.GObject):
         raise Exception("Not defined")
 
 
-'''
-class _TransferWidget(GObject.GObject):
-     __gsignals__ = {
-        'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),
-        'transfer-completed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-failed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, str])),
-        'transfer-state-changed': (GObject.SignalFlags.RUN_FIRST, None, ([str])),
-    }
-
-    def _transfer_state_changed_cb(self, transfer_object, state):
-        self.emit('transfer-state-changed', state)
-'''
-
-class OnlineShareMenu(MenuItem):
-    __gsignals__ = {
-        'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),
-        'transfer-completed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
-        'transfer-failed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, str])),
-        'transfer-state-changed': (GObject.SignalFlags.RUN_FIRST, None, ([str])),
-    }
-
-    def _transfer_state_changed_cb(self, transfer_object, state):
-        logging.debug('_transfer_state_changed_cb')
-        self.emit('transfer-state-changed', state)
-
-
-class OnlineRefreshMenu(MenuItem):
+class OnlineMenu(MenuItem):
     __gsignals__ = {
         'transfer-started': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
         'transfer-progress': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, float])),
         'transfer-completed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int])),
         'transfer-failed': (GObject.SignalFlags.RUN_FIRST, None, ([int, int, str])),
         'transfer-state-changed': (GObject.SignalFlags.RUN_FIRST, None, ([str])),
-        'comments-updated': (GObject.SignalFlags.RUN_FIRST, None, ([])),
     }
 
     def _transfer_state_changed_cb(self, transfer_object, state):