rpms/gnome-settings-daemon/F-12 survive-xmm.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.136, 1.137

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2833

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	survive-xmm.patch 
Log Message:
Survive without XKB


survive-xmm.patch:
 gsd-keyboard-xkb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE survive-xmm.patch ---
diff -up gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c.survive-xmm	2009-12-15 15:39:28.904208015 -0500
+++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c	2009-12-15 15:39:46.554927327 -0500
@@ -236,7 +236,7 @@ apply_xkb_settings (void)
 		GSList *found_node;
 		int     max_groups;
 
-		max_groups = xkl_engine_get_max_num_groups (xkl_engine);
+		max_groups = MAX (xkl_engine_get_max_num_groups (xkl_engine), 1);
 		layouts = gconf_client_get_list (conf_client,
 						 GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
 						 GCONF_VALUE_STRING, NULL);


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-12/gnome-settings-daemon.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- gnome-settings-daemon.spec	12 Nov 2009 14:06:37 -0000	1.136
+++ gnome-settings-daemon.spec	15 Dec 2009 20:47:07 -0000	1.137
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.28.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -45,8 +45,10 @@ Patch4: 0001-Fix-bluriness-in-level-bar-
 Patch5: 0001-Avoid-volumes-going-over-100.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=601203
 Patch6: gsd-screen-changed.patch
-# 
+#
 Patch7: iconleak.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=604651
+Patch8: survive-xmm.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -73,6 +75,7 @@ developing applications that use %{name}
 %patch5 -p1 -b .too-high-volume
 %patch6 -p1 -b .screen-change
 %patch7 -p1 -b .iconleak
+%patch8 -p1 -b .survive-xmm
 
 %build
 %configure --enable-static=no --enable-profiling --disable-esd
@@ -184,6 +187,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Dec 15 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-9
+- Survive when running without XKB (#547780)
+
 * Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-8
 - Avoid a 'whitespace leak' around the display statusicon (gnome #601696)