Merge lp:~bregma/unity/lp-1302955-trusty into lp:unity/7.2

[Stephen M. Webb]

PanelService: use gdbus to notfy upstart of service start/stop

PanelService: use gdbus to notfy upstart of service start/stop.

This fixes a memory leak caused by the nih dbus proxy.

Cherry-picked from Unity trunk.

[Christopher Townsend (townsend)]

Ok

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-06-23 15:29:36 +0000
+++ debian/control	2015-03-11 18:15:10 +0000
@@ -31,8 +31,6 @@
                libindicator3-dev (>= 0.12.2),
                libjson-glib-dev,
                libjson-perl,
-               libnih-dbus-dev,
-               libnih-dev,
                libnotify-dev,
                libnux-4.0-dev (>= 4.0.6),
                libpam0g-dev,
@@ -109,8 +107,7 @@
 Package: unity-services
 Architecture: any
 Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         upstart,
+         ${misc:Depends}
 Description: Services for the Unity interface
  Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
  community, Unity is all about the combination of familiarity and the future. We

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2014-01-08 15:05:53 +0000
+++ services/CMakeLists.txt	2015-03-11 18:15:10 +0000
@@ -13,9 +13,6 @@
     x11
     libido3-0.1>=13.0.0
     libupstart
-    libnih
-    libnih-dbus
-    dbus-1
 )
 
 pkg_check_modules(SERVICE_DEPS REQUIRED ${UNITY_PANEL_SERVICE_DEPS})

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2014-12-09 15:41:53 +0000
+++ services/panel-service.c	2015-03-11 18:15:10 +0000
@@ -33,9 +33,7 @@
 #include <X11/XKBlib.h>
 #include <X11/extensions/XInput2.h>
 
-#include <upstart.h>
-#include <nih/alloc.h>
-#include <nih/error.h>
+#include <upstart/upstart-dbus.h>
 
 G_DEFINE_TYPE (PanelService, panel_service, G_TYPE_OBJECT);
 
@@ -86,8 +84,6 @@
 
   IndicatorObjectEntry *pressed_entry;
   gboolean use_event;
-
-  NihDBusProxy * upstart;
 };
 
 /* Globals */
@@ -138,6 +134,7 @@
 static void sort_indicators (PanelService *);
 static void notify_object (IndicatorObject *object);
 static void update_keybinding (GSettings *, const gchar *, gpointer);
