pool/gnome-settings-daemon
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 35881 from home:sreeves1:branches:GNOME:Factory

Browse Source 
Copy from home:sreeves1:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 35881 revision 2.
Request was accepted with message:
thanks

OBS-URL: https://build.opensuse.org/request/show/35881
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=58
This commit is contained in:
Vincent Untz 2010-03-29 11:23:31 +00:00 committed by Git OBS Bridge
parent 99c7f2b955
commit a2f8ef80f8
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnome-settings-daemon-add-layout-switcher.patch
View File

@ -1,7 +1,7 @@
Index: plugins/keyboard/gsd-keyboard-xkb.c Index: plugins/keyboard/gsd-keyboard-xkb.c
=================================================================== ===================================================================
--- plugins/keyboard/gsd-keyboard-xkb.c.orig 2010-01-13 02:51:57.000000000 +1100 --- plugins/keyboard/gsd-keyboard-xkb.c.orig
+++ plugins/keyboard/gsd-keyboard-xkb.c 2010-01-13 16:44:53.000000000 +1100 +++ plugins/keyboard/gsd-keyboard-xkb.c
@@ -461,6 +461,103 @@ show_hide_icon () @@ -461,6 +461,103 @@ show_hide_icon ()
} }
} }
@ -106,12 +106,11 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c
static gboolean static gboolean
try_activating_xkb_config_if_new (GkbdKeyboardConfig * try_activating_xkb_config_if_new (GkbdKeyboardConfig *
current_sys_kbd_config) current_sys_kbd_config)
@@ -621,6 +718,8 @@ apply_xkb_settings (void) @@ -623,6 +720,7 @@ apply_xkb_settings (void)
g_slist_foreach (free_layouts,
(GFunc) g_free, NULL);
g_slist_free (free_layouts); g_slist_free (free_layouts);
+
+ _maybe_add_layout_switcher (layouts, conf_client);
} }
+ _maybe_add_layout_switcher (layouts, conf_client);
gconf_client_set_list (conf_client, gconf_client_set_list (conf_client,
GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
GCONF_VALUE_STRING, layouts,

6
gnome-settings-daemon.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Mar 26 22:58:04 UTC 2010 - sreeves@novell.com
- Fix gnome-settings-daemon-add-layout-switcher.patch
+ call maybe_add_layout_switcher method at the right level
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 8 15:02:14 CET 2010 - dimstar@opensuse.org Mon Mar 8 15:02:14 CET 2010 - dimstar@opensuse.org