[Pkg-xfce-commits] r2327 - in goodies/xfkc/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-23 23:01:06 +0000 (Tue, 23 Sep 2008)
New Revision: 2327

Added:
   goodies/xfkc/debian/patches/
   goodies/xfkc/debian/patches/01_fix-xklavier-switch-utf8.patch
Modified:
   goodies/xfkc/debian/changelog
Log:
* debian/patches:
  - 01_fix-xklavier-switch-utf8 added, don't try to convert xklavier strings
    to UTF-8 as it's alredy is.                               closes: #499960

Modified: goodies/xfkc/debian/changelog
===================================================================
--- goodies/xfkc/debian/changelog	2008-09-23 22:56:55 UTC (rev 2326)
+++ goodies/xfkc/debian/changelog	2008-09-23 23:01:06 UTC (rev 2327)
@@ -1,10 +1,16 @@
 xfkc (0.2-2) UNRELEASED; urgency=low
 
+  [ Stefan Ott ]
   * Added debian/watch
   * debian/control: update e-mail address
 
- -- Stefan Ott <stefan at ott.net>  Fri, 27 Jun 2008 02:37:14 +0200
+  [ Yves-Alexis Perez ]
+  * debian/patches:
+    - 01_fix-xklavier-switch-utf8 added, don't try to convert xklavier strings
+      to UTF-8 as it's alredy is.                               closes: #499960
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 24 Sep 2008 00:59:53 +0200
+
 xfkc (0.2-1) unstable; urgency=low
 
   * Initial Release.                                            closes: #478168

Added: goodies/xfkc/debian/patches/01_fix-xklavier-switch-utf8.patch
===================================================================
--- goodies/xfkc/debian/patches/01_fix-xklavier-switch-utf8.patch	                        (rev 0)
+++ goodies/xfkc/debian/patches/01_fix-xklavier-switch-utf8.patch	2008-09-23 23:01:06 UTC (rev 2327)
@@ -0,0 +1,14 @@
+diff --git a/src/gui.c b/src/gui.c
+index a0ad499..060195a 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -38,8 +38,7 @@ char *
+ 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)
+ }
+ //
+