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

Fix split_properties usage

Browse Source
This commit is contained in:
Dan Williams 2007-04-30 09:51:35 -04:00
parent 58a8cfc795
commit e432cc91ca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/presence/activity.py
View File

@ -63,7 +63,7 @@ class Activity(DBusGObject):
gobject.PARAM_READWRITE | gobject.PARAM_CONSTRUCT_ONLY) gobject.PARAM_READWRITE | gobject.PARAM_CONSTRUCT_ONLY)
} }
_RESERVED_PROPNAMES = self.__gproperties__.keys() _RESERVED_PROPNAMES = __gproperties__.keys()
def __init__(self, bus_name, object_id, tp, **kwargs): def __init__(self, bus_name, object_id, tp, **kwargs):
"""Initializes the activity and sets its properties to default values. """Initializes the activity and sets its properties to default values.
@ -169,9 +169,11 @@ class Activity(DBusGObject):
elif pspec.name == _PROP_LOCAL: elif pspec.name == _PROP_LOCAL:
self._local = value self._local = value
elif pspec.name == _PROP_CUSTOM_PROPS: elif pspec.name == _PROP_CUSTOM_PROPS:
if not value:
value = {}
(rprops, cprops) = self._split_properties(value) (rprops, cprops) = self._split_properties(value)
self._custom_props = {} self._custom_props = {}
for (key, dvalue) in cprops: for (key, dvalue) in cprops.items():
self._custom_props[str(key)] = str(dvalue) self._custom_props[str(key)] = str(dvalue)
self._update_validity() self._update_validity()
@ -487,7 +489,7 @@ class Activity(DBusGObject):
""" """
changed = False changed = False
# split reserved properties from activity-custom properties # split reserved properties from activity-custom properties
(rprops, cprops) = self._split_properties() (rprops, cprops) = self._split_properties(properties)
if _PROP_NAME in rprops.keys(): if _PROP_NAME in rprops.keys():
name = rprops[_PROP_NAME] name = rprops[_PROP_NAME]
if name != self._name: if name != self._name:
@ -526,7 +528,7 @@ class Activity(DBusGObject):
""" """
rprops = {} rprops = {}
cprops = {} cprops = {}
for (key, value) in properties: for (key, value) in properties.items():
if key in self._RESERVED_PROPNAMES: if key in self._RESERVED_PROPNAMES:
rprops[key] = value rprops[key] = value
else: else: