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

Fix member name collision with dbus object superclass

Browse Source
This commit is contained in:
Dan Williams 2007-05-13 21:11:19 -04:00
parent 077b3e3391
commit de1796605f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
services/presence/activity.py
View File

@ -128,7 +128,7 @@ class Activity(ExportedGObject):
if pspec.name == _PROP_ID: if pspec.name == _PROP_ID:
return self._id return self._id
elif pspec.name == _PROP_NAME: elif pspec.name == _PROP_NAME:
return self._name return self._actname
elif pspec.name == _PROP_COLOR: elif pspec.name == _PROP_COLOR:
return self._color return self._color
elif pspec.name == _PROP_TYPE: elif pspec.name == _PROP_TYPE:
@ -155,7 +155,7 @@ class Activity(ExportedGObject):
raise RuntimeError("activity ID is already set") raise RuntimeError("activity ID is already set")
self._id = value self._id = value
elif pspec.name == _PROP_NAME: elif pspec.name == _PROP_NAME:
self._name = value self._actname = value
elif pspec.name == _PROP_COLOR: elif pspec.name == _PROP_COLOR:
self._color = value self._color = value
elif pspec.name == _PROP_TYPE: elif pspec.name == _PROP_TYPE:
@ -188,7 +188,7 @@ class Activity(ExportedGObject):
""" """
try: try:
old_valid = self._valid old_valid = self._valid
if self._color and self._name and self._id and self._type: if self._color and self._actname and self._id and self._type:
self._valid = True self._valid = True
else: else:
self._valid = False self._valid = False
@ -465,7 +465,7 @@ class Activity(ExportedGObject):
""" """
props = {} props = {}
props['name'] = self._name props['name'] = self._actname
props['color'] = self._color props['color'] = self._color
props['type'] = self._type props['type'] = self._type
@ -490,8 +490,8 @@ class Activity(ExportedGObject):
(rprops, cprops) = self._split_properties(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._actname:
self._name = name self._actname = name
changed = True changed = True
if _PROP_COLOR in rprops.keys(): if _PROP_COLOR in rprops.keys():