Merge lp:~cjcurran/indicator-sound/global-mute-defensive into lp:indicator-sound/fifth

[Conor Curran]

[Charles Kerr (charlesk)]

the if-else cleanup is a nice bonus, too...

review: Approve

[Charles Kerr (charlesk)]

merged in r308

=== modified file 'src/pulseaudio-mgr.c'
--- src/pulseaudio-mgr.c	2012-03-01 16:00:38 +0000
+++ src/pulseaudio-mgr.c	2012-03-14 19:40:32 +0000
@@ -218,7 +218,7 @@
   if (!operation){
     g_warning ("pm_update_mute operation failed for some reason");
     return;
-  }  
+  }
   pa_operation_unref (operation);
 }
 
@@ -621,17 +621,23 @@
   if (eol > 0) {
     return;
   }
-  else {
-    if (sink == NULL) {
-      g_warning ("toggle_mute cb - sink parameter is null - why ?");
-      return;
-    }
-    pa_operation_unref (pa_context_set_sink_mute_by_index (c,
-                                                           sink->index,
-                                                           GPOINTER_TO_INT(userdata),
-                                                           NULL,
-                                                           NULL));
-  }
+
+  if (sink == NULL) {
+    g_warning ("toggle_mute cb - sink parameter is null - why ?");
+    return;
+  }
+
+  pa_operation *operation = NULL;
+  operation =  pa_context_set_sink_mute_by_index (c,
+                                                  sink->index,
+                                                  GPOINTER_TO_INT(userdata),
+                                                  NULL,
+                                                  NULL);
+  if (!operation){
+    g_warning ("pm_update_mic_mute operation failed for some reason");
+    return;
+  }
+  pa_operation_unref (operation);
 }
 
 // Source info related callbacks