From 07a4248e395813cac6c0c618ad6bffd0ac877ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Qui=C3=B1ones?= <manuq@laptop.org>
Date: Thu, 8 Nov 2012 11:57:01 -0300
Subject: [PATCH shell 1/2] Invite activity and other buddy activity color:
force bytestring encoding - SL #4157
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Mail-Followup-To: <sugar-devel@lists.sugarlabs.org>
For the same reason as buddy color, commit f750863f .
Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
src/jarabe/model/invites.py | 2 ++
src/jarabe/model/neighborhood.py | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/jarabe/model/invites.py b/src/jarabe/model/invites.py
index 7c9abe9..7468dc0 100644
a
|
b
|
class ActivityInvite(BaseInvite): |
91 | 91 | |
92 | 92 | def get_color(self): |
93 | 93 | color = self._activity_properties.get('color', None) |
| 94 | if color is not None: |
| 95 | color = str(color) |
94 | 96 | return XoColor(color) |
95 | 97 | |
96 | 98 | def join(self): |
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 1267d50..33e5ec8 100644
a
|
b
|
class Neighborhood(GObject.GObject): |
975 | 975 | |
976 | 976 | is_new = activity.props.bundle is None |
977 | 977 | |
978 | | activity.props.color = XoColor(properties['color']) |
| 978 | activity.props.color = XoColor(str(properties['color'])) |
979 | 979 | activity.props.bundle = bundle |
980 | 980 | activity.props.name = properties['name'] |
981 | 981 | activity.props.private = properties['private'] |