Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-11-09 13:20:10 (GMT)
committer Simon McVittie <simon.mcvittie@collabora.co.uk>2007-11-09 13:20:10 (GMT)
commite231a4a9476e6685a9895696cbb7e70de2e5fbba (patch)
treea3e3b1932444d01a90f89781f1324935c3696a73
parent31b7bd4fe26f1aaed2328611b51255a90b996067 (diff)
Disallow setting color property in ShareActivity properties dict, as per review from morgs
-rw-r--r--src/presenceservice.py6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/presenceservice.py b/src/presenceservice.py
index d098366..6f113f7 100644
--- a/src/presenceservice.py
+++ b/src/presenceservice.py
@@ -770,15 +770,9 @@ class PresenceService(ExportedGObject):
# by a separate argument are 'tags', 'color' and 'private', so let's
# hard-code support for those and only those. See #4660
private = properties.pop('private', True)
- color = properties.pop('color', self._owner.props.color)
tags = properties.pop('tags', u'')
try:
- if isinstance(color, unicode):
- color = color.encode('ascii')
- elif not isinstance(color, str):
- raise ValueError('"color" property must be str or unicode')
-
if not isinstance(tags, unicode):
raise ValueError('"tags" property must be Unicode string')