r16924 - in /desktop/unstable/control-center/debian: changelog patches/02_xklavier_utf8.patch

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Sep 10 10:47:32 UTC 2008


Author: joss
Date: Wed Sep 10 10:47:32 2008
New Revision: 16924

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16924
Log:
02_xklavier_utf8.patch: patch from upstream to accomodate the UTF8
changes in libxklavier 3.5-2.

Added:
    desktop/unstable/control-center/debian/patches/02_xklavier_utf8.patch
Modified:
    desktop/unstable/control-center/debian/changelog

Modified: desktop/unstable/control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/changelog?rev=16924&op=diff
==============================================================================
--- desktop/unstable/control-center/debian/changelog (original)
+++ desktop/unstable/control-center/debian/changelog Wed Sep 10 10:47:32 2008
@@ -1,3 +1,10 @@
+control-center (1:2.22.2.1-2) unstable; urgency=low
+
+  * 02_xklavier_utf8.patch: patch from upstream to accomodate the UTF8
+    changes in libxklavier 3.5-2.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 10 Sep 2008 12:34:52 +0200
+
 control-center (1:2.22.2.1-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/control-center/debian/patches/02_xklavier_utf8.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/control-center/debian/patches/02_xklavier_utf8.patch?rev=16924&op=file
==============================================================================
--- desktop/unstable/control-center/debian/patches/02_xklavier_utf8.patch (added)
+++ desktop/unstable/control-center/debian/patches/02_xklavier_utf8.patch Wed Sep 10 10:47:32 2008
@@ -1,0 +1,31 @@
+--- trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2008/09/05 19:53:23	8928
++++ trunk/capplets/keyboard/gnome-keyboard-properties-xkblt.c	2008/09/05 23:29:10	8929
+@@ -365,15 +365,10 @@
+ xkb_layout_description_utf8 (const gchar * visible)
+ {
+ 	char *l, *sl, *v, *sv;
+-	char *v1, *utf_visible;
+ 	if (gkbd_keyboard_config_get_descriptions
+ 	    (config_registry, visible, &sl, &l, &sv, &v))
+ 		visible = gkbd_keyboard_config_format_full_layout (l, v);
+-	v1 = g_strdup (visible);
+-	utf_visible =
+-	    g_locale_to_utf8 (g_strstrip (v1), -1, NULL, NULL, NULL);
+-	g_free (v1);
+-	return utf_visible;
++	return g_strstrip (g_strdup (visible));
+ }
+ 
+ void
+--- trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	2008/09/05 19:53:23	8928
++++ trunk/capplets/keyboard/gnome-keyboard-properties-xkb.c	2008/09/05 23:29:10	8929
+@@ -48,8 +48,7 @@
+ xci_desc_to_utf8 (XklConfigItem * ci)
+ {
+ 	char *sd = g_strstrip (ci->description);
+-	return sd[0] == 0 ? g_strdup (ci->name) :
+-	    g_locale_to_utf8 (sd, -1, NULL, NULL, NULL);
++	return sd[0] == 0 ? g_strdup (ci->name) : g_strdup (sd);
+ }
+ 
+ static void




More information about the pkg-gnome-commits mailing list