r26052 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch patches/series

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sun Dec 19 13:55:25 2010
New Revision: 26052

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26052
Log:
* d/p/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch
  + Added. Fix a bug where it was possible to lower the volume below zero,
    causing it to wrap-around to MAXUINT.

Added:
    desktop/experimental/gnome-settings-daemon/debian/patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch
Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/patches/series

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=26052&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sun Dec 19 13:55:25 2010
@@ -2,8 +2,11 @@
 
   * Enable pulseaudio support
   * Enable the settings d-conf <-> gconf bridge
-
- -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Dec 2010 13:33:53 +0000
+  * d/p/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch
+    + Added. Fix a bug where it was possible to lower the volume below zero,
+      causing it to wrap-around to MAXUINT.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Dec 2010 13:49:05 +0000
 
 gnome-settings-daemon (2.91.5.1-2) experimental; urgency=low
 

Added: desktop/experimental/gnome-settings-daemon/debian/patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch?rev=26052&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch [utf-8] Sun Dec 19 13:55:25 2010
@@ -1,0 +1,48 @@
+From f1fda217d221d071449bc251dfaab8ed2e5a06c1 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 19 Dec 2010 13:48:33 +0000
+Subject: [PATCH] Ensure the volume doesn't underflow and wrap around
+
+---
+ plugins/media-keys/gsd-media-keys-manager.c |   22 +++++++++++-----------
+ 1 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index f90b563..33bb95a 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -655,20 +655,20 @@ do_sound_action (GsdMediaKeysManager *manager,
+                 sound_changed = TRUE;
+                 break;
+         case VOLUME_DOWN_KEY:
+-                if (!muted && (vol <= norm_vol_step)) {
+-                        muted = !muted;
++                if (vol <= norm_vol_step) {
+                         vol = 0;
+-                        gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
+-                        if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
+-                                gvc_mixer_stream_push_volume (manager->priv->stream);
+-                                sound_changed = TRUE;
+-                        }
+                 } else {
+                         vol = vol - norm_vol_step;
+-                        if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
+-                                gvc_mixer_stream_push_volume (manager->priv->stream);
+-                                sound_changed = TRUE;
+-                        }
++                }
++
++                if (!muted && vol == 0) {
++                        muted = TRUE;
++                        gvc_mixer_stream_change_is_muted (manager->priv->stream, muted);
++                }
++
++                if (gvc_mixer_stream_set_volume (manager->priv->stream, vol) != FALSE) {
++                         gvc_mixer_stream_push_volume (manager->priv->stream);
++                         sound_changed = TRUE;
+                 }
+                 break;
+         case VOLUME_UP_KEY:
+-- 
+1.7.2.3
+

Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=26052&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sun Dec 19 13:55:25 2010
@@ -1,1 +1,2 @@
 13_monitor_kfreebsd.patch
+0001-Ensure-the-volume-doesn-t-underflow-and-wrap-around.patch