From a2f8ef80f8c7dc7f85140560cc1fd602a06285123e69e60e637a6cf13e5d69e6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 29 Mar 2010 11:23:31 +0000 Subject: [PATCH 1/4] 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 From f327735514af527db02ba6a4afd6c12bc0ffec2fbe3902b8c0f6f37c792f3937 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Tue, 30 Mar 2010 03:59:22 +0000 Subject: [PATCH 2/4] Accepting request 36024 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gnome-settings-daemon via accept of submit request 36024 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/36024 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=59 --- gnome-settings-daemon-2.29.92.tar.bz2 | 3 -- gnome-settings-daemon-2.30.0.tar.bz2 | 3 ++ ...ettings-daemon-bnc462640-mute-action.patch | 31 +++++++++---------- gnome-settings-daemon.changes | 19 ++++++++++++ gnome-settings-daemon.spec | 4 +-- 5 files changed, 39 insertions(+), 21 deletions(-) delete mode 100644 gnome-settings-daemon-2.29.92.tar.bz2 create mode 100644 gnome-settings-daemon-2.30.0.tar.bz2 diff --git a/gnome-settings-daemon-2.29.92.tar.bz2 b/gnome-settings-daemon-2.29.92.tar.bz2 deleted file mode 100644 index 98a4d3f..0000000 --- a/gnome-settings-daemon-2.29.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c27097f5db4e19926729d961e30ec8e0f7a9c565daa0d2674c4f02d0cb2c8c19 -size 1223347 diff --git a/gnome-settings-daemon-2.30.0.tar.bz2 b/gnome-settings-daemon-2.30.0.tar.bz2 new file mode 100644 index 0000000..beb5f96 --- /dev/null +++ b/gnome-settings-daemon-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa +size 1230687 diff --git a/gnome-settings-daemon-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch index a88eae3..049a786 100644 --- a/gnome-settings-daemon-bnc462640-mute-action.patch +++ b/gnome-settings-daemon-bnc462640-mute-action.patch @@ -1,8 +1,8 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in =================================================================== ---- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig 2010-01-13 02:51:57.000000000 +1100 -+++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2010-01-13 16:44:53.000000000 +1100 -@@ -14,6 +14,17 @@ +--- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig ++++ data/apps_gnome_settings_daemon_keybindings.schemas.in +@@ -25,6 +25,17 @@ @@ -22,25 +22,25 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in string Index: plugins/media-keys/gsd-media-keys-manager.c =================================================================== ---- plugins/media-keys/gsd-media-keys-manager.c.orig 2010-01-13 02:51:57.000000000 +1100 -+++ plugins/media-keys/gsd-media-keys-manager.c 2010-01-13 16:44:53.000000000 +1100 -@@ -636,8 +636,10 @@ do_sound_action (GsdMediaKeysManager *ma +--- plugins/media-keys/gsd-media-keys-manager.c.orig ++++ plugins/media-keys/gsd-media-keys-manager.c +@@ -681,9 +681,11 @@ do_sound_action (GsdMediaKeysManager *ma int type) { gboolean muted; + gboolean toggle_mute; guint vol, norm_vol_step; int vol_step; + gboolean sound_changed; + GError *error; if (manager->priv->stream == NULL) return; -@@ -658,7 +660,23 @@ do_sound_action (GsdMediaKeysManager *ma +@@ -704,7 +706,21 @@ do_sound_action (GsdMediaKeysManager *ma + switch (type) { case MUTE_KEY: - muted = !muted; -- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); -+ +- muted = !muted; + error = NULL; + toggle_mute = gconf_client_get_bool (manager->priv->conf_client, + GCONF_MISC_DIR "/toggle_mute", @@ -52,11 +52,10 @@ Index: plugins/media-keys/gsd-media-keys-manager.c + } + + if (toggle_mute) -+ gvc_mixer_stream_change_is_muted (manager->priv->stream, -+ muted); ++ muted = !muted; + else -+ gvc_mixer_stream_change_is_muted (manager->priv->stream, -+ TRUE); ++ muted = TRUE; ++ + gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); + sound_changed = TRUE; break; - case VOLUME_DOWN_KEY: - if (!muted && (vol <= norm_vol_step)) { diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index 47e6ec5..fcb8903 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Mar 29 17:38:21 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.30.0: + + Protect XInput code by ifdefs if XInput isn't available + (bgo#611670) + + Don't play a sound when the volume doesn't change (bgo#610001) + + Fix linking with pedantic linkers (bgo#610244) + + Remove unused do_sleep_action function + + Apply all keyboard settings to new keyboards (bgo#610245) + + Ensure the window is realized before we invalidate it + (bgo#604918) + + Replace "eject" spawn with GIO code (bgo#580779) + + Don't spawn xrdb (bgo#586276) + + Add translator hint (bgo#613647) + + Disable font plugin by default (bgo#613604) + + Updated translations. +- Rebase gnome-settings-daemon-bnc462640-mute-action.patch. + ------------------------------------------------------------------- Fri Mar 26 22:58:04 UTC 2010 - sreeves@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index d46e407..635082c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.29.92) +# spec file for package gnome-settings-daemon (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gnome-settings-daemon %define _name gnome-settings-daemon -Version: 2.29.92 +Version: 2.30.0 Release: 1 License: GPLv2+ Summary: Settings daemon for the GNOME desktop From 91c4655266c841031fdb1c2ba31da5cbbbc20ee060a70bc021d03b5ce56d6fd2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 1 Apr 2010 01:30:17 +0000 Subject: [PATCH 3/4] Accepting request 36332 from GNOME:Factory checked in (request 36332) OBS-URL: https://build.opensuse.org/request/show/36332 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=60 --- gnome-settings-daemon-2.29.92.tar.bz2 | 3 ++ gnome-settings-daemon-2.30.0.tar.bz2 | 3 -- ...-settings-daemon-add-layout-switcher.patch | 13 ++++---- ...ettings-daemon-bnc462640-mute-action.patch | 31 ++++++++++--------- gnome-settings-daemon.changes | 25 --------------- gnome-settings-daemon.spec | 4 +-- 6 files changed, 28 insertions(+), 51 deletions(-) create mode 100644 gnome-settings-daemon-2.29.92.tar.bz2 delete mode 100644 gnome-settings-daemon-2.30.0.tar.bz2 diff --git a/gnome-settings-daemon-2.29.92.tar.bz2 b/gnome-settings-daemon-2.29.92.tar.bz2 new file mode 100644 index 0000000..98a4d3f --- /dev/null +++ b/gnome-settings-daemon-2.29.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c27097f5db4e19926729d961e30ec8e0f7a9c565daa0d2674c4f02d0cb2c8c19 +size 1223347 diff --git a/gnome-settings-daemon-2.30.0.tar.bz2 b/gnome-settings-daemon-2.30.0.tar.bz2 deleted file mode 100644 index beb5f96..0000000 --- a/gnome-settings-daemon-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa -size 1230687 diff --git a/gnome-settings-daemon-add-layout-switcher.patch b/gnome-settings-daemon-add-layout-switcher.patch index 5a66014..25af4c8 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 -+++ 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 @@ -461,6 +461,103 @@ show_hide_icon () } } @@ -106,11 +106,12 @@ Index: plugins/keyboard/gsd-keyboard-xkb.c static gboolean try_activating_xkb_config_if_new (GkbdKeyboardConfig * current_sys_kbd_config) -@@ -623,6 +720,7 @@ apply_xkb_settings (void) +@@ -621,6 +718,8 @@ apply_xkb_settings (void) + g_slist_foreach (free_layouts, + (GFunc) g_free, NULL); 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-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch index 049a786..a88eae3 100644 --- a/gnome-settings-daemon-bnc462640-mute-action.patch +++ b/gnome-settings-daemon-bnc462640-mute-action.patch @@ -1,8 +1,8 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in =================================================================== ---- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig -+++ data/apps_gnome_settings_daemon_keybindings.schemas.in -@@ -25,6 +25,17 @@ +--- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig 2010-01-13 02:51:57.000000000 +1100 ++++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2010-01-13 16:44:53.000000000 +1100 +@@ -14,6 +14,17 @@ @@ -22,25 +22,25 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in string Index: plugins/media-keys/gsd-media-keys-manager.c =================================================================== ---- plugins/media-keys/gsd-media-keys-manager.c.orig -+++ plugins/media-keys/gsd-media-keys-manager.c -@@ -681,9 +681,11 @@ do_sound_action (GsdMediaKeysManager *ma +--- plugins/media-keys/gsd-media-keys-manager.c.orig 2010-01-13 02:51:57.000000000 +1100 ++++ plugins/media-keys/gsd-media-keys-manager.c 2010-01-13 16:44:53.000000000 +1100 +@@ -636,8 +636,10 @@ do_sound_action (GsdMediaKeysManager *ma int type) { gboolean muted; + gboolean toggle_mute; guint vol, norm_vol_step; int vol_step; - gboolean sound_changed; + GError *error; if (manager->priv->stream == NULL) return; -@@ -704,7 +706,21 @@ do_sound_action (GsdMediaKeysManager *ma - +@@ -658,7 +660,23 @@ do_sound_action (GsdMediaKeysManager *ma switch (type) { case MUTE_KEY: -- muted = !muted; + muted = !muted; +- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); ++ + error = NULL; + toggle_mute = gconf_client_get_bool (manager->priv->conf_client, + GCONF_MISC_DIR "/toggle_mute", @@ -52,10 +52,11 @@ Index: plugins/media-keys/gsd-media-keys-manager.c + } + + if (toggle_mute) -+ muted = !muted; ++ gvc_mixer_stream_change_is_muted (manager->priv->stream, ++ muted); + else -+ muted = TRUE; -+ - gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); - sound_changed = TRUE; ++ gvc_mixer_stream_change_is_muted (manager->priv->stream, ++ TRUE); break; + case VOLUME_DOWN_KEY: + if (!muted && (vol <= norm_vol_step)) { diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index fcb8903..b9ad7d5 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,28 +1,3 @@ -------------------------------------------------------------------- -Mon Mar 29 17:38:21 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.30.0: - + Protect XInput code by ifdefs if XInput isn't available - (bgo#611670) - + Don't play a sound when the volume doesn't change (bgo#610001) - + Fix linking with pedantic linkers (bgo#610244) - + Remove unused do_sleep_action function - + Apply all keyboard settings to new keyboards (bgo#610245) - + Ensure the window is realized before we invalidate it - (bgo#604918) - + Replace "eject" spawn with GIO code (bgo#580779) - + Don't spawn xrdb (bgo#586276) - + Add translator hint (bgo#613647) - + Disable font plugin by default (bgo#613604) - + Updated translations. -- Rebase gnome-settings-daemon-bnc462640-mute-action.patch. - -------------------------------------------------------------------- -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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 635082c..d46e407 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.30.0) +# spec file for package gnome-settings-daemon (Version 2.29.92) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gnome-settings-daemon %define _name gnome-settings-daemon -Version: 2.30.0 +Version: 2.29.92 Release: 1 License: GPLv2+ Summary: Settings daemon for the GNOME desktop From e69fc7ccd694445a8cab3446e2f8281756368a25dbfaa93375df285031df9646 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 1 Apr 2010 01:30:18 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/gnome-settings-daemon revision 48.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=876f4277bad0b9ab4edb4f169170bf51 --- gnome-settings-daemon-2.29.92.tar.bz2 | 3 -- gnome-settings-daemon-2.30.0.tar.bz2 | 3 ++ ...-settings-daemon-add-layout-switcher.patch | 13 ++++---- ...ettings-daemon-bnc462640-mute-action.patch | 31 +++++++++---------- gnome-settings-daemon.changes | 25 +++++++++++++++ gnome-settings-daemon.spec | 4 +-- 6 files changed, 51 insertions(+), 28 deletions(-) delete mode 100644 gnome-settings-daemon-2.29.92.tar.bz2 create mode 100644 gnome-settings-daemon-2.30.0.tar.bz2 diff --git a/gnome-settings-daemon-2.29.92.tar.bz2 b/gnome-settings-daemon-2.29.92.tar.bz2 deleted file mode 100644 index 98a4d3f..0000000 --- a/gnome-settings-daemon-2.29.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c27097f5db4e19926729d961e30ec8e0f7a9c565daa0d2674c4f02d0cb2c8c19 -size 1223347 diff --git a/gnome-settings-daemon-2.30.0.tar.bz2 b/gnome-settings-daemon-2.30.0.tar.bz2 new file mode 100644 index 0000000..beb5f96 --- /dev/null +++ b/gnome-settings-daemon-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa +size 1230687 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-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch index a88eae3..049a786 100644 --- a/gnome-settings-daemon-bnc462640-mute-action.patch +++ b/gnome-settings-daemon-bnc462640-mute-action.patch @@ -1,8 +1,8 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in =================================================================== ---- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig 2010-01-13 02:51:57.000000000 +1100 -+++ data/apps_gnome_settings_daemon_keybindings.schemas.in 2010-01-13 16:44:53.000000000 +1100 -@@ -14,6 +14,17 @@ +--- data/apps_gnome_settings_daemon_keybindings.schemas.in.orig ++++ data/apps_gnome_settings_daemon_keybindings.schemas.in +@@ -25,6 +25,17 @@ @@ -22,25 +22,25 @@ Index: data/apps_gnome_settings_daemon_keybindings.schemas.in string Index: plugins/media-keys/gsd-media-keys-manager.c =================================================================== ---- plugins/media-keys/gsd-media-keys-manager.c.orig 2010-01-13 02:51:57.000000000 +1100 -+++ plugins/media-keys/gsd-media-keys-manager.c 2010-01-13 16:44:53.000000000 +1100 -@@ -636,8 +636,10 @@ do_sound_action (GsdMediaKeysManager *ma +--- plugins/media-keys/gsd-media-keys-manager.c.orig ++++ plugins/media-keys/gsd-media-keys-manager.c +@@ -681,9 +681,11 @@ do_sound_action (GsdMediaKeysManager *ma int type) { gboolean muted; + gboolean toggle_mute; guint vol, norm_vol_step; int vol_step; + gboolean sound_changed; + GError *error; if (manager->priv->stream == NULL) return; -@@ -658,7 +660,23 @@ do_sound_action (GsdMediaKeysManager *ma +@@ -704,7 +706,21 @@ do_sound_action (GsdMediaKeysManager *ma + switch (type) { case MUTE_KEY: - muted = !muted; -- gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); -+ +- muted = !muted; + error = NULL; + toggle_mute = gconf_client_get_bool (manager->priv->conf_client, + GCONF_MISC_DIR "/toggle_mute", @@ -52,11 +52,10 @@ Index: plugins/media-keys/gsd-media-keys-manager.c + } + + if (toggle_mute) -+ gvc_mixer_stream_change_is_muted (manager->priv->stream, -+ muted); ++ muted = !muted; + else -+ gvc_mixer_stream_change_is_muted (manager->priv->stream, -+ TRUE); ++ muted = TRUE; ++ + gvc_mixer_stream_change_is_muted (manager->priv->stream, muted); + sound_changed = TRUE; break; - case VOLUME_DOWN_KEY: - if (!muted && (vol <= norm_vol_step)) { diff --git a/gnome-settings-daemon.changes b/gnome-settings-daemon.changes index b9ad7d5..fcb8903 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Mar 29 17:38:21 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.30.0: + + Protect XInput code by ifdefs if XInput isn't available + (bgo#611670) + + Don't play a sound when the volume doesn't change (bgo#610001) + + Fix linking with pedantic linkers (bgo#610244) + + Remove unused do_sleep_action function + + Apply all keyboard settings to new keyboards (bgo#610245) + + Ensure the window is realized before we invalidate it + (bgo#604918) + + Replace "eject" spawn with GIO code (bgo#580779) + + Don't spawn xrdb (bgo#586276) + + Add translator hint (bgo#613647) + + Disable font plugin by default (bgo#613604) + + Updated translations. +- Rebase gnome-settings-daemon-bnc462640-mute-action.patch. + +------------------------------------------------------------------- +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 diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index d46e407..635082c 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ # -# spec file for package gnome-settings-daemon (Version 2.29.92) +# spec file for package gnome-settings-daemon (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: gnome-settings-daemon %define _name gnome-settings-daemon -Version: 2.29.92 +Version: 2.30.0 Release: 1 License: GPLv2+ Summary: Settings daemon for the GNOME desktop