From a48ad6f0fd61584b39960c3c16cbc959a011abb8 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@mandriva.com>
Date: Wed, 12 May 2010 17:52:28 +0200
Subject: [PATCH] fix for non-UTF8 locale

---
 src/Applet/Applet.cpp |    1 +
 src/Daemon/Daemon.cpp |    1 +
 src/Gui/abrt_utils.py |    2 +-
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/Applet/Applet.cpp b/src/Applet/Applet.cpp
index ccd6f39..281c931 100644
--- a/src/Applet/Applet.cpp
+++ b/src/Applet/Applet.cpp
@@ -195,6 +195,7 @@ int main(int argc, char** argv)
 #if ENABLE_NLS
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE, "UTF-8");
 #endif
 
     /* Need to be thread safe */
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index b75af52..e4d1bad 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -700,6 +700,7 @@ int main(int argc, char** argv)
 #if ENABLE_NLS
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
+    bind_textdomain_codeset(PACKAGE,"UTF-8");
 #endif
 
     if (getuid() != 0)
diff --git a/src/Gui/abrt_utils.py b/src/Gui/abrt_utils.py
index 701d477..e6ec901 100644
--- a/src/Gui/abrt_utils.py
+++ b/src/Gui/abrt_utils.py
@@ -20,8 +20,8 @@ def init_logging(progname, v):
         import os
         os.environ['LC_ALL'] = 'C'
         locale.setlocale(locale.LC_ALL, "")
-    gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, locale.nl_langinfo(locale.CODESET))
     gettext.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale')
+    gettext.bind_textdomain_codeset(GETTEXT_PROGNAME, "UTF-8")
     gtk.glade.bindtextdomain(GETTEXT_PROGNAME, '/usr/share/locale')
     gtk.glade.textdomain(GETTEXT_PROGNAME)
     gettext.textdomain(GETTEXT_PROGNAME)
-- 
1.7.1