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:
Marco Pesenti Gritti 2007-07-17 22:29:53 +02:00
commit 5212790236
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,3 +1,4 @@
* Fix initialization order of buddy class '_activities' member (dcbw)
* Update brazilian translation. * Update brazilian translation.
* Add polish translation. * Add polish translation.
* Add french translation. * Add french translation.

3
sugar/presence/buddy.py
View File

@ -85,6 +85,8 @@ class Buddy(gobject.GObject):
self._ps_new_object = new_obj_cb self._ps_new_object = new_obj_cb
self._ps_del_object = del_obj_cb self._ps_del_object = del_obj_cb
self._properties = {} self._properties = {}
self._activities = {}
bobj = bus.get_object(self._PRESENCE_SERVICE, object_path) bobj = bus.get_object(self._PRESENCE_SERVICE, object_path)
self._buddy = dbus.Interface(bobj, self._BUDDY_DBUS_INTERFACE) self._buddy = dbus.Interface(bobj, self._BUDDY_DBUS_INTERFACE)
self._buddy.connect_to_signal('IconChanged', self._icon_changed_cb) self._buddy.connect_to_signal('IconChanged', self._icon_changed_cb)
@ -93,7 +95,6 @@ class Buddy(gobject.GObject):
self._buddy.connect_to_signal('PropertyChanged', self._property_changed_cb) self._buddy.connect_to_signal('PropertyChanged', self._property_changed_cb)
self._properties = self._get_properties_helper() self._properties = self._get_properties_helper()
self._activities = {}
activities = self._buddy.GetJoinedActivities() activities = self._buddy.GetJoinedActivities()
for op in activities: for op in activities:
self._activities[op] = self._ps_new_object(op) self._activities[op] = self._ps_new_object(op)