diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-06-16 21:01:37 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-06-16 21:01:37 (GMT) |
| commit | 334dd101e8fba15aba918b6161f8bbe9c5ac22e3 (patch) | |
| tree | 5b19e9d48f106c0b6968491a7e841a875e5e8c25 /sugar | |
| parent | a6c33403ffe9d61ea93fcc1546535c7362c01095 (diff) | |
| parent | b2fc0d731485c739eb19bf7e323109fdade05ff4 (diff) | |
Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar
Diffstat (limited to 'sugar')
| -rwxr-xr-x | sugar/shell/shell.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sugar/shell/shell.py b/sugar/shell/shell.py index d9973c8..f6755f2 100755 --- a/sugar/shell/shell.py +++ b/sugar/shell/shell.py @@ -80,7 +80,7 @@ class ActivityHost(dbus.service.Object): def _create_chat(self): self._group_chat = GroupChat() - def get_group_chat(self): + def get_chat(self): return self._group_chat def __close_button_clicked_reply_cb(self): @@ -314,12 +314,17 @@ class ActivityContainer(dbus.service.Object): pass def set_current_activity(self, activity): + print 'current activity' + self.current_activity = activity self._presence_window.set_activity(activity) - self._chat_window.get_child().unparent() + + host_chat = self._chat_window.get_child() + if host_chat: + host_chat.unparent() host_chat = activity.get_chat() - self._chat_window.add() + self._chat_window.add(host_chat) host_chat.show() def notebook_tab_changed(self, notebook, page, page_number): |