[Pkg-xfce-commits] r2326 - in goodies/xfce4-xkb-plugin/debian: . patches

[corsac at alioth.debian.org]

Author: corsac
Date: 2008-09-23 22:56:55 +0000 (Tue, 23 Sep 2008)
New Revision: 2326

Added:
   goodies/xfce4-xkb-plugin/debian/patches/
   goodies/xfce4-xkb-plugin/debian/patches/01_fix-xklavier-switch-utf8.patch
Modified:
   goodies/xfce4-xkb-plugin/debian/changelog
Log:
* debian/patches:
  - 01_fix-xklavier-switch-utf8 added, don't try to convert xklavier strings
    to  UTF-8 as it's already UTF-8.

Modified: goodies/xfce4-xkb-plugin/debian/changelog
===================================================================
--- goodies/xfce4-xkb-plugin/debian/changelog	2008-09-23 22:49:26 UTC (rev 2325)
+++ goodies/xfce4-xkb-plugin/debian/changelog	2008-09-23 22:56:55 UTC (rev 2326)
@@ -14,9 +14,11 @@
     - update standards version to 3.8.0.
     - add build-dep on libxklavier12-dev, librsvg2-dev, libwnck-dev.
   * debian/copyright: update dates and copyright owners.  
-  * 
+  * debian/patches:
+    - 01_fix-xklavier-switch-utf8 added, don't try to convert xklavier strings
+      to  UTF-8 as it's already UTF-8.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 24 Sep 2008 00:38:03 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 24 Sep 2008 00:55:54 +0200
 
 xfce4-xkb-plugin (0.4.3-1) unstable; urgency=low
 

Added: goodies/xfce4-xkb-plugin/debian/patches/01_fix-xklavier-switch-utf8.patch
===================================================================
--- goodies/xfce4-xkb-plugin/debian/patches/01_fix-xklavier-switch-utf8.patch	                        (rev 0)
+++ goodies/xfce4-xkb-plugin/debian/patches/01_fix-xklavier-switch-utf8.patch	2008-09-23 22:56:55 UTC (rev 2326)
@@ -0,0 +1,14 @@
+diff --git a/panel-plugin/xkb-settings-dialog.c b/panel-plugin/xkb-settings-dialog.c
+index 04193fd..54d1c4a 100644
+--- a/panel-plugin/xkb-settings-dialog.c
++++ b/panel-plugin/xkb-settings-dialog.c
+@@ -101,8 +101,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)
+ }
+ /**/
+