rpms/gnome-settings-daemon
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Survive without XKB

Browse Source
This commit is contained in:
Matthias Clasen 2009-12-15 21:43:26 +00:00
parent a87385e49b
commit 060eb85204
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnome-settings-daemon.spec
View File

@ -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
@ -47,6 +47,8 @@ Patch5: 0001-Avoid-volumes-going-over-100.patch
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@redhat.com> 2.28.1-9
- Survive when running without XKB (#547780)
* Thu Nov 12 2009 Matthias Clasen <mclasen@redhat.com> 2.28.1-8
- Avoid a 'whitespace leak' around the display statusicon (gnome #601696)

12
survive-xmm.patch Normal file
View File

@ -0,0 +1,12 @@
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);