r24270 - in /desktop/unstable/libgnomekbd/debian: changelog patches/02_layout_crash.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed May  5 17:02:43 2010
New Revision: 24270

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24270
Log:
02_layout_crash.patch: stolen upstream. Fixes a crasher caused by an 
unitialized value. Hopefully closes: #580228.

Added:
    desktop/unstable/libgnomekbd/debian/patches/02_layout_crash.patch
Modified:
    desktop/unstable/libgnomekbd/debian/changelog
    desktop/unstable/libgnomekbd/debian/patches/series

Modified: desktop/unstable/libgnomekbd/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/changelog?rev=24270&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/changelog [utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/changelog [utf-8] Wed May  5 17:02:43 2010
@@ -1,3 +1,10 @@
+libgnomekbd (2.30.1-2) unstable; urgency=low
+
+  * 02_layout_crash.patch: stolen upstream. Fixes a crasher caused by an 
+    unitialized value. Hopefully closes: #580228.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 05 May 2010 19:02:02 +0200
+
 libgnomekbd (2.30.1-1) unstable; urgency=low
 
   * New upstream bugfix release:

Added: desktop/unstable/libgnomekbd/debian/patches/02_layout_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/patches/02_layout_crash.patch?rev=24270&op=file
==============================================================================
--- desktop/unstable/libgnomekbd/debian/patches/02_layout_crash.patch (added)
+++ desktop/unstable/libgnomekbd/debian/patches/02_layout_crash.patch [utf-8] Wed May  5 17:02:43 2010
@@ -1,0 +1,46 @@
+From 5298205b5f450e43ffec91ff81be448c0c42d026 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)
+ {
+-	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,
+ 	}
+ 
+ 	if (layout_name == NULL)
+-		layout_name = g_strdup ("??");
++		layout_name = g_strdup ("");
+ 
+ 	return layout_name;
+ }
+diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c
+index dbe65ee..5e62ae9 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

Modified: desktop/unstable/libgnomekbd/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libgnomekbd/debian/patches/series?rev=24270&op=diff
==============================================================================
--- desktop/unstable/libgnomekbd/debian/patches/series [utf-8] (original)
+++ desktop/unstable/libgnomekbd/debian/patches/series [utf-8] Wed May  5 17:02:43 2010
@@ -1,2 +1,3 @@
 01_requires_private.patch
+02_layout_crash.patch
 99_ltmain_as-needed.patch