[connman] Share a single connection to D-Bus system bus.

[profile/ivi/settings-daemon.git] / plugins / connman / connman_manager.cpp

diff --git a/plugins/connman/connman_manager.cpp b/plugins/connman/connman_manager.cpp
index cda4ee7..f1c13a1 100644 (file)
--- a/plugins/connman/connman_manager.cpp
+++ b/plugins/connman/connman_manager.cpp
@@ -25,6 +25,7 @@
  */
 
 #include "connman_manager.hpp"
+#include "dbus_connection.hpp"
 
 #include <settingsd/dbus_signal_callback.hpp>
 #include <settingsd/glib_traits.hpp>
@@ -34,14 +35,16 @@
 
 
 ivi::settings::connman_manager::connman_manager(
+  GDBusConnection * connection,
   event_callback const & e)
   : connman_("net.connman.Manager",     // Interface
              "/",                       // Object path
+             connection,
              e)
   , event_callback_(e)
   , subscription_id_(
       g_dbus_connection_signal_subscribe(
-        g_dbus_proxy_get_connection(G_DBUS_PROXY(connman_.proxy())),
+        connection,
         nullptr,
         connman_.interface_name(),
         "ServicesChanged",
@@ -64,9 +67,8 @@ ivi::settings::connman_manager::connman_manager(
 
 ivi::settings::connman_manager::~connman_manager()
 {
-  g_dbus_connection_signal_unsubscribe(
-    g_dbus_proxy_get_connection(G_DBUS_PROXY(connman_.proxy())),
-    subscription_id_);
+  g_dbus_connection_signal_unsubscribe(connman_.connection(),
+                                       subscription_id_);
 }
 
 GVariant *