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

- Don't set keyboard model on startup from gconf if evdev is being used.

Browse Source 
Evdev needs to use its own keyboard model to work right.
This commit is contained in:
Ray Strode 2008-03-09 23:48:54 +00:00
parent 54d84ec35c
commit 1d484ea37a
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
index a633167..7896d85 100644
--- a/plugins/keyboard/gsd-keyboard-xkb.c
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -152,6 +152,12 @@ apply_xkb_settings (void)
gkbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
NULL);
+ /* Ignore model if using evdev, since evdev needs its own model
+ */
+ if (strcmp (initial_sys_kbd_config.model, "evdev") == 0) {
+ g_free (current_kbd_config.model);
+ current_kbd_config.model = g_strdup ("evdev");
+ }
/* Activate - only if different! */
if (!gkbd_keyboard_config_equals
(&current_kbd_config, &current_sys_kbd_config)) {

8
gnome-settings-daemon.spec
View File

@ -1,6 +1,6 @@
Name: gnome-settings-daemon Name: gnome-settings-daemon
Version: 2.21.92 Version: 2.21.92
Release: 2%{?dist} Release: 3%{?dist}
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
Group: System Environment/Daemons Group: System Environment/Daemons
@ -29,6 +29,7 @@ BuildRequires: gettext
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
Patch1: add-randr-12.patch Patch1: add-randr-12.patch
Patch2: gnome-settings-daemon-2.21.91-ignore-model-if-evdev.patch
%description %description
A daemon to share settings from GNOME to other applications. It also A daemon to share settings from GNOME to other applications. It also
@ -49,6 +50,7 @@ developing applications that use %{name}.
%setup -q %setup -q
%patch1 -p1 -b .add-randr-12 %patch1 -p1 -b .add-randr-12
%patch2 -p1 -b .ignore-layout-if-using-evdev
%build %build
%configure --enable-static=no %configure --enable-static=no
@ -123,6 +125,10 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Sun Mar 9 2008 Ray Strode <rstrode@redhat.com> - 2.21.92-3
- Don't set keyboard model on startup from gconf if evdev is being used.
Evdev needs to use its own keyboard model to work right.
* Sun Mar 2 2008 Soren Sandmann <sandmann@redhat.com> - 2.21.92-2 * Sun Mar 2 2008 Soren Sandmann <sandmann@redhat.com> - 2.21.92-2
- Update randr patch to handle video key - Update randr patch to handle video key