rpm/gnome-settings-daemon
SHA256
1
0
Fork 0
forked from pool/gnome-settings-daemon
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-settings-daemon?expand=0&rev=28

Browse Source
This commit is contained in:
OBS User unknown 2009-02-20 21:09:29 +00:00 committed by Git OBS Bridge
parent 212d26fde6
commit ae609a679e
3 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
gnome-settings-daemon-bnc462640-mute-action.patch Normal file
View File

@ -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 @@
</schema>
<schema>
+ <key>/schemas/apps/gnome_settings_daemon/toggle_mute</key>
+ <applyto>/apps/gnome_settings_daemon/toggle_mute</applyto>
+ <type>bool</type>
+ <default>TRUE</default>
+ <locale name="C">
+ <short>Toggle Mute</short>
+ <long>Toggle the sound mixer's mute status when then mute button is pressed.</long>
+ </locale>
+ </schema>
+
+ <schema>
<key>/schemas/apps/gnome_settings_daemon/keybindings/volume_mute</key>
<applyto>/apps/gnome_settings_daemon/keybindings/volume_mute</applyto>
<type>string</type>
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)) {

9
gnome-settings-daemon.changes
View File

@ -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

11
gnome-settings-daemon.spec
View File

@ -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.