gst/gst.c: Make sure gettext returns translations in UTF-8 encoding rather than in...

Original commit message from CVS:
Patch by: Frederic Crozat <fcrozat@mandriva.org>
* gst/gst.c: (init_pre):
Make sure gettext returns translations in UTF-8 encoding rather
than in the current locale encoding (#546822).

diff --git a/ChangeLog b/ChangeLog
index 3b3239c..05cdf92 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-07  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+       Patch by: Frederic Crozat <fcrozat@mandriva.org>
+
+       * gst/gst.c: (init_pre):
+       Make sure gettext returns translations in UTF-8 encoding rather
+       than in the current locale encoding (#546822).
+
 2008-08-07  Wim Taymans  <wim.taymans@collabora.co.uk>
 
        * gst/gstcaps.c: (gst_caps_structure_is_subset_field):

diff --git a/gst/gst.c b/gst/gst.c
index 77f8706..d937ae1 100644 (file)
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -585,6 +585,7 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data,
 #ifdef ENABLE_NLS
   setlocale (LC_ALL, "");
   bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 #endif /* ENABLE_NLS */
 
 #ifndef GST_DISABLE_GST_DEBUG