Ticket #4157: 0001-Invite-activity-and-other-buddy-activity-color-force.patch

File 0001-Invite-activity-and-other-buddy-activity-color-force.patch, 1.6 KB (added by manuq, 11 years ago)

  • src/jarabe/model/invites.py 

    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): 
    9191
    9292    def get_color(self):
    9393        color = self._activity_properties.get('color', None)
     94        if color is not None:
     95            color = str(color)
    9496        return XoColor(color)
    9597
    9698    def join(self):

  • src/jarabe/model/neighborhood.py 

    diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 1267d50..33e5ec8 100644
    a b class Neighborhood(GObject.GObject): 
    975975
    976976        is_new = activity.props.bundle is None
    977977
    978         activity.props.color = XoColor(properties['color'])
     978        activity.props.color = XoColor(str(properties['color']))
    979979        activity.props.bundle = bundle
    980980        activity.props.name = properties['name']
    981981        activity.props.private = properties['private']