Merge branch 'master' of git+ssh://johnp@dev.laptop.org/git/sugar

shell/view/BuddyMenu.py

@@ -88,9 +88,9 @@ class BuddyMenu(Menu):
             icon = CanvasIcon(icon_name='stock-add')
             self.add_action(icon, BuddyMenu.ACTION_MAKE_FRIEND)
 
-        activity_id = shell_model.get_current_activity()
-        if activity_id != None:
-            activity_ps = pservice.get_activity(activity_id)
+        activity = shell_model.get_home().get_current_activity()
+        if activity != None:
+            activity_ps = pservice.get_activity(activity.get_id())
 
             # FIXME check that the buddy is not in the activity already
 

shell/view/Shell.py

@@ -138,7 +138,7 @@ class Shell(gobject.GObject):
         elif key == '<alt>F8':
             self._hw_manager.set_display_mode(HardwareManager.B_AND_W_MODE)
         elif key == '<alt>equal' or key == '<alt>0':
-            gobject.idle_add(self._show_console_cb)
+            gobject.idle_add(self._toggle_console_visibility_cb)
         elif key == '<alt>f':
             self._frame.notify_key_press()
         elif key == '<alt>o':
@@ -158,12 +158,12 @@ class Shell(gobject.GObject):
             box = self._home_window.get_home_box()
             box.grab_and_rotate()
 
-    def _show_console_cb(self):
+    def _toggle_console_visibility_cb(self):
         bus = dbus.SessionBus()
         proxy = bus.get_object('org.laptop.sugar.Console',
                                '/org/laptop/sugar/Console')
-        mgr = dbus.Interface(proxy, 'org.laptop.sugar.Console')
-        mgr.show()
+        console = dbus.Interface(proxy, 'org.laptop.sugar.Console')
+        console.toggle_visibility()
 
     def _shutdown(self):
         bus = dbus.SystemBus()