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

services/presence/presenceservice.py

@@ -295,6 +295,11 @@ class PresenceService(dbus.service.Object):
         activity = self._share_activity(actid, atype, name, properties)
         return activity.object_path()
 
+    @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()

services/presence/server_plugin.py

@@ -128,7 +128,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)))