[Xfce4-commits] [panel-plugins/xfce4-xkb-plugin] 15/17: Bug 12294: Use local charset for layout names

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

n   i   n   e   t   l   s       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-xkb-plugin.

commit 36a6e59403cb9c9b9b51c46b8d6b9f065841c585
Author: Viktor Odintsev <zakhams at gmail.com>
Date:   Wed Apr 19 02:06:13 2017 +0300

    Bug 12294: Use local charset for layout names
---
 panel-plugin/xkb-cairo.c    | 6 ++----
 panel-plugin/xkb-keyboard.c | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/xkb-cairo.c b/panel-plugin/xkb-cairo.c
index 8947f83..9631ba0 100644
--- a/panel-plugin/xkb-cairo.c
+++ b/panel-plugin/xkb-cairo.c
@@ -163,8 +163,7 @@ xkb_cairo_draw_label (cairo_t *cr,
     layout = pango_cairo_create_layout (cr);
     normalized_group_name = xkb_util_normalize_group_name (group_name, FALSE);
 
-    if (!normalized_group_name ||
-        !g_utf8_validate (normalized_group_name, -1, NULL))
+    if (!normalized_group_name)
     {
         g_object_unref (layout);
         g_free (normalized_group_name);
@@ -257,8 +256,7 @@ xkb_cairo_draw_label_system (cairo_t *cr,
     layout = pango_cairo_create_layout (cr);
     normalized_group_name = xkb_util_normalize_group_name (group_name, TRUE);
 
-    if (!normalized_group_name ||
-        !g_utf8_validate (normalized_group_name, -1, NULL))
+    if (!normalized_group_name)
     {
         g_object_unref (layout);
         g_free (normalized_group_name);
diff --git a/panel-plugin/xkb-keyboard.c b/panel-plugin/xkb-keyboard.c
index 7b35e1b..3a932e7 100644
--- a/panel-plugin/xkb-keyboard.c
+++ b/panel-plugin/xkb-keyboard.c
@@ -176,7 +176,7 @@ xkb_keyboard_xkb_description (XklConfigItem *config_item)
     if (ci_description[0] == 0)
         description = g_strdup (config_item->name);
     else
-        description = g_locale_to_utf8 (ci_description, -1, NULL, NULL, NULL);
+        description = g_strdup (ci_description);
 
     return description;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.