Expose palette.menu rather than wrapping methods.
This commit is contained in:
@@ -85,7 +85,8 @@ class BuddyMenu(Palette):
|
||||
else:
|
||||
menu_item = MenuItem(_('Make friend'), 'stock-add')
|
||||
menu_item.connect('activate', self._make_friend_cb)
|
||||
self.append_menu_item(menu_item)
|
||||
|
||||
self.menu.append(menu_item)
|
||||
menu_item.show()
|
||||
|
||||
activity = shell_model.get_home().get_current_activity()
|
||||
@@ -96,7 +97,7 @@ class BuddyMenu(Palette):
|
||||
|
||||
menu_item = MenuItem(_('Invite'), 'stock-invite')
|
||||
menu_item.connect('activate', self._invite_friend_cb)
|
||||
self.append_menu_item(menu_item)
|
||||
self.menu.append(menu_item)
|
||||
menu_item.show()
|
||||
|
||||
def _buddy_icon_changed_cb(self, buddy):
|
||||
|
||||
@@ -130,7 +130,7 @@ class HomeMyIcon(MyIcon):
|
||||
|
||||
shutdown_menu_item = gtk.MenuItem(_('Shutdown'))
|
||||
shutdown_menu_item.connect('activate', self._shutdown_activate_cb)
|
||||
palette.append_menu_item(shutdown_menu_item)
|
||||
palette.menu.append(shutdown_menu_item)
|
||||
shutdown_menu_item.show()
|
||||
|
||||
self.set_palette(palette)
|
||||
|
||||
@@ -88,14 +88,14 @@ class ActivityIcon(CanvasIcon):
|
||||
|
||||
resume_menu_item = gtk.MenuItem(_('Resume'))
|
||||
resume_menu_item.connect('activate', self._resume_activate_cb)
|
||||
palette.append_menu_item(resume_menu_item)
|
||||
palette.menu.append(resume_menu_item)
|
||||
resume_menu_item.show()
|
||||
|
||||
# FIXME: kludge
|
||||
if self._activity.get_type() != "org.laptop.JournalActivity":
|
||||
stop_menu_item = gtk.MenuItem(_('Stop'))
|
||||
stop_menu_item.connect('activate', self._stop_activate_cb)
|
||||
palette.append_menu_item(stop_menu_item)
|
||||
palette.menu.append(stop_menu_item)
|
||||
stop_menu_item.show()
|
||||
|
||||
def _launching_changed_cb(self, activity, pspec):
|
||||
|
||||
Reference in New Issue
Block a user