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

fix keyboard layout loading

Browse Source
This commit is contained in:
Matthias Clasen 2008-02-08 03:54:28 +00:00
parent 1885f67eb1
commit d82376b7fb
2 changed files with 18 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 Name: gnome-settings-daemon
Version: 2.21.90.1 Version: 2.21.90.1
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
@ -30,6 +30,8 @@ BuildRequires: gettext
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
Patch0: gsd-path-fix.patch Patch0: gsd-path-fix.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=511771
Patch1: load-xkb.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 +51,7 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .path %patch0 -p1 -b .path
%patch1 -p1 -b .load-xkb
%build %build
%configure --enable-static=no %configure --enable-static=no
@ -114,6 +117,9 @@ fi
%{_libdir}/pkgconfig/gnome-settings-daemon.pc %{_libdir}/pkgconfig/gnome-settings-daemon.pc
%changelog %changelog
* Thu Feb 7 2008 Matthias Clasen <mclasen@redhat.com> - 2.21.90.1-3
- Load xkb settings initially
* Thu Jan 31 2008 - Bastien Nocera <bnocera@redhat.com> - 2.21.90.1-2 * Thu Jan 31 2008 - Bastien Nocera <bnocera@redhat.com> - 2.21.90.1-2
- Fix the path for g-s-d, from upstream patch - Fix the path for g-s-d, from upstream patch

11
load-xkb.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c
--- gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c.load-xkb 2008-02-07 22:49:45.000000000 -0500
+++ gnome-settings-daemon-2.21.90.1/plugins/keyboard/gsd-keyboard-manager.c 2008-02-07 22:49:57.000000000 -0500
@@ -410,6 +410,7 @@ gsd_keyboard_manager_start (GsdKeyboardM
/* Essential - xkb initialization should happen before */
gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
gsd_keyboard_xkb_init (client);
+ gsd_keyboard_xkb_load (client);
register_config_callback (manager,
GSD_KEYBOARD_KEY,