Merge lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-750334 into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Rodrigo Moya]

[lp:~rodrigo-moya/ubuntu/natty/gnome-settings-daemon/fix-750334]

143. By Rodrigo Moya on 2011-04-19

Add git format-patch instead

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-07 11:04:54 +0000
+++ debian/changelog	2011-04-19 14:51:34 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (2.32.1-0ubuntu14) natty; urgency=low
+
+  * debian/patches/17_react_when_streams_removed.patch:
+    - Add patch to react when mixer streams are removed (LP: #750334)
+
+ -- Rodrigo Moya <[e-mail]>  Fri, 15 Apr 2011 12:48:20 +0200
+
 gnome-settings-daemon (2.32.1-0ubuntu13) natty; urgency=low
 
   * debian/patches/05_use_xrecord.patch:

=== added file 'debian/patches/17_react_when_streams_removed.patch'
--- debian/patches/17_react_when_streams_removed.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/17_react_when_streams_removed.patch	2011-04-19 14:51:34 +0000
@@ -0,0 +1,47 @@
+From c9a6a27aa766b31d9f32d182b1de5886793e906b Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <[e-mail]>
+Date: Tue, 19 Apr 2011 15:59:35 +0200
+Subject: [PATCH] media-keys: React to stream-removed signal from GvcMixerControl
+
+---
+ plugins/media-keys/gsd-media-keys-manager.c |   17 +++++++++++++++++
+ 1 files changed, 17 insertions(+), 0 deletions(-)
+
+diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
+index b563f73..1f18074 100644
+--- a/plugins/media-keys/gsd-media-keys-manager.c
++++ b/plugins/media-keys/gsd-media-keys-manager.c
+@@ -794,6 +794,19 @@ on_control_default_sink_changed (GvcMixerControl     *control,
+         update_default_sink (manager);
+ }
+ 
++static void
++on_control_stream_removed (GvcMixerControl     *control,
++                           guint                id,
++                           GsdMediaKeysManager *manager)
++{
++        if (manager->priv->stream != NULL) {
++		if (gvc_mixer_stream_get_id (manager->priv->stream) == id) {
++	                g_object_unref (manager->priv->stream);
++			manager->priv->stream = NULL;
++		}
++        }
++}
++
+ #endif /* HAVE_PULSE */
+ 
+ static gint
+@@ -1118,6 +1131,10 @@ gsd_media_keys_manager_start (GsdMediaKeysManager *manager,
+                           "default-sink-changed",
+                           G_CALLBACK (on_control_default_sink_changed),
+                           manager);
++        g_signal_connect (manager->priv->volume,
++                          "stream-removed",
++                          G_CALLBACK (on_control_stream_removed),
++                          manager);
+ 
+         gvc_mixer_control_open (manager->priv->volume);
+ 
+-- 
+1.7.2.3
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-07 10:34:45 +0000
+++ debian/patches/series	2011-04-19 14:51:34 +0000
@@ -8,6 +8,7 @@
 07_dont_display_autostart.patch
 12_monitor_network_fs.patch
 16_use_synchronous_notifications.patch
+17_react_when_streams_removed.patch
 30_pkgconfig-path.patch
 32-datetime-service-add-ntp-support.patch
 33-datetime-service-ubuntu-ntp.patch