=== modified file 'xl/nls.py'
--- xl/nls.py	2009-11-24 22:46:52 +0000
+++ xl/nls.py	2010-03-02 10:26:30 +0000
@@ -38,11 +38,11 @@
 try:
     import gettext
 
-    gettext.textdomain('exaile')
+    gettext.install('exaile', unicode=True)
     if xdg.local_hack: # running from source dir, so we have to set the paths
-        gettext.bindtextdomain('exaile', os.path.join(xdg.exaile_dir, 'po'))
+        gettext.install('exaile', os.path.join(xdg.exaile_dir, 'po'), True)
 
-    gettext = gettext.gettext
+    gettext = _
 except ImportError:
     # gettext is not available.  Provide a dummy function instead
     def gettext(text):

=== modified file 'xlgui/playlist.py'
--- xlgui/playlist.py	2010-01-30 06:02:32 +0000
+++ xlgui/playlist.py	2010-03-02 10:45:33 +0000
@@ -393,7 +393,7 @@
         count = 3
         search_column = settings.get_option("gui/search_column", "Title")
         for col in self.list.get_columns():
-            if col.get_title() == search_column:
+            if col.get_title().decode('utf-8') == search_column:
                 self.list.set_search_column(count)
             count = count + 1
 
@@ -621,7 +621,8 @@
         self.list.disconnect(self.changed_id)
         cols = []
         for col in self.list.get_columns():
-            cols.append(self.column_by_display[col.get_title()].id)
+            cols.append(self.column_by_display[col.get_title().
+                                               decode('utf-8')].id)
             self.list.remove_column(col)
 
         settings.set_option('gui/columns', cols)
@@ -946,7 +947,7 @@
             Called when the user resizes a column
         """
         if self._is_queue: return
-        col_struct = self.column_by_display[col.get_title()]
+        col_struct = self.column_by_display[col.get_title().decode('utf-8')]
         name = 'gui/col_width_%s' % col_struct.id
         w = col.get_width()
         if w != settings.get_option(name, -1):
@@ -960,7 +961,7 @@
         """
         title = column.get_title()
         for col in self.list.get_columns():
-            if title == col.get_title():
+            if title == col.get_title().decode('utf-8'):
                 order = column.get_sort_order()
                 if order == gtk.SORT_ASCENDING:
                     order = gtk.SORT_DESCENDING
@@ -1019,7 +1020,8 @@
         """
         for col in self.list.get_columns():
             if col.get_sort_indicator():
-                return (self.column_by_display[col.get_title()].id,
+                return (self.column_by_display[col.get_title().
+                                               decode('utf-8')].id,
                     col.get_sort_order() == gtk.SORT_DESCENDING)
         return None, False