r16899 - in /desktop/unstable/libxklavier/debian: changelog patches/60_bind-textdomain-utf-8.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Sep  5 21:29:05 2008
New Revision: 16899

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16899
Log:
New patch, 60_bind-textdomain-utf-8, use UTF-8 for gettext translations,
not the locale's default encoding; fixes crash in screensaver in non-UTF-8
locales; from GNOME #529773; closes: #481119, #492090.

Added:
    desktop/unstable/libxklavier/debian/patches/60_bind-textdomain-utf-8.patch
Modified:
    desktop/unstable/libxklavier/debian/changelog

Modified: desktop/unstable/libxklavier/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/changelog?rev=16899&op=diff
==============================================================================
--- desktop/unstable/libxklavier/debian/changelog (original)
+++ desktop/unstable/libxklavier/debian/changelog Fri Sep  5 21:29:05 2008
@@ -1,3 +1,11 @@
+libxklavier (3.5-2) unstable; urgency=low
+
+  * New patch, 60_bind-textdomain-utf-8, use UTF-8 for gettext translations,
+    not the locale's default encoding; fixes crash in screensaver in non-UTF-8
+    locales; from GNOME #529773; closes: #481119, #492090.
+
+ -- Loic Minier <lool at dooz.org>  Fri, 05 Sep 2008 23:24:50 +0200
+
 libxklavier (3.5-1) unstable; urgency=low
 
   [ Loic Minier ]

Added: desktop/unstable/libxklavier/debian/patches/60_bind-textdomain-utf-8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libxklavier/debian/patches/60_bind-textdomain-utf-8.patch?rev=16899&op=file
==============================================================================
--- desktop/unstable/libxklavier/debian/patches/60_bind-textdomain-utf-8.patch (added)
+++ desktop/unstable/libxklavier/debian/patches/60_bind-textdomain-utf-8.patch Fri Sep  5 21:29:05 2008
@@ -1,0 +1,12 @@
+diff -rup libxklavier-3.5.orig/libxklavier/xklavier_config.c libxklavier-3.5/libxklavier/xklavier_config.c
+--- libxklavier-3.5.orig/libxklavier/xklavier_config.c	2008-02-28 15:36:06.000000000 +0100
++++ libxklavier-3.5/libxklavier/xklavier_config.c	2008-09-02 23:31:46.000000000 +0200
+@@ -847,6 +847,8 @@ xkl_config_registry_class_init(XklConfig
+ 	object_class->set_property = xkl_config_registry_set_property;
+ 	object_class->get_property = xkl_config_registry_get_property;
+ 
++	bind_textdomain_codeset (XKB_DOMAIN, "UTF-8");
++
+ 	engine_param_spec = g_param_spec_object("engine",
+ 						"Engine",
+ 						"XklEngine",