From a2f8ef80f8c7dc7f85140560cc1fd602a06285123e69e60e637a6cf13e5d69e6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 29 Mar 2010 11:23:31 +0000 Subject: [PATCH] Accepting request 35881 from home:sreeves1:branches:GNOME:Factory 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 --- gnome-settings-daemon-add-layout-switcher.patch | 13 ++++++------- gnome-settings-daemon.changes | 6 ++++++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gnome-settings-daemon-add-layout-switcher.patch b/gnome-settings-daemon-add-layout-switcher.patch index 25af4c8..5a66014 100644 --- a/gnome-settings-daemon-add-layout-switcher.patch +++ b/gnome-settings-daemon-add-layout-switcher.patch @@ -1,7 +1,7 @@ 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 2010-01-13 16:44:53.000000000 +1100 +--- plugins/keyboard/gsd-keyboard-xkb.c.orig ++++ plugins/keyboard/gsd-keyboard-xkb.c @@ -461,6 +461,103 @@ show_hide_icon () } } @@ -106,12 +106,11 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c static gboolean try_activating_xkb_config_if_new (GkbdKeyboardConfig * current_sys_kbd_config) -@@ -621,6 +718,8 @@ apply_xkb_settings (void) - g_slist_foreach (free_layouts, - (GFunc) g_free, NULL); +@@ -623,6 +720,7 @@ apply_xkb_settings (void) 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, + GKBD_KEYBOARD_CONFIG_KEY_LAYOUTS, + GCONF_VALUE_STRING, layouts, diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index b9ad7d5..47e6ec5 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -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