diff options
| author | Manuel Quiñones <manuq@laptop.org> | 2012-11-08 14:57:01 (GMT) |
|---|---|---|
| committer | Manuel Quiñones <manuq@laptop.org> | 2012-11-08 19:58:35 (GMT) |
| commit | 19039ee711b42bb0254c780cb9877c316adc2c7d (patch) | |
| tree | b194912e525f61b2a48dd6e55453408cbb0264b9 | |
| parent | 54cf9e743f170ce19d131579033b9e14f481caaf (diff) | |
Invite activity and other buddy activity color: force bytestring encoding - SL #4157
For the same reason as buddy color, commit f750863f . Add comments in
the code too.
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
| -rw-r--r-- | src/jarabe/model/invites.py | 3 | ||||
| -rw-r--r-- | src/jarabe/model/neighborhood.py | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/jarabe/model/invites.py b/src/jarabe/model/invites.py index 7c9abe9..d2d1721 100644 --- a/src/jarabe/model/invites.py +++ b/src/jarabe/model/invites.py @@ -91,6 +91,9 @@ class ActivityInvite(BaseInvite): def get_color(self): color = self._activity_properties.get('color', None) + # arrives unicode but we connect with byte_arrays=True - SL #4157 + if color is not None: + color = str(color) return XoColor(color) def join(self): diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py index 1267d50..a12ad2b 100644 --- a/src/jarabe/model/neighborhood.py +++ b/src/jarabe/model/neighborhood.py @@ -924,6 +924,7 @@ class Neighborhood(GObject.GObject): is_new = buddy.props.key is None and 'key' in properties if 'color' in properties: + # arrives unicode but we connect with byte_arrays=True - SL #4157 buddy.props.color = XoColor(str(properties['color'])) if 'key' in properties: @@ -975,7 +976,8 @@ class Neighborhood(GObject.GObject): is_new = activity.props.bundle is None - activity.props.color = XoColor(properties['color']) + # arrives unicode but we connect with byte_arrays=True - SL #4157 + activity.props.color = XoColor(str(properties['color'])) activity.props.bundle = bundle activity.props.name = properties['name'] activity.props.private = properties['private'] |