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 'shell')

diff --git a/shell/ActivitiesModel.py b/shell/ActivitiesModel.py
index 9b1a955..72d4ba5 100644
--- a/shell/ActivitiesModel.py
+++ b/shell/ActivitiesModel.py
@@ -35,10 +35,8 @@ class ActivitiesModel(gobject.GObject):
 		
 		self._activities = []
 		
-		self._pservice = PresenceService.get_instance()
-		self._pservice.connect("activity-announced", self._on_activity_announced_cb)
-		self._pservice.connect("new-service-adv", self._on_new_service_adv_cb)
-		self._pservice.start()
+		self._pservice = PresenceService()
+		self._pservice.connect("ActivityAppeared", self._on_activity_announced_cb)
 
 	def add_activity(self, service):
 		activity_info = ActivityInfo(service)
@@ -48,10 +46,6 @@ class ActivitiesModel(gobject.GObject):
 	def __iter__(self):
 		return self._activities.__iter__()
 
-	def _on_new_service_adv_cb(self, pservice, activity_id, short_stype):
-		if activity_id:
-			self._pservice.track_service_type(short_stype)
-
 	def _on_activity_announced_cb(self, pservice, service, buddy):
 		# FIXME We should not hard code activity types here
 		if service.get_type() == "_web_olpc._udp":
diff --git a/shell/Owner.py b/shell/Owner.py
index 90d7d31..db9f7af 100644
--- a/shell/Owner.py
+++ b/shell/Owner.py
@@ -30,17 +30,18 @@ class ShellOwner(object):
 		# Our presence service
 		port = random.randint(40000, 65000)
 		properties = {}
-		self._service = Service.Service(nick, Buddy.PRESENCE_SERVICE_TYPE,
-			domain="", address=None, port=port, properties=properties)
-		print "Owner '%s' using port %d" % (nick, port)
 
-		self._icon_stream = Stream.Stream.new_from_service(self._service)
-		self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon")
+#		self._service = Service.Service(nick, Buddy.PRESENCE_SERVICE_TYPE,
+#			domain="", address=None, port=port, properties=properties)
+#		print "Owner '%s' using port %d" % (nick, port)
+
+#		self._icon_stream = Stream.Stream.new_from_service(self._service)
+#		self._icon_stream.register_reader_handler(self._handle_buddy_icon_request, "get_buddy_icon")
 
 		# Announce ourselves to the world
-		self._pservice = PresenceService.PresenceService.get_instance()
-		self._pservice.start()
-		self._pservice.register_service(self._service)
+#		self._pservice = PresenceService.PresenceService.get_instance()
+#		self._pservice.start()
+#		self._pservice.register_service(self._service)
 
 	def _handle_buddy_icon_request(self):
 		"""XMLRPC method, return the owner's icon encoded with base64."""
--
cgit v0.9.1