Merge lp:~townsend/unity/fix-upstart-code-formatting into lp:unity

[Christopher Townsend]

Fix the code formatting introduced in revno. 3485.

Fix the code formatting introduced in revno. 3485.

[Brandon Schaefer (brandontschaefer)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/243/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/1920
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-autolanding/199
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-autolanding/199/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-autolanding/199

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Jenkins, get your act together...

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2013-08-26 21:47:40 +0000
+++ services/panel-service.c	2013-08-29 19:41:51 +0000
@@ -157,11 +157,11 @@
   if (priv->upstart != NULL) 
     {
       int event_sent = 0;
-      event_sent = upstart_emit_event_sync(NULL, priv->upstart, "indicator-services-end", NULL, 0);
+      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");
 
-      nih_unref(priv->upstart, NULL);
+      nih_unref (priv->upstart, NULL);
       priv->upstart = NULL;
     }
 
@@ -486,9 +486,9 @@
   if (PANEL_IS_SERVICE (self) && self->priv->upstart != NULL)
     {
       int event_sent = 0;
-      event_sent = upstart_emit_event_sync(NULL, self->priv->upstart, "indicator-services-start", NULL, 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");
+         g_warning ("Unable to signal for indicator services to start");
     }
 
   return FALSE;
@@ -580,22 +580,22 @@
 
   priv->gsettings = g_settings_new_with_path (COMPIZ_OPTION_SCHEMA, COMPIZ_OPTION_PATH);
   g_signal_connect (priv->gsettings, "changed::"MENU_TOGGLE_KEYBINDING_KEY,
-                    G_CALLBACK(on_keybinding_changed), self);
+                    G_CALLBACK (on_keybinding_changed), self);
 
   panel_service_update_menu_keybinding (self);
 
-  const gchar * upstartsession = g_getenv("UPSTART_SESSION");
+  const gchar * upstartsession = g_getenv ("UPSTART_SESSION");
   if (upstartsession != NULL)
     {
       DBusConnection * conn = NULL;
-      conn = dbus_connection_open(upstartsession, NULL);
+      conn = dbus_connection_open (upstartsession, NULL);
       if (conn != NULL)
         {
-          priv->upstart = nih_dbus_proxy_new(NULL, conn,
-                                             NULL,
-                                             DBUS_PATH_UPSTART,
-                                             NULL, NULL);
-          dbus_connection_unref(conn);
+          priv->upstart = nih_dbus_proxy_new (NULL, conn,
+                                              NULL,
+                                              DBUS_PATH_UPSTART,
+                                              NULL, NULL);
+          dbus_connection_unref (conn);
         }
     }