From ae609a679e39bcf6acc747920b1728b65b85fbf3b4d496c3679da345ec681ae7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 20 Feb 2009 21:09:29 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=28 --- ...ettings-daemon-bnc462640-mute-action.patch | 62 +++++++++++++++++++ gnome-settings-daemon.changes | 9 +++ gnome-settings-daemon.spec | 11 +++- 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 gnome-settings-daemon-bnc462640-mute-action.patch diff --git a/gnome-settings-daemon-bnc462640-mute-action.patch b/gnome-settings-daemon-bnc462640-mute-action.patch new file mode 100644 index 0000000..60c1ae0 --- /dev/null +++ b/gnome-settings-daemon-bnc462640-mute-action.patch @@ -0,0 +1,62 @@ +Index: gnome-settings-daemon-2.25.90/data/apps_gnome_settings_daemon_keybindings.schemas.in +=================================================================== +--- gnome-settings-daemon-2.25.90.orig/data/apps_gnome_settings_daemon_keybindings.schemas.in ++++ gnome-settings-daemon-2.25.90/data/apps_gnome_settings_daemon_keybindings.schemas.in +@@ -14,6 +14,17 @@ + + + ++ /schemas/apps/gnome_settings_daemon/toggle_mute ++ /apps/gnome_settings_daemon/toggle_mute ++ bool ++ TRUE ++ ++ Toggle Mute ++ Toggle the sound mixer's mute status when then mute button is pressed. ++ ++ ++ ++ + /schemas/apps/gnome_settings_daemon/keybindings/volume_mute + /apps/gnome_settings_daemon/keybindings/volume_mute + string +Index: gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c +=================================================================== +--- gnome-settings-daemon-2.25.90.orig/plugins/media-keys/gsd-media-keys-manager.c ++++ gnome-settings-daemon-2.25.90/plugins/media-keys/gsd-media-keys-manager.c +@@ -656,8 +656,10 @@ do_sound_action (GsdMediaKeysManager *ma + int type) + { + gboolean muted; ++ gboolean toggle_mute; + guint vol, norm_vol_step; + int vol_step; ++ GError *error; + + if (manager->priv->stream == NULL) + return; +@@ -680,8 +682,23 @@ do_sound_action (GsdMediaKeysManager *ma + + switch (type) { + case MUTE_KEY: ++ error = NULL; ++ toggle_mute = gconf_client_get_bool (manager->priv->conf_client, ++ GCONF_MISC_DIR "/toggle_mute", ++ &error); ++ ++ if (error) { ++ toggle_mute = TRUE; ++ g_error_free (error); ++ } ++ + manager->priv->num_expected_update_signals = 1; +- gvc_mixer_stream_change_is_muted (manager->priv->stream, !muted); ++ if (toggle_mute) ++ gvc_mixer_stream_change_is_muted (manager->priv->stream, ++ !muted); ++ else ++ 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 b163616..4b61134 100644 --- a/gnome-settings-daemon.changes +++ b/gnome-settings-daemon.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Feb 19 04:20:38 CET 2009 - vuntz@novell.com + +- Add gnome-settings-daemon-bnc462640-mute-button-always-mute.patch + to make it possible to always mute sound instead of toggling mute + status. Part of bnc#462640. The other part is in gconf2-branding, + to set the gconf key to actually do that. + Patch by Holger Macht. + ------------------------------------------------------------------- Wed Feb 11 20:34:31 CET 2009 - vuntz@novell.com diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index ca743e8..484edfa 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -36,7 +36,7 @@ BuildRequires: xorg-x11 License: GPL v2 or later Group: System/GUI/GNOME Version: 2.25.90 -Release: 1 +Release: 2 Summary: Settings daemon for the GNOME desktop Source: %{_name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff @@ -49,6 +49,8 @@ Patch6: gnome-settings-daemon-bnc427745-force-dpi.patch Patch8: gnome-settings-daemon-apport-monitor.patch # PATCH-FIX-UPSTREAM gnome-settings-daemon-bnc473980-unknown-media-key.patch bnc473980 bgo571329 vuntz@novell.com Patch9: gnome-settings-daemon-bnc473980-unknown-media-key.patch +# PATCH-FEATURE-UPSTREAM gnome-settings-daemon-bnc462640-mute-action.patch bnc462640 bgo572365 vuntz@novell.com -- Mute button should always mute sound instead of toggling mute status +Patch10: gnome-settings-daemon-bnc462640-mute-action.patch Url: http://www.gnome.org Requires: %{name}-lang = %{version} Obsoletes: resapplet @@ -108,6 +110,7 @@ gnome-patch-translation-prepare %patch6 -p1 %patch8 -p1 %patch9 -p0 +%patch10 -p1 gnome-patch-translation-update %build @@ -161,6 +164,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %changelog +* Thu Feb 19 2009 vuntz@novell.com +- Add gnome-settings-daemon-bnc462640-mute-button-always-mute.patch + to make it possible to always mute sound instead of toggling mute + status. Part of bnc#462640. The other part is in gconf2-branding, + to set the gconf key to actually do that. + Patch by Holger Macht. * Wed Feb 11 2009 vuntz@novell.com - Add gnome-settings-daemon-bnc473980-unknown-media-key.patch to fix crasher in media keys with unknown keys. Fix bnc#473980.