From 87cb115aa0155291d2473537a3fa2da1400c174f Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 20 Jul 2006 09:34:06 +0000
Subject: Abstract activity on the shell side into an ActivityHost object.

Comment out/fix more ps borkage.
---
(limited to 'sugar')

diff --git a/sugar/chat/ActivityChat.py b/sugar/chat/ActivityChat.py
index 9edee83..ff5c057 100644
--- a/sugar/chat/ActivityChat.py
+++ b/sugar/chat/ActivityChat.py
@@ -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():
diff --git a/sugar/chat/Chat.py b/sugar/chat/Chat.py
index f510fde..20c566e 100644
--- a/sugar/chat/Chat.py
+++ b/sugar/chat/Chat.py
@@ -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)
--
cgit v0.9.1