From f750863f81440f18245538796110cf00d58cc1b8 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Wed, 07 Nov 2012 18:32:14 +0000
Subject: Buddy color: force bytestring encoding

When the color is given by the remote buddy, it comes as unicode, even
when the PropertiesChanged signal is connected with byte_arrays=True
in jarabe/model/neighborhood.py.  The Rsvg.Handle.new_from_data method
of toolkit needs a bytestring.  So we cast it to str.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
---
diff --git a/src/jarabe/model/neighborhood.py b/src/jarabe/model/neighborhood.py
index 85c35c9..1267d50 100644
--- a/src/jarabe/model/neighborhood.py
+++ b/src/jarabe/model/neighborhood.py
@@ -924,7 +924,7 @@ class Neighborhood(GObject.GObject):
         is_new = buddy.props.key is None and 'key' in properties
 
         if 'color' in properties:
-            buddy.props.color = XoColor(properties['color'])
+            buddy.props.color = XoColor(str(properties['color']))
 
         if 'key' in properties:
             buddy.props.key = properties['key']
--
cgit v0.9.1