Merge lp:~ted/unity/nih-signals-complete into lp:unity

[Ted Gould]

Clean up NIH Errors so they don't get reported on exit.

[Stephen M. Webb (bregma)]

Better message handling is always in good taste.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3576
http://jenkins.qa.ubuntu.com/job/unity-ci/455/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/345
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/342
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/343

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/455/rebuild

review: Approve (continuous-integration)

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-10-03 15:15:35 +0000
+++ services/panel-service.c	2013-10-16 21:06:41 +0000
@@ -35,6 +35,7 @@
 
 #include <upstart.h>
 #include <nih/alloc.h>
+#include <nih/error.h>
 
 G_DEFINE_TYPE (PanelService, panel_service, G_TYPE_OBJECT);
 
@@ -154,7 +155,11 @@
       event_sent = upstart_emit_event_sync (NULL, priv->upstart,
                                             "indicator-services-end", NULL, 0);
       if (event_sent != 0)
-         g_warning("Unable to signal for indicator services to start");
+        {
+          NihError * err = nih_error_get();
+          g_warning("Unable to signal for indicator services to stop: %s", err->message);
+          nih_free(err);
+        }
 
       nih_unref (priv->upstart, NULL);
       priv->upstart = NULL;
@@ -549,7 +554,11 @@
       int event_sent = 0;
       event_sent = upstart_emit_event_sync (NULL, self->priv->upstart, "indicator-services-start", NULL, 0);
       if (event_sent != 0)
-         g_warning ("Unable to signal for indicator services to start");
+        {
+          NihError * err = nih_error_get();
+          g_warning("Unable to signal for indicator services to start: %s", err->message);
+          nih_free(err);
+        }
     }
 
   return FALSE;
@@ -681,6 +690,12 @@
                                               NULL,
                                               DBUS_PATH_UPSTART,
                                               NULL, NULL);
+          if (priv->upstart == NULL)
+            {
+              NihError * err = nih_error_get();
+              g_warning("Unable to get Upstart proxy: %s", err->message);
+              nih_free(err);
+            }
           dbus_connection_unref (conn);
         }
     }