sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Williams 2007-04-13 13:12:04 -04:00
commit 773ae4965e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
services/presence/presenceservice.py
View File

@ -302,6 +302,11 @@ class PresenceService(dbus.service.Object):
def ShareActivity(self, actid, atype, name, properties, async_cb, async_err_cb): def ShareActivity(self, actid, atype, name, properties, async_cb, async_err_cb):
self._share_activity(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): def cleanup(self):
for tp in self._handles_buddies: for tp in self._handles_buddies:
tp.cleanup() tp.cleanup()

2
services/presence/server_plugin.py
View File

@ -134,7 +134,7 @@ class ServerPlugin(gobject.GObject):
self._set_self_alias() self._set_self_alias()
if properties.has_key("color"): if properties.has_key("color"):
self._set_self._olpc_properties() self._set_self_olpc_properties()
def _owner_icon_changed_cb(self, owner, icon): def _owner_icon_changed_cb(self, owner, icon):
logging.debug("Owner icon changed to size %d" % len(str(icon))) logging.debug("Owner icon changed to size %d" % len(str(icon)))