From a06d75bd56b73c4703513454a35225d92759b6ef Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Thu, 20 Jul 2006 08:12:42 +0000
Subject: Port some stuff to new presence service (not tested, but I need this to at least run).

Comment out some broken code in Owner.py, Dan please take a look at this.
---
(limited to 'activities')

diff --git a/activities/browser/BrowserActivity.py b/activities/browser/BrowserActivity.py
index 1d3a458..f1f40af 100644
--- a/activities/browser/BrowserActivity.py
+++ b/activities/browser/BrowserActivity.py
@@ -56,13 +56,8 @@ class BrowserActivity(Activity):
 		self.add(vbox)
 		vbox.show()
 
-		logging.debug('Start presence service')
-		self._pservice = PresenceService.get_instance()
-		self._pservice.start()
-		
-		logging.debug('Track browser activities')
-		self._pservice.connect('service-appeared', self._service_appeared_cb)
-		self._pservice.track_service_type(LocalModel.SERVICE_TYPE)
+		self._pservice = PresenceService()
+		self._pservice.connect('ServiceAppeared', self._service_appeared_cb)
 
 		# Join the shared activity if we were started from one
 		if self._initial_service:
@@ -85,10 +80,6 @@ class BrowserActivity(Activity):
 			self._model = RemoteModel(self._model_service, self._notif_service)
 			self._model.add_listener(self.__shared_location_changed_cb)
 	
-	def set_default_type(self, default_type):
-		Activity.set_default_type(self, default_type)
-		self._pservice.track_service_type(default_type)
-	
 	def _update_shared_location(self):
 		address = self.embed.get_address()
 		self._model.set_value('address', address)
--
cgit v0.9.1