sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git+ssh://dcbw@crank.laptop.org/git/sugar

Browse Source
This commit is contained in:
Dan Williams 2006-06-16 17:01:37 -04:00
commit 334dd101e8
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sugar/shell/shell.py
View File

@ -80,7 +80,7 @@ class ActivityHost(dbus.service.Object):
def _create_chat(self): def _create_chat(self):
self._group_chat = GroupChat() self._group_chat = GroupChat()
def get_group_chat(self): def get_chat(self):
return self._group_chat return self._group_chat
def __close_button_clicked_reply_cb(self): def __close_button_clicked_reply_cb(self):
@ -314,12 +314,17 @@ class ActivityContainer(dbus.service.Object):
pass pass
def set_current_activity(self, activity): def set_current_activity(self, activity):
print 'current activity'
self.current_activity = activity self.current_activity = activity
self._presence_window.set_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() host_chat = activity.get_chat()
self._chat_window.add() self._chat_window.add(host_chat)
host_chat.show() host_chat.show()
def notebook_tab_changed(self, notebook, page, page_number): def notebook_tab_changed(self, notebook, page, page_number):