Please review this at http://codereview.appspot.com/4273044/
Affected files:
M tryton/common/common.py
M tryton/config.py
Index: tryton/common/common.py
===================================================================
--- a/tryton/common/common.py
+++ b/tryton/common/common.py
@@ -57,7 +57,7 @@
continue
try:
pixbuf = gtk.gdk.pixbuf_new_from_file(
- os.path.join(PIXMAPS_DIR, fname))
+ os.path.join(PIXMAPS_DIR, fname).encode('utf-8'))
except Exception:
continue
icon_set = gtk.IconSet(pixbuf)
@@ -102,7 +102,7 @@
fileno, path = tempfile.mkstemp()
with os.fdopen(fileno, 'w') as svgfile:
svgfile.write(icon['icon'])
- pixbuf = gtk.gdk.pixbuf_new_from_file(path)
+ pixbuf = gtk.gdk.pixbuf_new_from_file(path.encode('utf-8'))
os.remove(path)
iconset = gtk.IconSet(pixbuf)
self.add(icon['name'], iconset)
@@ -319,7 +319,8 @@
def update_preview_cb(win, img):
filename = win.get_preview_filename()
try:
- pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(filename,
128, 128)
+ pixbuf =
gtk.gdk.pixbuf_new_from_file_at_size(filename.encode('utf-8'),
+ 128, 128)
img.set_from_pixbuf(pixbuf)
have_preview = True
except Exception:
Index: tryton/config.py
===================================================================
--- a/tryton/config.py
+++ b/tryton/config.py
@@ -187,7 +187,7 @@
PIXMAPS_DIR = os.path.join(PREFIX, 'share', 'pixmaps', 'tryton')
TRYTON_ICON = gtk.gdk.pixbuf_new_from_file(
- os.path.join(PIXMAPS_DIR, 'tryton-icon.png'))
+ os.path.join(PIXMAPS_DIR, 'tryton-icon.png').encode('utf-8'))
def _data_dir():
data_dir = os.path.join(CURRENT_DIR, 'share', 'tryton')
--
Cédric Krier
B2CK SPRL
Rue de Rotterdam, 4
4000 Liège
Belgium
Tel: +32 472 54 46 59
Email/Jabber: [email protected]
Website: http://www.b2ck.com/
pgpJ4o5wSMNEI.pgp
Description: PGP signature
