From d919848324317aa633464313c0f7609a035f096f Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Mon, 07 Aug 2006 09:08:10 +0000
Subject: Rework to not use protected API

---
(limited to 'sugar')

diff --git a/sugar/activity/Activity.py b/sugar/activity/Activity.py
index b26ac01..4815d35 100644
--- a/sugar/activity/Activity.py
+++ b/sugar/activity/Activity.py
@@ -49,10 +49,11 @@ class ActivityFactory(dbus.service.Object):
 		bus_name = dbus.service.BusName(factory, bus = bus) 
 		dbus.service.Object.__init__(self, bus_name, get_path(factory))
 
-	@dbus.service.method("com.redhat.Sugar.ActivityFactory")
+	@dbus.service.method("com.redhat.Sugar.ActivityFactory",
+						 in_signature="o", out_signature="")
 	def create_with_service(self, service_path):
 		pservice = PresenceService()
-		service = pservice._new_object(service_path)
+		service = pservice.get(service_path)
 		activity = self._class(service, [])
 
 	@dbus.service.method("com.redhat.Sugar.ActivityFactory")
diff --git a/sugar/presence/PresenceService.py b/sugar/presence/PresenceService.py
index f50e034..20eafca 100644
--- a/sugar/presence/PresenceService.py
+++ b/sugar/presence/PresenceService.py
@@ -125,6 +125,9 @@ class PresenceService(gobject.GObject):
 	def _activity_disappeared_cb(self, object_path):
 		gobject.idle_add(self._emit_activity_disappeared_signal, object_path)
 
+	def get(self, object_path):
+		return self._new_object(object_path)
+
 	def get_services(self):
 		resp = self._ps.getServices()
 		servs = []
--
cgit v0.9.1