diff options
author | John (J5) Palmieri <quinticent@localhost.localdomain> | 2007-01-10 21:55:22 (GMT) |
---|---|---|
committer | John (J5) Palmieri <quinticent@localhost.localdomain> | 2007-01-10 21:55:22 (GMT) |
commit | dda16d83c0fe754eb697c5ceb0bb952bfd15a70f (patch) | |
tree | 0cb2c472a355ffa19fd3e124b9a8388c9b62a6f5 /shell | |
parent | b2bf400b6771d6e61a5fe6a080a0226676257b40 (diff) | |
parent | 7a185a51f4da396f9ca0c3c6eee20397521a4e21 (diff) |
Merge branch 'master' of git+ssh://johnp@dev.laptop.org/git/sugar
Diffstat (limited to 'shell')
-rw-r--r-- | shell/view/BuddyMenu.py | 6 | ||||
-rw-r--r-- | shell/view/Shell.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/shell/view/BuddyMenu.py b/shell/view/BuddyMenu.py index a020a59..82e58c2 100644 --- a/shell/view/BuddyMenu.py +++ b/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 diff --git a/shell/view/Shell.py b/shell/view/Shell.py index 8a3136c..f687a2b 100644 --- a/shell/view/Shell.py +++ b/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() |