Merge lp:~kaijanmaki/indicator-sound/lp-850662 into lp:indicator-sound/fourth

[Antti Kaijanmäki]

Please, review my fix for #850662. (this time agains right branch..)

PulseAudio indices are unsigned integers.
indicator-sound uses gint internally.

I noticed with GDB that the index value is set -1 when PA dies. Without the
fix PA functions are called with invalid indices.

I suspect that the true problem behind SIGABRT is that the pa_context is in
some broken state due to PA dying and passing it to any pa-function would
probably lead to a crash. Didn't investigate this further as checking the
index is enough to prevent the call to pa-functions.

[Antti Kaijanmäki (kaijanmaki)]

I tested the patch by attaching to the indicator-sound-service with GDB and then killing pulseaudio and clicking the indicator when PA was down. Everything worked great and no regression noticed on my side.

[Ted Gould (ted)]

review: Approve

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2011-03-24 15:22:30 +0000
+++ src/pulseaudio-mgr.c	2011-10-10 11:27:26 +0000
@@ -174,6 +174,10 @@
 void
 pm_update_volume (gint sink_index, pa_cvolume new_volume)
 {
+  // LP: #850662 
+  if (sink_index < 0){
+    return;
+  }
   pa_operation_unref (pa_context_set_sink_volume_by_index (pulse_context,
                                                            sink_index,
                                                            &new_volume,
@@ -192,6 +196,10 @@
 void
 pm_update_mic_gain (gint source_index, pa_cvolume new_gain)
 {
+  // LP: #850662
+  if (source_index < 0){
+    return;
+  }
   pa_operation_unref (pa_context_set_source_volume_by_index (pulse_context,
                                                              source_index,
                                                              &new_gain,
@@ -202,6 +210,10 @@
 void
 pm_update_mic_mute (gint source_index, gint mute_update)
 {
+    // LP: #850662
+    if (source_index < 0){
+      return;
+    }
     pa_operation_unref (pa_context_set_source_mute_by_index (pulse_context,
                                                              source_index,
                                                              mute_update,