From 1226b0b6b957f70b7885535b1f0213ed7072dc9a Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 20 Oct 2006 13:15:23 -0400
Subject: [PATCH] Fix Buddy object's get_service_of_type() method

This call would always fail for activity services because the
dbus bindings for it did not pass in the activity at all.  Fix
that.
---
 services/presence/Buddy.py | 17 +++++++++++++----
 sugar/presence/Buddy.py    |  7 +++++--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/services/presence/Buddy.py b/services/presence/Buddy.py
index a98982ef..a49b46af 100644
--- a/services/presence/Buddy.py
+++ b/services/presence/Buddy.py
@@ -88,9 +88,18 @@ class BuddyDBusHelper(dbus.service.Object):
 		return icon
 
 	@dbus.service.method(BUDDY_DBUS_INTERFACE,
-						in_signature="s", out_signature="o")
-	def getServiceOfType(self, stype):
-		service = self._parent.get_service_of_type(stype)
+						in_signature="so", out_signature="o")
+	def getServiceOfType(self, stype, activity_op):
+		activity = None
+		# "/" is the placeholder for None
+		if activity_op != "/":
+			for act in self._parent.get_joined_activities():
+				if act.object_path() == activity_op:
+					activity = act
+			if not activity:
+				raise NotFoundError("Not found")
+
+		service = self._parent.get_service_of_type(stype, activity)
 		if not service:
 			raise NotFoundError("Not found")
 		return service.object_path()
@@ -357,7 +366,7 @@ class Buddy(object):
 				acts.append(act)
 		return acts
 
-	def get_service_of_type(self, stype=None, activity=None):
+	def get_service_of_type(self, stype, activity=None):
 		"""Return a service of a certain type, or None if the buddy
 		doesn't provide that service."""
 		if not stype:
diff --git a/sugar/presence/Buddy.py b/sugar/presence/Buddy.py
index 6751c7c3..579592b1 100644
--- a/sugar/presence/Buddy.py
+++ b/sugar/presence/Buddy.py
@@ -172,9 +172,12 @@ class Buddy(gobject.GObject):
 		else:
 			return None
 
-	def get_service_of_type(self, stype):
+	def get_service_of_type(self, stype, activity=None):
 		try:
-			object_path = self._buddy.getServiceOfType(stype)
+			act_op = "/"
+			if activity:
+				act_op = activity.object_path()
+			object_path = self._buddy.getServiceOfType(stype, act_op)
 		except dbus.exceptions.DBusException:
 			return None
 		return self._ps_new_object(object_path)