From 164add907d263a39c8b4b90b0ac0b262445de7fd Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@localhost.localdomain>
Date: Wed, 26 Jul 2006 00:04:15 +0000
Subject: Make shareActivity work

---
(limited to 'sugar/presence')

diff --git a/sugar/presence/Activity.py b/sugar/presence/Activity.py
index 43e6755..761017e 100644
--- a/sugar/presence/Activity.py
+++ b/sugar/presence/Activity.py
@@ -66,13 +66,6 @@ class Activity(gobject.GObject):
 	def get_icon(self):
 		return self._buddy.getIcon()
 
-	def get_service_of_type(self, stype):
-		try:
-			object_path = self._buddy.getServiceOfType(stype)
-		except dbus.exceptions.DBusException:
-			return None
-		return self._ps_new_object(object_path)
-
 	def get_services(self):
 		resp = self._activity.getServices()
 		servs = []
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py
index b64934d..44fd3c7 100644
--- a/sugar/presence/PresenceService.py
+++ b/sugar/presence/PresenceService.py
@@ -181,7 +181,16 @@ class PresenceService(gobject.GObject):
 			return None
 		return self._new_object(owner_op)
 
-	def register_service(self, name, stype, properties={"":""}, address="", port=-1, domain=u"local"):
+	def share_activity(self, activity, stype, properties={}, address=None, port=-1, domain=u"local"):
+		actid = activity.get_id()
+		if address == None:
+			address = u""
+		serv_op = self._ps.shareActivity(actid, stype, properties, address, port, domain)
+		return self._new_object(serv_op)
+
+	def register_service(self, name, stype, properties={}, address=None, port=-1, domain=u"local"):
+		if address == None:
+			address = u""
 		serv_op = self._ps.registerService(name, stype, properties, address, port, domain)
 		return self._new_object(serv_op)
 
--
cgit v0.9.1