Attachment #183385 for bug #215559

View | Details | Raw Unified | Return to bug 215559
Collapse All | Expand All

Lines 2-7 Link Here

(-)Makefile (+1 lines)
2		2
3	PORTNAME= xfce4-xkb-plugin	3	PORTNAME= xfce4-xkb-plugin
4	PORTVERSION= 0.7.1	4	PORTVERSION= 0.7.1
		5	PORTREVISION= 1
5	CATEGORIES= deskutils xfce	6	CATEGORIES= deskutils xfce
6	MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}	7	MASTER_SITES= XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
7		8




--- panel-plugin/xkb-cairo.c.orig	2015-02-27 21:53:11 UTC
+++ panel-plugin/xkb-cairo.c
@@ -158,8 +158,7 @@ xkb_cairo_draw_label (cairo_t *cr,
     layout = pango_cairo_create_layout (cr);
     normalized_group_name = xkb_util_normalize_group_name (group_name);
 
-    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);

Line 0 Link Here

(-)files/patch-panel-plugin_xkb-config.c (+11 lines)
	1	--- panel-plugin/xkb-config.c.orig 2015-02-27 21:57:16 UTC
	2	+++ panel-plugin/xkb-config.c
	3	@@ -141,7 +141,7 @@ xkb_config_xkb_description (XklConfigIte
	4	if (ci_description[0] == 0)
	5	description = g_strdup (config_item->name);
	6	else
	7	- description = g_locale_to_utf8 (ci_description, -1, NULL, NULL, NULL);
	8	+ description = g_strdup (ci_description);
	9
	10	return description;
	11	}

Return to bug 215559

Line 0 Link Here

(-)files/patch-panel-plugin_xkb-cairo.c (+12 lines)
	1	--- panel-plugin/xkb-cairo.c.orig 2015-02-27 21:53:11 UTC
	2	+++ panel-plugin/xkb-cairo.c
	3	@@ -158,8 +158,7 @@ xkb_cairo_draw_label (cairo_t *cr,
	4	layout = pango_cairo_create_layout (cr);
	5	normalized_group_name = xkb_util_normalize_group_name (group_name);
	6
	7	- if (!normalized_group_name \|\|
	8	- !g_utf8_validate (normalized_group_name, -1, NULL))
	9	+ if (!normalized_group_name)
	10	{
	11	g_object_unref (layout);
	12	g_free (normalized_group_name);