Merge lp:~cjcurran/indicator-sound/pulse-proper-error-handling into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

I wasn't properly handling an edge case concerning pulse server callback communication whereby the eol is not positive (i.e. its not the end of a sequence of callbacks) but the pulse pointer is null. According to the docs this reflects some sort of error. It can be seen to be triggered when you remove a sound device (usb headset or whatever) while a Voip app is open. Fixes the bug attached and I suspect some of the other weird crashes reported in recent weeks.

[Mikkel Kamstrup Erlandsen (kamstrup)]

Looks good to me

review: Approve

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2011-02-18 16:56:17 +0000
+++ src/pulseaudio-mgr.c	2011-02-28 12:52:03 +0000
@@ -220,11 +220,12 @@
     }
     break;
   case PA_SUBSCRIPTION_EVENT_SOURCE:
-    g_debug ("Looks like source event of some description");
+    g_debug ("Looks like source event of some description - index = %i", index);
     // We don't care about any other sink other than the active one.
     if (index != active_sink_get_source_index (sink))
         return;
     if ((t & PA_SUBSCRIPTION_EVENT_TYPE_MASK) == PA_SUBSCRIPTION_EVENT_REMOVE) {
+      g_debug ("Source removal event - index = %i", index);
       active_sink_deactivate_voip_source (sink, FALSE);
     }
     else{
@@ -396,8 +397,8 @@
     return;
   }
   else {
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("sink info callback - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || sink == NULL){
+      g_warning ("sink info callback - our user data is not what we think it should be or the sink parameter is null");
       return;
     }
     ActiveSink* a_sink = ACTIVE_SINK (userdata);
@@ -418,8 +419,8 @@
     return;
   } 
   else {
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("Default sink info callback - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || info == NULL){
+      g_warning ("Default sink info callback - our user data is not what we think it should be or the info parameter is null");
       return;
     }
     // Only repopulate if there is a change with regards the index
@@ -441,9 +442,8 @@
     return;
   }
   else {
-    if (info == NULL) {
-      // TODO: watch this carefully - PA async api should not be doing this . . .
-      g_warning("\n Sink input info callback : SINK INPUT INFO IS NULL BUT EOL was not POSITIVE!!!");
+    if (info == NULL || IS_ACTIVE_SINK (userdata) == FALSE) {
+      g_warning("Sink input info callback : SINK INPUT INFO IS NULL or our user_data is not what we think it should be");
       return;
     }
 
@@ -486,8 +486,8 @@
     return;
   }
   else{
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("update_active_sink - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || info == NULL){
+      g_warning ("update_active_sink - our user data is not what we think it should be or the info parameter is null");
       return;
     }
     active_sink_update (ACTIVE_SINK(userdata), info);
@@ -504,6 +504,11 @@
     return;
   }
   else {
+    if (IS_ACTIVE_SINK (userdata) == FALSE || sink == NULL){
+      g_warning ("toggle_mute cb - our user data is not what we think it should be or the sink parameter is null");
+      return;
+    }
+
     pa_operation_unref (pa_context_set_sink_mute_by_index (c,
                                                            sink->index,
                                                            GPOINTER_TO_INT(userdata),
@@ -523,8 +528,8 @@
     return;
   }
   else {
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("Default sink info callback - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || info == NULL){
+      g_warning ("Default source info callback - our user data is not what we think it should be or the source info parameter is null");
       return;
     }
     // If there is an index change we need to change our cached source
@@ -546,8 +551,8 @@
     return;
   }
   else {
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("Default sink info callback - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || info == NULL){
+      g_warning ("source info callback - our user data is not what we think it should be or the source info parameter is null");
       return;
     }
     // For now we will take the first available
@@ -567,8 +572,8 @@
     return;
   }
   else {
-    if (IS_ACTIVE_SINK (userdata) == FALSE){
-      g_warning ("Default sink info callback - our user data is not what we think it should be");
+    if (IS_ACTIVE_SINK (userdata) == FALSE || info == NULL ){
+      g_warning ("source info update callback - our user data is not what we think it should be or the source info paramter is null");
       return;
     }
     g_debug ("Got a source update for %s , index %i", info->name, info->index);