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

Don't rely on _BACKUP property for xkb initialization

Browse Source
This commit is contained in:
Matthias Clasen 2009-04-30 02:17:13 +00:00
parent fcb8078a0a
commit bf8c5e856a
2 changed files with 19 additions and 1 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.26.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons
@ -44,6 +44,8 @@ Patch12: gnome-settings-daemon-2.26.1-fix-touchpad.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=580616
Patch13: compare-keys-carefully.patch
Patch14: gsd-xkb-init.patch
%description
A daemon to share settings from GNOME to other applications. It also
handles global keybindings, as well as a number of desktop-wide settings.
@ -66,6 +68,7 @@ developing applications that use %{name}.
%patch11 -p1 -b .support-touchpads
%patch12 -p1 -b .lefthand-touchpad
%patch13 -p1 -b .compare-keys-carefully
%patch14 -p1 -b .xkb-init
autoreconf -i -f
@ -178,6 +181,9 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog
* Wed Apr 29 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-4
- Don't rely on _BACKUP property for xkb initialization
* Wed Apr 29 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-3
- Make custom keybindings work better (#497725)

12
gsd-xkb-init.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c
--- gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c.xkb-init 2009-04-29 21:42:13.873737299 -0400
+++ gnome-settings-daemon-2.26.1/plugins/keyboard/gsd-keyboard-xkb.c 2009-04-29 21:42:23.752987998 -0400
@@ -234,7 +234,7 @@ gsd_keyboard_xkb_analyze_sysconfig (void
conf_client = gconf_client_get_default ();
gkbd_keyboard_config_init (&initial_sys_kbd_config,
conf_client, xkl_engine);
- gkbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+ gkbd_keyboard_config_load_from_x_current (&initial_sys_kbd_config,
NULL);
g_object_unref (conf_client);
}