rpms/libgnomekbd/F-13 libgnomekbd-crash.patch,1.1,1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14812

Modified Files:
	libgnomekbd-crash.patch 
Log Message:
fix patch


libgnomekbd-crash.patch:
 gkbd-indicator.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: libgnomekbd-crash.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/F-13/libgnomekbd-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libgnomekbd-crash.patch	11 May 2010 16:30:54 -0000	1.1
+++ libgnomekbd-crash.patch	11 May 2010 16:39:20 -0000	1.2
@@ -1,47 +1,21 @@
-From 4f9c7b401e948756fbe76a56a7619052f8acae42 Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu at gnome.org>
-Date: Tue, 04 May 2010 23:36:04 +0000
-Subject: Do not crash on kbd plug in
-
-There is funny race condition in X - when _XKB_RULES_NAMES is already
-loaded from sysconfig while actual XKB config is still not changed (from
-user config). This commit should fix
-https://bugzilla.gnome.org/show_bug.cgi?id=617643
----
-diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c
-index 5def369..f6064fa 100644
---- a/libgnomekbd/gkbd-indicator.c
-+++ b/libgnomekbd/gkbd-indicator.c
-@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
-                                    gchar ** short_group_names,
-                                    gchar ** full_group_names)
+diff -up libgnomekbd-2.30.1/libgnomekbd/gkbd-indicator.c.crash libgnomekbd-2.30.1/libgnomekbd/gkbd-indicator.c
+--- libgnomekbd-2.30.1/libgnomekbd/gkbd-indicator.c.crash	2010-03-28 18:27:04.000000000 -0400
++++ libgnomekbd-2.30.1/libgnomekbd/gkbd-indicator.c	2010-05-11 12:36:59.441662809 -0400
+@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int 
+ 				    gchar ** short_group_names,
+ 				    gchar ** full_group_names)
  {
--       char *layout_name;
-+       char *layout_name = NULL;
-        if (group < g_strv_length (short_group_names)) {
-                if (xkl_engine_get_features (engine) &
-                    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
-@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine,
-        }
+-	char *layout_name;
++	char *layout_name = NULL;
+ 	if (group < g_strv_length (short_group_names)) {
+ 		if (xkl_engine_get_features (engine) &
+ 		    XKLF_MULTIPLE_LAYOUTS_SUPPORTED) {
+@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int 
+ 	}
  
-        if (layout_name == NULL)
--               layout_name = g_strdup ("??");
-+               layout_name = g_strdup ("");
+ 	if (layout_name == NULL)
+-		layout_name = g_strdup ("??");
++		layout_name = g_strdup ("");
  
-        return layout_name;
+ 	return layout_name;
  }
-diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
-index 90731af..efcad6a 100644
---- a/libgnomekbd/gkbd-status.c
-+++ b/libgnomekbd/gkbd-status.c
-@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group)
-        cairo_font_options_t *fo;
-        static GHashTable *ln2cnt_map = NULL;
- 
-+       xkl_debug (160, "Rendering cairo for group %d\n", group);
-        if (globals.ind_cfg.background_color != NULL &&
-            globals.ind_cfg.background_color[0] != 0) {
-                if (sscanf
---
-cgit v0.8.3.1
-