Merge lp:~cjcurran/indicator-sound/sigabrt into lp:~indicator-applet-developers/indicator-sound/trunk_3

[Conor Curran]

Fixes the bug attached.

[Mikkel Kamstrup Erlandsen (kamstrup)]

8 + if (priv->connection == NULL ||
9 + g_dbus_connection_is_closed (priv->connection) == TRUE){
10 + g_critical ("sound_service_dbus_update_sound_state - connection no good !!");
11 + return;
12 + }
13 +

If this occurs I think it's crucial for debugging to know which one of the two conditions happened?

Maybe like this instead:

+ if (priv->connection == NULL || g_dbus_connection_is_closed (priv->connection)) {
+ g_critical ("sound_service_dbus_update_sound_state - connection is %s !!",
+ connection == NULL? "NULL" : "closed");
+ return;
+ }

But no biggie. Approved.

review: Approve

[Conor Curran (cjcurran)]

Makes sense, applying to the merge.

[lp:~cjcurran/indicator-sound/sigabrt]

237. By Conor Curran on 2011-03-25

more visibility on possible errors

=== modified file 'src/sound-service-dbus.c'
--- src/sound-service-dbus.c	2011-03-23 14:41:10 +0000
+++ src/sound-service-dbus.c	2011-03-25 11:56:54 +0000
@@ -237,6 +237,13 @@
 
   GError * error = NULL;
 
+  if (priv->connection == NULL ||
+      g_dbus_connection_is_closed (priv->connection) == TRUE){
+    g_critical ("sound_service_dbus_update_sound_state - connection is %s !!",
+                priv->connection == NULL? "NULL" : "closed");
+    return;
+  }
+
   g_debug ("emitting state signal with value %i", (int)new_state);
   g_dbus_connection_emit_signal( priv->connection,
                                  NULL,
@@ -246,9 +253,8 @@
                                  v_output,
                                  &error );
   if (error != NULL) {
-    g_error("Unable to emit signal 'sinkinputwhilemuted' because : %s", error->message);
+    g_critical ("Unable to emit signal because : %s", error->message);
     g_error_free(error);
-    return;
   }
 }