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

2 files changed, 6 insertions, 1 deletions

diff --git a/services/presence/presenceservice.py b/services/presence/presenceservice.py
index b770ffd..426780f 100644
--- a/services/presence/presenceservice.py
+++ b/services/presence/presenceservice.py
@@ -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()
diff --git a/services/presence/server_plugin.py b/services/presence/server_plugin.py
index ea33e70..f2a379d 100644
--- a/services/presence/server_plugin.py
+++ b/services/presence/server_plugin.py
@@ -134,7 +134,7 @@ class ServerPlugin(gobject.GObject):
             self._set_self_alias()
 
         if properties.has_key("color"):
-            self._set_self._olpc_properties()
+            self._set_self_olpc_properties()
 
     def _owner_icon_changed_cb(self, owner, icon):
         logging.debug("Owner icon changed to size %d" % len(str(icon)))