Merge lp:~charlesk/indicator-power/custom-bus-for-upower into lp:indicator-power/15.04

[Charles Kerr]

Add support for finer-grained dbus service mocking

== Change Description

Add support for finer-grained dbus service mocking.

Use case: say we want to feed the indicator a dbusmocked upower, but don't want to mock the entire system bus because we also talk to powerd on the system bus. This lets us specify via environment variables where to look for each bus dependency.

== Checklist

> Are there any related MPs required for this MP to build/function as expected? Please list.

No

> Is your branch in sync with latest trunk? (e.g. bzr pull lp:trunk -> no changes)

Yes

> Did the code build without warnings?

Yes

> Did the tests run successfully?

Yes

> Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

> If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

> Did your component test plan pass? If on a device, what image number?

15.03 nexus 4 r63

> Please list which manual tests are germane for the reviewer in this MR.

This is QA scaffolding; no manual tests affected

> Did you provide a link to this page https://wiki.ubuntu.com/Process/Merges/Checklists/indicator-power

Yes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/indicator-power-ci/145/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/indicator-power-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-power-ci/145/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

Have to say I'm a little nervous with abstracting the bus stuff out this much. I like the standardization of using g_bus_own_name() to setup the ordering of the callbacks and ensure that we're doing everything right there. Naturually, that loses some flexibility. I like sitting outside the process and using dbusmock better so that it can be the same name, on the bus configured to be DBUS_SYSTEM_BUS_ADDRESS so that the indicator can be simpler.

That said, I don't see anything wrong with this code and have no objection other than "not the way I would have done it."

review: Approve

[Allan LeSage (allanlesage)]

Getting requests for this awesome new feature already (from paulliu), let's land 'er!

Unmerged revisions

283. By Charles Kerr on 2015-01-12

pass the G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT flag when calling g_dbus_connection_new_for_address() on an arbitrary bus address

282. By Charles Kerr on 2014-12-19

when connecting to a custom bus address, use G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION

281. By Charles Kerr on 2014-12-18

document the debugging environment variables

280. By Charles Kerr on 2014-12-18

move indicator_power_get_screen_busname() to bus.c

279. By Charles Kerr on 2014-12-18

use indicator_power_get_bus() for acquiring the bus that we look for powerd on

278. By Charles Kerr on 2014-12-18

use indicator_power_get_bus() for acquiring the bus that we look for upower on

277. By Charles Kerr on 2014-12-18

use indicator_power_get_bus() for acquiring the indicator's bus

276. By Charles Kerr on 2014-12-18

add indicator_power_get_bus() which lets environment variables let a custom bus override other buses.

=== added file 'README'
--- README	1970-01-01 00:00:00 +0000
+++ README	2015-01-12 23:02:27 +0000
@@ -0,0 +1,11 @@
+Environment variables used for testing:
+
+ - INDICATOR_POWER_BUS_ADDRESS_UPOWER      overrides the system bus default
+ - INDICATOR_POWER_BUS_NAME_UPOWER         overrides the 'org.freedesktop.UPower' default
+
+ - INDICATOR_POWER_BUS_ADDRESS_INDICATOR   overrides the session bus default
+ - INDICATOR_POWER_BUS_NAME_INDICATOR      overrides the 'com.canonical.indicator.power' default
+
+ - INDICATOR_POWER_BUS_ADDRESS_POWERD      overrides the system bus default
+ - INDICATOR_POWER_BUS_NAME_POWERD         overrides the 'com.canonical.powerd' default
+
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-14 19:09:32 +0000
+++ src/CMakeLists.txt	2015-01-12 23:02:27 +0000
@@ -6,6 +6,7 @@
 # handwritten sources
 set(SERVICE_MANUAL_SOURCES
     brightness.c
+    bus.c
     device-provider-mock.c
     device-provider-upower.c
     device-provider.c
 
=== modified file 'src/brightness.c'
--- src/brightness.c	2014-09-12 16:37:02 +0000
+++ src/brightness.c	2015-01-12 23:02:27 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "brightness.h"
+#include "bus.h"
 
 #include <gio/gio.h>
 
@@ -40,11 +41,11 @@
 
 typedef struct
 {
-  GDBusConnection * system_bus;
   GCancellable * cancellable;
 
   GSettings * settings;
 
+  GDBusConnection * bus;
   guint powerd_name_tag;
 
   double percentage;
@@ -124,6 +125,8 @@
     }
 }
 
