Ticket #4253: activate-item-shell.patch

src/jarabe/desktop/favoritesview.py

@@ -649 +649 @@
                                                   'media-record')
 
         self._register_menu.connect('activate', self.__register_activate_cb)
-        palette.menu_box.pack_end(self._register_menu, True, True, 0)
+        palette.menu_box.append_item(self._register_menu)
         self._register_menu.show()
 
         self.connect_to_palette_pop_events(palette)
@@ -664 +664 @@
         self._register_menu = PaletteMenuItem(_('Register again'),
                                               'media-record')
         self._register_menu.connect('activate', self.__register_activate_cb)
-        self.palette.menu_box.pack_end(self._register_menu, True, True, 0)
+        self.palette.menu_box.append_item(self._register_menu)
         self._register_menu.show()
 
 

src/jarabe/view/buddymenu.py

@@ -46 +46 @@
         Palette.__init__(self, None,
                          primary_text=GLib.markup_escape_text(nick),
                          icon=buddy_icon)
-        self.menu_box = Gtk.VBox()
+        self.menu_box = PaletteMenuBox()
         self.set_content(self.menu_box)
         self.menu_box.show_all()
         self._invite_menu = None
@@ -76 +76 @@
             menu_item = PaletteMenuItem(_('Make friend'), 'list-add')
             menu_item.connect('activate', self._make_friend_cb)
 
-        self.menu_box.pack_start(menu_item, True, True, 0)
+        self.menu_box.append_item(menu_item)
 
         self._invite_menu = PaletteMenuItem('')
         self._invite_menu.connect('activate', self._invite_friend_cb)
-        self.menu_box.pack_start(self._invite_menu, True, True, 0)
+        self.menu_box.append_item(self._invite_menu)
 
         home_model = shell.get_model()
         self._active_activity_changed_hid = home_model.connect(
@@ -91 +91 @@
     def _add_my_items(self):
         item = PaletteMenuItem(_('Shutdown'), 'system-shutdown')
         item.connect('activate', self.__shutdown_activate_cb)
-        self.menu_box.pack_start(item, True, True, 0)
+        self.menu_box.append_item(item)
 
         client = GConf.Client.get_default()
 
         if client.get_bool('/desktop/sugar/show_restart'):
             item = PaletteMenuItem(_('Restart'), 'system-restart')
             item.connect('activate', self.__reboot_activate_cb)
-            self.menu_box.pack_start(item, True, True, 0)
+            self.menu_box.append_item(item)
             item.show()
 
         if client.get_bool('/desktop/sugar/show_logout'):
             item = PaletteMenuItem(_('Logout'), 'system-logout')
             item.connect('activate', self.__logout_activate_cb)
-            self.menu_box.pack_start(item, True, True, 0)
+            self.menu_box.append_item(item)
             item.show()
 
         item = PaletteMenuItem(_('My Settings'), 'preferences-system')
         item.connect('activate', self.__controlpanel_activate_cb)
-        self.menu_box.pack_start(item, True, True, 0)
+        self.menu_box.append_item(item)
         item.show()
 
     def _quit(self, action):