Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

2007-04-13 13:12:04 -04:00
parent 31000f6c3e 6b6b72f9c9
commit 773ae4965e
2 changed files with 6 additions and 1 deletions
@@ -302,6 +302,11 @@ class PresenceService(dbus.service.Object):
    def ShareActivity(self, actid, atype, name, properties, async_cb, async_err_cb):
        self._share_activity(actid, atype, name, properties, (async_cb, async_err_cb))

+    @dbus.service.method(_PRESENCE_INTERFACE, out_signature="so")
+    def GetPreferredConnection(self):
+        conn = self._server_plugin.get_connection()
+        return str(conn.service_name), conn.object_path
+
    def cleanup(self):
        for tp in self._handles_buddies:
            tp.cleanup()