Fix the functionality of actions in the XO menu.

This fixes the missing imports which prevented the menu
from working, and removes the redundant code that was
left in favoritesview.py

2 files changed, 2 insertions, 14 deletions

diff --git a/src/jarabe/desktop/favoritesview.py b/src/jarabe/desktop/favoritesview.py
index 9371858..bd59d6f 100644
--- a/src/jarabe/desktop/favoritesview.py
+++ b/src/jarabe/desktop/favoritesview.py
@@ -41,7 +41,6 @@ from jarabe.model.buddy import BuddyModel
 from jarabe.model import shell
 from jarabe.model import bundleregistry
 from jarabe import journal
-from jarabe.controlpanel.gui import ControlPanel
 
 from jarabe.desktop import schoolserver
 from jarabe.desktop.schoolserver import RegisterError
@@ -645,22 +644,9 @@ class _MyIcon(MyIcon):
     
         return palette
 
-    def _reboot_activate_cb(self, menuitem):
-        session_manager = get_session_manager()
-        session_manager.reboot()
-
-    def _shutdown_activate_cb(self, menuitem):
-        session_manager = get_session_manager()
-        session_manager.shutdown()
-        
     def get_toplevel(self):
         return hippo.get_canvas_for_item(self).get_toplevel()
 
-    def __controlpanel_activate_cb(self, menuitem):
-        panel = ControlPanel()
-        panel.set_transient_for(self.get_toplevel())
-        panel.show()
-
     def __register_activate_cb(self, menuitem):
         self.emit('register-activate')
 
diff --git a/src/jarabe/view/buddymenu.py b/src/jarabe/view/buddymenu.py
index 2e0be1e..c5cab29 100644
--- a/src/jarabe/view/buddymenu.py
+++ b/src/jarabe/view/buddymenu.py
@@ -25,6 +25,8 @@ from sugar.graphics.icon import Icon
 
 from jarabe.model import shell
 from jarabe.model import friends
+from jarabe.model.session import get_session_manager
+from jarabe.controlpanel.gui import ControlPanel
 
 class BuddyMenu(Palette):
     def __init__(self, buddy):