[gedit] Make sure to encode accelerator name as utf-8

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 55d1f7937db65a44b2a01aac2c3e3afa22ad6a88
Author: Jesse van den Kieboom <jessevdk gnome org>
Date:   Mon Jan 30 13:33:00 2012 +0100

    Make sure to encode accelerator name as utf-8

 plugins/snippets/snippets/library.py |    2 +-
 plugins/snippets/snippets/snippet.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plugins/snippets/snippets/library.py b/plugins/snippets/snippets/library.py
index 7cb797e..0cb6d70 100644
--- a/plugins/snippets/snippets/library.py
+++ b/plugins/snippets/snippets/library.py
@@ -87,7 +87,7 @@ class SnippetData:
                                         keyval, mod = Gtk.accelerator_parse(child.text)
 
                                         if Gtk.accelerator_valid(keyval, mod):
-                                                child.text = Gtk.accelerator_name(keyval, mod)
+                                                child.text = unicode(Gtk.accelerator_name(keyval, mod), 'utf-8')
                                         else:
                                                 child.text = ''
 
diff --git a/plugins/snippets/snippets/snippet.py b/plugins/snippets/snippets/snippet.py
index b8f5a33..a036abb 100644
--- a/plugins/snippets/snippets/snippet.py
+++ b/plugins/snippets/snippets/snippet.py
@@ -113,9 +113,9 @@ class Snippet:
 
                 if accel:
                         keyval, mod = Gtk.accelerator_parse(accel)
-                        accel = Gtk.accelerator_get_label(keyval, mod)
+                        accel = unicode(Gtk.accelerator_get_label(keyval, mod), 'utf-8')
 
-                return accel or ''
+                return accel or u''
 
         def display(self):
                 nm = markup_escape(self['description'])