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

Abstract activity on the shell side into an ActivityHost object.

Browse Source 
Comment out/fix more ps borkage.
This commit is contained in:
Marco Pesenti Gritti
2006-07-20 11:34:06 +02:00
parent 53947aaaf2
commit 87cb115aa0
5 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sugar/chat/ActivityChat.py
+5 -5
View File
@@ -10,13 +10,13 @@ class ActivityChat(GroupChat):
self._chat_service = None
self._activity = activity
self._pservice.connect('service-appeared', self._service_appeared_cb)
self._pservice.track_service_type(ActivityChat.SERVICE_TYPE)
self._pservice.connect('ServiceAppeared', self._service_appeared_cb)
# Find an existing activity chat to latch onto
service = self._pservice.get_activity_service(activity, ActivityChat.SERVICE_TYPE)
if service is not None:
self._service_appeared_cb(self._pservice, None, service)
#activity_ps = self._pservice.getActivity(activity.get_id())
#service = activity.getServiceOfType(ActivityChat.SERVICE_TYPE)
#if service is not None:
# self._service_appeared_cb(self._pservice, None, service)
def _service_appeared_cb(self, pservice, buddy, service):
if service.get_activity_id() != self._activity.get_id():
sugar/chat/Chat.py
+1 -2
View File
@@ -28,8 +28,7 @@ class Chat(gtk.VBox):
def __init__(self):
gtk.VBox.__init__(self, False, 6)
self._pservice = PresenceService.get_instance()
self._pservice.start()
self._pservice = PresenceService()
self._stream_writer = None
self.set_border_width(12)