Marcus Rueckert
224deb0f47
- Rebase gnome-settings-daemon-system-proxy-configuration.diff and gnome-settings-daemon-bnc462640-mute-action.patch and enable the the call to autoreconf. - Add gnome-settings-daemon-stop-reload-proxy-settings.patch to stop the g-s-d packagekit plugin, to pop up the authentication for reloading the proxy settings (bnc#689592#c1 for bnc#538353) - Rebase gnome-packagekit-fate302445.patch and migrate to gsettings OBS-URL: https://build.opensuse.org/request/show/77402 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=97
53 lines
2.2 KiB
Diff
53 lines
2.2 KiB
Diff
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
|
|
@@ -637,6 +637,7 @@ do_sound_action (GsdMediaKeysManager *ma
|
|
gboolean quiet)
|
|
{
|
|
gboolean old_muted, new_muted;
|
|
+ gboolean toggle_mute;
|
|
guint old_vol, new_vol, max_vol, norm_vol_step;
|
|
gboolean sound_changed;
|
|
|
|
@@ -653,7 +654,11 @@ do_sound_action (GsdMediaKeysManager *ma
|
|
|
|
switch (type) {
|
|
case MUTE_KEY:
|
|
- new_muted = !old_muted;
|
|
+ toggle_mute = g_settings_get_boolean (manager->priv->settings, "toggle-mute");
|
|
+ if (toggle_mute)
|
|
+ new_muted = !old_muted;
|
|
+ else
|
|
+ new_muted = TRUE;
|
|
break;
|
|
case VOLUME_DOWN_KEY:
|
|
if (old_vol <= norm_vol_step) {
|
|
Index: data/gnome-settings-daemon.convert
|
|
===================================================================
|
|
--- data/gnome-settings-daemon.convert.orig
|
|
+++ data/gnome-settings-daemon.convert
|
|
@@ -66,6 +66,7 @@ volume-down = /apps/gnome_settings_daemo
|
|
volume-mute = /apps/gnome_settings_daemon/keybindings/volume_mute
|
|
volume-up = /apps/gnome_settings_daemon/keybindings/volume_up
|
|
www = /apps/gnome_settings_daemon/keybindings/www
|
|
+toggle-mute = /apps/gnome_settings_daemon/toggle_mute
|
|
|
|
[org.gnome.settings-daemon.plugins.mouse]
|
|
active = /apps/gnome_settings_daemon/plugins/mouse/active
|
|
Index: data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
|
|
===================================================================
|
|
--- data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in.orig
|
|
+++ data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in
|
|
@@ -145,5 +145,10 @@
|
|
<_summary>Magnifier zoom out</_summary>
|
|
<_description>Binding for the magnifier to zoom out</_description>
|
|
</key>
|
|
+ <key name="toggle-mute" type="b">
|
|
+ <default>true</default>
|
|
+ <_summary>Toggle Mute</_summary>
|
|
+ <_description>Toggle the sound mixer's mute status when then mute button is pressed.</_description>
|
|
+ </key>
|
|
</schema>
|
|
</schemalist>
|