merge of '77de2c054faaf8169bea5553ae2311a39a581403'

     and 'fd59ca4a2d1cdb56a15d6a3323721ce78836fe52'

1 files changed, 41 insertions, 0 deletions

diff --git a/packages/python/python-edje/0001-fix-unicode-conversion.patch b/packages/python/python-edje/0001-fix-unicode-conversion.patch
new file mode 100644
index 0000000000..7964e097d1
--- /dev/null
+++ b/packages/python/python-edje/0001-fix-unicode-conversion.patch
@@ -0,0 +1,41 @@
+From fa12a33b5a3c0e86231ca84967d9eff456e5f314 Mon Sep 17 00:00:00 2001
+From: Jan Luebbe <jluebbe@debian.org>
+Date: Sat, 9 Aug 2008 18:30:04 +0200
+Subject: [PATCH] fix unicode conversion
+
+---
+ edje/edje.c_edje_object.pxi |   11 +++++++----
+ 1 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/edje/edje.c_edje_object.pxi b/edje/edje.c_edje_object.pxi
+index 0f4da68..21c237e 100644
+--- a/edje/edje.c_edje_object.pxi
++++ b/edje/edje.c_edje_object.pxi
+@@ -391,17 +391,20 @@ cdef public class Edje(evas.c_evas.Object) [object PyEdje, type PyEdje_Type]:
+         else:
+             raise TypeError("func must be callable or None")
+ 
+-    def part_text_set(self, char *part, char *text):
+-        edje_object_part_text_set(self.obj, part, text)
++    def part_text_set(self, char *part, text):
++        cdef char *s
++        u = text.encode("utf8")
++        s = u
++        edje_object_part_text_set(self.obj, part, s)
+ 
+     def part_text_get(self, char *part):
+-        "@rtype: str"
++        "@rtype: unicode"
+         cdef char *s
+         s = edje_object_part_text_get(self.obj, part)
+         if s == NULL:
+             return None
+         else:
+-            return s
++            return s.decode("utf8")
+ 
+     def part_swallow(self, char *part, c_evas.Object obj):
+         """Swallows an object into the edje
+-- 
+1.5.6.3
+