+static void set_bus(IndicatorPowerBrightness * self, GDBusConnection * bus);
+
 static void
 my_dispose(GObject * o)
 {
@@ -136,14 +139,9 @@
       g_clear_object(&p->cancellable);
     }
 
-  if (p->powerd_name_tag)
-    {
-      g_bus_unwatch_name(p->powerd_name_tag);
-      p->powerd_name_tag = 0;
-    }
-
   g_clear_object(&p->settings);
-  g_clear_object(&p->system_bus);
+
+  set_bus(self, NULL);
 
   G_OBJECT_CLASS(indicator_power_brightness_parent_class)->dispose(o);
 }
@@ -269,8 +267,8 @@
 {
   priv_t * p = get_priv(self);
 
-  g_dbus_connection_call(p->system_bus,
-                         "com.canonical.powerd",
+  g_dbus_connection_call(p->bus,
+                         indicator_power_get_powerd_busname(),
                          "/com/canonical/powerd",
                          "com.canonical.powerd",
                          "getBrightnessParams",
@@ -284,20 +282,13 @@
 }
 
 static void
-on_powerd_appeared(GDBusConnection * connection,
+on_powerd_appeared(GDBusConnection * bus          G_GNUC_UNUSED,
                    const gchar     * bus_name     G_GNUC_UNUSED,
                    const gchar     * name_owner   G_GNUC_UNUSED,
                    gpointer          gself)
 {
-  IndicatorPowerBrightness * self = INDICATOR_POWER_BRIGHTNESS(gself);
-  priv_t * p = get_priv(self);
-
-  /* keep a handle to the system bus */
-  g_clear_object(&p->system_bus);
-  p->system_bus = g_object_ref(connection);
- 
   /* update our cache of powerd's brightness params */
-  call_powerd_get_brightness_params(self);
+  call_powerd_get_brightness_params(gself);
 }
 
 static void
@@ -319,7 +310,7 @@
 /* setUserBrightness doesn't return anything,
    so this function is just to check for bus error messages */
 static void
-on_set_uscreen_user_brightness_result(GObject      * system_bus,
+on_set_uscreen_user_brightness_result(GObject      * bus,
                                       GAsyncResult * res,
                                       gpointer       gself        G_GNUC_UNUSED)
 {
@@ -327,7 +318,7 @@
   GVariant * v;
 
   error = NULL;
-  v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(system_bus), res, &error);
+  v = g_dbus_connection_call_finish(G_DBUS_CONNECTION(bus), res, &error);
   if (error != NULL)
     {
       if (!g_error_matches(error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@@ -345,8 +336,8 @@
 {
   priv_t * p = get_priv(self);
 
-  g_dbus_connection_call(p->system_bus,
-                         "com.canonical.Unity.Screen",
+  g_dbus_connection_call(p->bus,
+                         indicator_power_get_screen_busname(),
                          "/com/canonical/Unity/Screen",
                          "com.canonical.Unity.Screen",
                          "setUserBrightness",
@@ -399,6 +390,58 @@
   g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_AUTO]);
 }
 
+/***
+****
+***/
+
+static void
+set_bus (IndicatorPowerBrightness * self, GDBusConnection * bus)
+{
+  priv_t * p = get_priv(self);
+
+  if (p->bus != NULL)
+    {
+      g_bus_unwatch_name(p->powerd_name_tag);
+      p->powerd_name_tag = 0;
+
+      g_clear_object(&p->bus);
+    }
+
+  if (bus != NULL)
+    {
+      p->bus = g_object_ref(bus);
+
+      p->powerd_name_tag = g_bus_watch_name_on_connection(p->bus,
+                                                          indicator_power_get_powerd_busname(),
+                                                          G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                                          on_powerd_appeared,
+                                                          on_powerd_vanished,
+                                                          self,
+                                                          NULL);
+    }
+}
+
+static void
+on_bus_ready (GObject * unused G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+{
+  GDBusConnection * bus;
+  GError * error = NULL;
+
+  bus = indicator_power_get_bus_finish(res, &error);
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Error getting bus: %s", error->message);
+
+      g_error_free (error);
+    }
+  else
+    {
+      set_bus (INDICATOR_POWER_BRIGHTNESS(gself), bus);
+    }
+
+  g_clear_object(&bus);
+}
 
 /***
 ****  Instantiation
@@ -433,13 +476,11 @@
       g_settings_schema_unref(schema);
     }
 
-  p->powerd_name_tag = g_bus_watch_name(G_BUS_TYPE_SYSTEM,
-                                        "com.canonical.powerd",
-                                        G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                        on_powerd_appeared,
-                                        on_powerd_vanished,
-                                        self,
-                                        NULL);
+  indicator_power_get_bus(g_getenv("INDICATOR_POWER_BUS_ADDRESS_POWERD"),
+                          G_BUS_TYPE_SYSTEM,
+                          p->cancellable,
+                          on_bus_ready,
+                          self);
 }
 
 static void
 
=== added file 'src/bus.c'
--- src/bus.c	1970-01-01 00:00:00 +0000
+++ src/bus.c	2015-01-12 23:02:27 +0000
@@ -0,0 +1,195 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#include "bus.h"
+
+typedef GDBusConnection* (*FinishFunc)(GAsyncResult*, GError**);
+
+struct bus_data
+{
+  char * address;
+  FinishFunc finish_func;
+  GSimpleAsyncResult * result;
+};
+
+GDBusConnection*
+indicator_power_get_bus_finish(GAsyncResult  * result,
+                               GError       ** error)
+{
+  GSimpleAsyncResult * simple;
+  GDBusConnection * bus;
+
+  g_return_val_if_fail (g_simple_async_result_is_valid (result, NULL, NULL), NULL);
+
+  simple = (GSimpleAsyncResult *) result;
+
+  if (g_simple_async_result_propagate_error (simple, error))
+    return NULL;
+
+  bus = G_DBUS_CONNECTION(g_simple_async_result_get_op_res_gpointer (simple));
+  g_object_ref(bus);
+  return bus;
+}
+
+static void
+on_bus_ready (GObject * unused G_GNUC_UNUSED, GAsyncResult * res, gpointer gdata)
+{
+  struct bus_data * data;
+  GError * error = NULL;
+  GDBusConnection * bus;
+
+  data = gdata;
+  error = NULL;
+  bus = data->finish_func(res, &error);
+  if (error != NULL)
+    {
+      if ((data->address != NULL) && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_simple_async_result_set_error (data->result, error->domain, error->code, "\"%s\" unreachable, %s", data->address, error->message);
+      else
+        g_simple_async_result_set_from_error (data->result, error);
+
+      g_error_free (error);
+    }
+
+  if (bus != NULL)
+    g_simple_async_result_set_op_res_gpointer(data->result, g_object_ref(bus), g_object_unref);
+  g_simple_async_result_complete_in_idle(data->result);
+
+  g_object_unref(data->result);
+  g_free(data->address);
+  g_free(data);
+}
+
+void indicator_power_get_bus(const char           * address,
+                             GBusType               bus_type,
+                             GCancellable         * cancellable,
+                             GAsyncReadyCallback    callback,
+                             gpointer               user_data)
+{
+  GSimpleAsyncResult * result;
+
+  result = g_simple_async_result_new(NULL,
+                                     callback,
+                                     user_data,
+                                     NULL);
+  g_simple_async_result_set_check_cancellable(result, cancellable);
+
+
+  struct bus_data * data = g_new0(struct bus_data, 1);
+  data->result = result;
+
+  if ((address != NULL) && g_dbus_is_address(address))
+    {
+      g_debug("Getting bus for address '%s'", address);
+      data->address = g_strdup(address);
+      data->finish_func = g_dbus_connection_new_for_address_finish;
+      g_dbus_connection_new_for_address(address,
+                                        G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION|G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT,
+                                        NULL /*GDBusAuthObserver*/,
+                                        cancellable,
+                                        on_bus_ready,
+                                        data);
+    }
+  else
+    {
+      g_debug("Getting GBusType %d", (int)bus_type);
+      data->finish_func = g_dbus_connection_new_for_address_finish;
+      data->finish_func = g_bus_get_finish;
+      g_bus_get(bus_type,
+                cancellable,
+                on_bus_ready,
+                data);
+    }
+}
+
+/***
+****
+***/
+
+static const char*
+get_name_from_env_with_fallback (const char * env, const char * fallback)
+{
+  const char * name = g_getenv(env);
+
+  if ((name == NULL) || !g_dbus_is_name(name))
+    name = fallback;
+
+  return name;
+}
+
+const char*
+indicator_power_get_indicator_busname(void)
+{
+  static const char * name = NULL;
+
+  if (G_UNLIKELY(name == NULL))
+    {
+      name = get_name_from_env_with_fallback("INDICATOR_POWER_BUS_NAME_INDICATOR",
+                                             "com.canonical.indicator.power");
+      g_debug("%s indicator busname is \"%s\"", G_STRLOC, name);
+    }
+
+  return name;
+}
+
+const char*
+indicator_power_get_upower_busname(void)
+{
+  static const char * name = NULL;
+
+  if (G_UNLIKELY(name == NULL))
+    {
+      name = get_name_from_env_with_fallback("INDICATOR_POWER_BUS_NAME_UPOWER",
+                                             "org.freedesktop.UPower");
+      g_debug("%s upower busname is \"%s\"", G_STRLOC, name);
+    }
+
+  return name;
+}
+
+const char*
+indicator_power_get_powerd_busname(void)
+{
+  static const char * name = NULL;
+
+  if (G_UNLIKELY(name == NULL))
+    {
+      name = get_name_from_env_with_fallback("INDICATOR_POWER_BUS_NAME_POWERD",
+                                             "com.canonical.powerd");
+      g_debug("%s powerd busname is \"%s\"", G_STRLOC, name);
+    }
+
+  return name;
+}
+
+const char*
+indicator_power_get_screen_busname(void)
+{
+  static const char * name = NULL;
+
+  if (G_UNLIKELY(name == NULL))
+    {
+      name = get_name_from_env_with_fallback("INDICATOR_POWER_BUS_NAME_SCREEN",
+                                             "com.canonical.Unity.Screen");
+      g_debug("%s screen busname is \"%s\"", G_STRLOC, name);
+    }
+
+  return name;
+}
+
 
=== added file 'src/bus.h'
--- src/bus.h	1970-01-01 00:00:00 +0000
+++ src/bus.h	2015-01-12 23:02:27 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ */
+
+#ifndef __INDICATOR_POWER_BUS_H__
+#define __INDICATOR_POWER_BUS_H__
+
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+const char*      indicator_power_get_indicator_busname   (void);
+const char*      indicator_power_get_powerd_busname      (void);
+const char*      indicator_power_get_screen_busname      (void);
+const char*      indicator_power_get_upower_busname      (void);
+
+/**
+ * Asynchronously get a bus connection.
+ *
+ * If address_name is a valid address, it's used. Otherwise, the bus_type is retrieved.
+ * This can be used to let a debug bus address override another address; e.g.
+ * indicator_power_get_bus(g_getenv("INDICATOR_POWER_BUS_ADDRESS_UPOWER"), G_BUS_TYPE_SYSTEM, ...
+ */
+void             indicator_power_get_bus                 (const char           * address_name,
+                                                          GBusType               bus_type,
+                                                          GCancellable         * cancellable,
+                                                          GAsyncReadyCallback    callback,
+                                                          gpointer               user_data);
+
+GDBusConnection* indicator_power_get_bus_finish          (GAsyncResult         * result,
+                                                          GError              ** error);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_POWER_BUS_H__ */
 
=== modified file 'src/device-provider-upower.c'
--- src/device-provider-upower.c	2014-09-08 14:50:22 +0000
+++ src/device-provider-upower.c	2015-01-12 23:02:27 +0000
@@ -17,12 +17,11 @@
  * with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "bus.h"
 #include "device.h"
 #include "device-provider.h"
 #include "device-provider-upower.h"
 
-#define BUS_NAME "org.freedesktop.UPower"
-
 #define MGR_IFACE "org.freedesktop.UPower"
 #define MGR_PATH  "/org/freedesktop/UPower"
 
@@ -175,7 +174,7 @@
   data->self = self;
 
   g_dbus_connection_call(p->bus,
-                         BUS_NAME,
+                         indicator_power_get_upower_busname(),
                          path,
                          "org.freedesktop.DBus.Properties",
                          "GetAll",
@@ -409,7 +408,7 @@
 
 /* start listening for UPower events on the bus */
 static void
-on_bus_name_appeared(GDBusConnection * bus,
+on_bus_name_appeared(GDBusConnection * bus          G_GNUC_UNUSED,
                      const gchar     * name         G_GNUC_UNUSED,
                      const gchar     * name_owner,
                      gpointer          gself)
@@ -420,7 +419,6 @@
 
   self = INDICATOR_POWER_DEVICE_PROVIDER_UPOWER(gself);
   p = get_priv(self);
-  p->bus = G_DBUS_CONNECTION(g_object_ref(bus));
 
   /* listen for signals from the boss */
   tag = g_dbus_connection_signal_subscribe(p->bus,
@@ -450,7 +448,7 @@
 
   /* rebuild our devices list */
   g_dbus_connection_call(p->bus,
-                         BUS_NAME,
+                         indicator_power_get_upower_busname(),
                          MGR_PATH,
                          MGR_IFACE,
                          "EnumerateDevices",
@@ -490,9 +488,6 @@
     g_dbus_connection_signal_unsubscribe(p->bus, GPOINTER_TO_UINT(l->data));
   g_slist_free(p->subscriptions);
   p->subscriptions = NULL;
-
-  /* clear the bus */
-  g_clear_object(&p->bus);
 }
 
 /***
@@ -518,6 +513,8 @@
 ****  GObject virtual functions
 ***/
 
+static void set_bus (IndicatorPowerDeviceProviderUPower * self, GDBusConnection * connection);
+
 static void
 my_dispose (GObject * o)
 {
@@ -541,13 +538,7 @@
       p->queued_paths_timer = 0;
     }
 
-  if (p->name_tag != 0)
-    {
-      g_bus_unwatch_name(p->name_tag);
-      on_bus_name_vanished(NULL, NULL, self);
-
-      p->name_tag = 0;
-    }
+  set_bus (self, NULL);
 
   G_OBJECT_CLASS (indicator_power_device_provider_upower_parent_class)->dispose(o);
 }
@@ -568,6 +559,61 @@
 }
 
 /***
+****  Bus
+***/
+
+static void
+set_bus (IndicatorPowerDeviceProviderUPower * self, GDBusConnection * bus)
+{
+  priv_t * p = get_priv(self);
+
+  if (p->bus != NULL)
+    {
+      g_bus_unwatch_name(p->name_tag);
+      on_bus_name_vanished(NULL, NULL, self);
+      p->name_tag = 0;
+
+      g_clear_object(&p->bus);
+    }
+
+  if (bus != NULL)
+    {
+      p->bus = g_object_ref(bus);
+      g_debug("%s: using bus '%s'", G_STRFUNC, g_dbus_connection_get_unique_name(bus));
+
+      p->name_tag = g_bus_watch_name_on_connection(p->bus,
+                                                   indicator_power_get_upower_busname(),
+                                                   G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                                   on_bus_name_appeared,
+                                                   on_bus_name_vanished,
+                                                   self,
+                                                   NULL);
+    }
+}
+
+static void
+on_bus_ready (GObject * unused G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+{
+  GDBusConnection * bus;
+  GError * error = NULL;
+
+  bus = indicator_power_get_bus_finish(res, &error);
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Error getting bus: %s", error->message);
+
+      g_error_free (error);
+    }
+  else
+    {
+      set_bus (INDICATOR_POWER_DEVICE_PROVIDER_UPOWER(gself), bus);
+    }
+
+  g_clear_object(&bus);
+}
+
+/***
 ****  Instantiation
 ***/
 
@@ -603,13 +649,11 @@
                                           g_free,
                                           NULL);
 
-  p->name_tag = g_bus_watch_name(G_BUS_TYPE_SYSTEM,
-                                 BUS_NAME,
-                                 G_BUS_NAME_WATCHER_FLAGS_NONE,
-                                 on_bus_name_appeared,
-                                 on_bus_name_vanished,
-                                 self,
-                                 NULL);
+  indicator_power_get_bus(g_getenv("INDICATOR_POWER_BUS_ADDRESS_UPOWER"),
+                          G_BUS_TYPE_SYSTEM,
+                          p->cancellable,
+                          on_bus_ready,
+                          self);
 }
 
 /***
 
=== modified file 'src/service.c'
--- src/service.c	2014-10-14 19:07:50 +0000
+++ src/service.c	2015-01-12 23:02:27 +0000
@@ -22,6 +22,7 @@
 #include <gio/gio.h>
 #include <url-dispatcher.h>
 
+#include "bus.h"
 #include "brightness.h"
 #include "dbus-shared.h"
 #include "device.h"
@@ -29,7 +30,6 @@
 #include "notifier.h"
 #include "service.h"
 
-#define BUS_NAME "com.canonical.indicator.power"
 #define BUS_PATH "/com/canonical/indicator/power"
 
 #define SETTINGS_SHOW_TIME_S "show-time"
@@ -108,7 +108,7 @@
 
   guint own_id;
   guint actions_export_id;
-  GDBusConnection * conn;
+  GDBusConnection * bus;
 
   struct ProfileMenuInfo menus[N_PROFILES];
 
@@ -581,7 +581,7 @@
       g_simple_action_set_state (p->header_action, create_header_state (self));
     }
 
-  if (p->conn == NULL) /* we haven't built the menus yet */
+  if (p->bus == NULL) /* we haven't built the menus yet */
     return;
 
   if (sections & SECTION_DEVICES)
@@ -822,108 +822,6 @@
 }
 
 /***
-****  GDBus Name Ownership & Menu / Action Exporting
-***/
-
-static void
-on_bus_acquired (GDBusConnection * connection,
-                 const gchar     * name,
-                 gpointer          gself)
-{
-  int i;
-  guint id;
-  GError * err = NULL;
-  IndicatorPowerService * self = INDICATOR_POWER_SERVICE(gself);
-  priv_t * p = self->priv;
-  GString * path = g_string_new (NULL);
-
-  g_debug ("bus acquired: %s", name);
-
-  p->conn = g_object_ref (G_OBJECT (connection));
-  g_object_notify_by_pspec (G_OBJECT(self), properties[PROP_BUS]);
-
-  /* export the battery properties */
-  indicator_power_notifier_set_bus (p->notifier, connection);
-
-  /* export the actions */
-  if ((id = g_dbus_connection_export_action_group (connection,
-                                                   BUS_PATH,
-                                                   G_ACTION_GROUP (p->actions),
-                                                   &err)))
-    {
-      p->actions_export_id = id;
-    }
-  else
-    {
-      g_warning ("cannot export action group: %s", err->message);
-      g_clear_error (&err);
-    }
-
-  /* export the menus */
-  for (i=0; i<N_PROFILES; ++i)
-    {
-      struct ProfileMenuInfo * menu = &p->menus[i];
-
-      g_string_printf (path, "%s/%s", BUS_PATH, menu_names[i]);
-
-      if ((id = g_dbus_connection_export_menu_model (connection,
-                                                     path->str,
-                                                     G_MENU_MODEL (menu->menu),
-                                                     &err)))
-        {
-          menu->export_id = id;
-        }
-      else
-        {
-          g_warning ("cannot export %s menu: %s", path->str, err->message);
-          g_clear_error (&err);
-        }
-    }
-
-  g_string_free (path, TRUE);
-}
-
-static void
-unexport (IndicatorPowerService * self)
-{
-  int i;
-  priv_t * p = self->priv;
-
-  /* unexport the menus */
-  for (i=0; i<N_PROFILES; ++i)
-    {
-      guint * id = &self->priv->menus[i].export_id;
-
-      if (*id)
-        {
-          g_dbus_connection_unexport_menu_model (p->conn, *id);
-          *id = 0;
-        }
-    }
-
-  /* unexport the actions */
-  if (p->actions_export_id)
-    {
-      g_dbus_connection_unexport_action_group (p->conn, p->actions_export_id);
-      p->actions_export_id = 0;
-    }
-}
-
-static void
-on_name_lost (GDBusConnection * connection G_GNUC_UNUSED,
-              const gchar     * name,
-              gpointer          gself)
-{
-  IndicatorPowerService * self = INDICATOR_POWER_SERVICE (gself);
-
-  g_debug ("%s %s name lost %s", G_STRLOC, G_STRFUNC, name);
-
-  unexport (self);
-
-  g_signal_emit (self, signals[SIGNAL_NAME_LOST], 0, NULL);
-}
-
-/***
 ****  Events
 ***/
 
@@ -980,7 +878,7 @@
   switch (property_id)
     {
       case PROP_BUS:
-        g_value_set_object (value, p->conn);
+        g_value_set_object (value, p->bus);
         break;
 
       case PROP_DEVICE_PROVIDER:
@@ -1011,19 +909,15 @@
     }
 }
 
+static void set_bus (IndicatorPowerService*, GDBusConnection*);
+
 static void
 my_dispose (GObject * o)
 {
   IndicatorPowerService * self = INDICATOR_POWER_SERVICE(o);
   priv_t * p = self->priv;
 
-  if (p->own_id)
-    {
-      g_bus_unown_name (p->own_id);
-      p->own_id = 0;
-    }
-
-  unexport (self);
+  set_bus(self, NULL);
 
   if (p->cancellable != NULL)
     {
@@ -1045,14 +939,161 @@
   g_clear_object (&p->header_action);
   g_clear_object (&p->actions);
 
-  g_clear_object (&p->conn);
-
   indicator_power_service_set_device_provider (self, NULL);
 
   G_OBJECT_CLASS (indicator_power_service_parent_class)->dispose (o);
 }
 
 /***
+****
+***/
+
+static void
+unexport (IndicatorPowerService * self)
+{
+  int i;
+  priv_t * p = self->priv;
+
+  /* unexport the menus */
+  for (i=0; i<N_PROFILES; ++i)
+    {
+      guint * id = &self->priv->menus[i].export_id;
+
+      if (*id)
+        {
+          g_dbus_connection_unexport_menu_model (p->bus, *id);
+          *id = 0;
+        }
+    }
+
+  /* unexport the actions */
+  if (p->actions_export_id)
+    {
+      g_dbus_connection_unexport_action_group (p->bus, p->actions_export_id);
+      p->actions_export_id = 0;
+    }
+}
+
+static void
+on_name_lost (GDBusConnection * connection G_GNUC_UNUSED,
+              const gchar     * name,
+              gpointer          gself)
+{
+  IndicatorPowerService * self = INDICATOR_POWER_SERVICE (gself);
+
+  g_debug ("%s %s name lost %s", G_STRLOC, G_STRFUNC, name);
+
+  unexport (self);
+
+  g_signal_emit (self, signals[SIGNAL_NAME_LOST], 0, NULL);
+}
+
+static void
+export (IndicatorPowerService * self)
+{
+  priv_t * p = self->priv;
+  GString * path = g_string_new(NULL);
+  GError * error;
+  guint id;
+  int i;
+
+  p->own_id = g_bus_own_name_on_connection(p->bus,
+                                           indicator_power_get_indicator_busname(),
+                                           G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,
+                                           NULL,
+                                           on_name_lost,
+                                           self,
+                                           NULL);
+
+  /* export the battery properties */
+  indicator_power_notifier_set_bus(p->notifier, p->bus);
+
+  /* export the actions */
+  error = NULL;
+  if ((id = g_dbus_connection_export_action_group(p->bus,
+                                                  BUS_PATH,
+                                                  G_ACTION_GROUP(p->actions),
+                                                  &error)))
+    {
+      p->actions_export_id = id;
+    }
+  else
+    {
+      g_warning("cannot export action group: %s", error->message);
+      g_clear_error(&error);
+    }
+
+  /* export the menus */
+  for (i=0; i<N_PROFILES; ++i)
+    {
+      struct ProfileMenuInfo * menu = &p->menus[i];
+
+      g_string_printf (path, "%s/%s", BUS_PATH, menu_names[i]);
+
+      if ((id = g_dbus_connection_export_menu_model(p->bus,
+                                                    path->str,
+                                                    G_MENU_MODEL (menu->menu),
+                                                    &error)))
+        {
+          menu->export_id = id;
+        }
+      else
+        {
+          g_warning("cannot export %s menu: %s", path->str, error->message);
+          g_clear_error(&error);
+        }
+    }
+
+  g_string_free (path, TRUE);
+}
+
+static void
+set_bus (IndicatorPowerService * self, GDBusConnection * bus)
+{
+  priv_t * p = self->priv;
+
+  if (p->bus != NULL)
+    {
+      unexport (self);
+
+      g_bus_unown_name (p->own_id);
+      p->own_id = 0;
+
+      g_clear_object(&p->bus);
+    }
+
+  if (bus != NULL)
+    {
+      p->bus = g_object_ref(bus);
+      g_object_notify_by_pspec(G_OBJECT(self), properties[PROP_BUS]);
+
+      export(self);
+    }
+}
+
+static void
+on_bus_ready (GObject * unused G_GNUC_UNUSED, GAsyncResult * res, gpointer gself)
+{
+  GDBusConnection * bus;
+  GError * error = NULL;
+
+  bus = indicator_power_get_bus_finish(res, &error);
+  if (error != NULL)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Error getting indicator bus: %s", error->message);
+
+      g_error_free (error);
+    }
+  else
+    {
+      set_bus (INDICATOR_POWER_SERVICE(gself), bus);
+    }
+
+  g_clear_object(&bus);
+}
+
+/***
 ****  Instantiation
 ***/
 
@@ -1087,14 +1128,11 @@
   g_signal_connect_swapped(p->brightness, "notify::auto-brightness-supported",
                            G_CALLBACK(on_auto_brightness_supported_changed), self);
 
-  p->own_id = g_bus_own_name(G_BUS_TYPE_SESSION,
-                             BUS_NAME,
-                             G_BUS_NAME_OWNER_FLAGS_ALLOW_REPLACEMENT,
-                             on_bus_acquired,
-                             NULL,
-                             on_name_lost,
-                             self,
-                             NULL);
+  indicator_power_get_bus(g_getenv("INDICATOR_POWER_BUS_ADDRESS_INDICATOR"),
+                          G_BUS_TYPE_SESSION,
+                          p->cancellable,
+                          on_bus_ready,
+                          self);
 }
 
 static void