+static void emit_upstart_event (const gchar *);
 static GdkFilterReturn event_filter (GdkXEvent *, GdkEvent *, PanelService *);
 
 /*
@@ -153,21 +150,8 @@
   g_idle_remove_by_data (self);
   gdk_window_remove_filter (NULL, (GdkFilterFunc)event_filter, self);
 
-  if (priv->upstart != NULL && !lockscreen_mode)
-    {
-      int event_sent = 0;
-      event_sent = upstart_emit_event_sync (NULL, priv->upstart,
-                                            "indicator-services-end", NULL, 0);
-      if (event_sent != 0)
-        {
-          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;
-    }
+  if (!lockscreen_mode)
+    emit_upstart_event ("indicator-services-end");
 
   if (GTK_IS_WIDGET (priv->last_menu) &&
       gtk_widget_get_realized (GTK_WIDGET (priv->last_menu)))
@@ -623,17 +607,8 @@
 static gboolean
 ready_signal (PanelService *self)
 {
-  if (PANEL_IS_SERVICE (self) && self->priv->upstart != NULL && !lockscreen_mode)
-    {
-      int event_sent = 0;
-      event_sent = upstart_emit_event_sync (NULL, self->priv->upstart, "indicator-services-start", NULL, 0);
-      if (event_sent != 0)
-        {
-          NihError * err = nih_error_get();
-          g_warning("Unable to signal for indicator services to start: %s", err->message);
-          nih_free(err);
-        }
-    }
+  if (!lockscreen_mode)
+    emit_upstart_event ("indicator-services-start");
 
   return FALSE;
 }
@@ -726,6 +701,48 @@
 }
 
 static void
+emit_upstart_event (const gchar *event)
+{
+  const gchar *upstartsession = g_getenv ("UPSTART_SESSION");
+
+  if (!upstartsession)
+    return;
+
+  GError *error = NULL;
+  GDBusConnection* conn = g_dbus_connection_new_for_address_sync (upstartsession,
+                                                                  G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
+                                                                  NULL, NULL, &error);
+
+  if (error)
+    {
+      g_warning ("Unable to connect to Upstart session: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  GVariant *result = g_dbus_connection_call_sync (conn, DBUS_SERVICE_UPSTART,
+                                                  DBUS_PATH_UPSTART,
+                                                  DBUS_INTERFACE_UPSTART,
+                                                  "EmitEvent",
+                                                  g_variant_new ("(sasb)", event, NULL, 0),
+                                                  NULL, G_DBUS_CALL_FLAGS_NO_AUTO_START, -1,
+                                                  NULL, &error);
+
+  if (error)
+    {
+      g_warning ("Unable to emit Upstart event: %s", error->message);
+      g_error_free (error);
+    }
+  else
+    {
+      g_variant_unref (result);
+    }
+
+  g_object_unref (conn);
+}
+
+
+static void
 panel_service_init (PanelService *self)
 {
   PanelServicePrivate *priv;
@@ -749,29 +766,6 @@
   update_keybinding (priv->gsettings, MENU_TOGGLE_KEYBINDING_KEY, &priv->menu_toggle);
   update_keybinding (priv->gsettings, SHOW_DASH_KEY, &priv->show_dash);
   update_keybinding (priv->gsettings, SHOW_HUD_KEY, &priv->show_hud);
-
-  const gchar *upstartsession = g_getenv ("UPSTART_SESSION");
-  if (upstartsession != NULL && !lockscreen_mode)
-    {
-      DBusConnection *conn = dbus_connection_open (upstartsession, NULL);
-      if (conn != NULL)
-        {
-          priv->upstart = nih_dbus_proxy_new (NULL, conn,
-                                              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);
-        }
-    }
-
-  if (priv->upstart != NULL)
-    priv->upstart->auto_start = FALSE;
 }
 
 static gboolean

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-12-08 19:51:05 +0000
+++ tests/CMakeLists.txt	2015-03-11 18:15:10 +0000
@@ -8,7 +8,7 @@
 #
 # Unit tests
 #
-set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;libnih;libnih-dbus;dbus-1")
+set (TEST_DEPS "${UNITY_PLUGIN_DEPS};unity>=4.99.0;libupstart;")
 pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS})
 
 string (REPLACE ";" " " TEST_UNIT_DEPS_CFLAGS_OTHER "${TEST_UNIT_CFLAGS_OTHER}")

=== modified file 'unity-shared/UpstartWrapper.cpp'
--- unity-shared/UpstartWrapper.cpp	2014-03-04 14:10:26 +0000
+++ unity-shared/UpstartWrapper.cpp	2015-03-11 18:15:10 +0000
@@ -20,6 +20,7 @@
 #include "UpstartWrapper.h"
 
 #include <UnityCore/GLibDBusProxy.h>
+#include <upstart/upstart-dbus.h>
 
 namespace unity
 {
@@ -41,9 +42,8 @@
 
 UpstartWrapper::Impl::Impl(bool test_mode)
 {
-  upstart_proxy_ = std::make_shared<unity::glib::DBusProxy>(test_mode ?  "com.canonical.Unity.Test.Upstart" : "com.ubuntu.Upstart",
-                                                            "/com/ubuntu/Upstart", 
-                                                            "com.ubuntu.Upstart0_6");
+  upstart_proxy_ = std::make_shared<unity::glib::DBusProxy>(test_mode ?  "com.canonical.Unity.Test.Upstart" : DBUS_SERVICE_UPSTART,
+                                                            DBUS_PATH_UPSTART, DBUS_INTERFACE_UPSTART);
 }
 
 void UpstartWrapper::Impl::Emit(std::string const& name)