From e231a4a9476e6685a9895696cbb7e70de2e5fbba Mon Sep 17 00:00:00 2001
From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 09 Nov 2007 13:20:10 +0000
Subject: Disallow setting color property in ShareActivity properties dict, as per review from morgs

---
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')
 
--
cgit v0.9.1