Change dbus path of enable/disable method

diff --git a/include/mesh_dbus.h b/include/mesh_dbus.h
index 7ac980b..e4bf3b4 100644 (file)
--- a/include/mesh_dbus.h
+++ b/include/mesh_dbus.h
@@ -25,9 +25,12 @@ extern "C" {
 
 #define MESH_SERVER_NAME "net.mesh"
 #define MESH_OBJECT_PATH "/net/mesh"
-
 #define MESH_SERVICE_INTERFACE "net.mesh"
 
+#define MESH_MANAGER_NAME "net.mesh.manager"
+#define MESH_MANAGER_OBJ_PATH "/net/mesh/manager"
+#define MESH_MANAGER_INTERFACE "net.mesh.manager"
+
 #define MESH_DBUS_PROXY_TIMEOUT ((9.5 + 2) * 1000) /**< default timeout for GDBus */
 
 int _mesh_dbus_start(mesh_h m);

diff --git a/src/mesh_dbus.c b/src/mesh_dbus.c
index e8842da..cf38c3c 100644 (file)
--- a/src/mesh_dbus.c
+++ b/src/mesh_dbus.c
@@ -392,15 +392,17 @@ int _mesh_enable(mesh_h handle, mesh_event_cb event_handler)
        struct mesh_handle *h = handle;
 
        RETV_IF(NULL == h->dbus_connection, MESH_ITNL_ERR_IO_ERROR);
-       RETV_IF(NULL == _gproxy_mesh_service, MESH_ITNL_ERR_IO_ERROR);
 
        h->event_handler = event_handler;
 
-       variant = g_dbus_proxy_call_sync(_gproxy_mesh_service, "enable",
-                               NULL,
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1,
-                               NULL, &error);
+       variant = g_dbus_connection_call_sync(h->dbus_connection,
+                       MESH_MANAGER_NAME,
+                       MESH_MANAGER_OBJ_PATH,
+                       MESH_MANAGER_INTERFACE,
+                       "enable",
+                       NULL, NULL,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, &error);
        if (variant) {
                g_variant_get(variant, "(u)", &result);
                LOGD("enabled status 0x%x", result);
@@ -424,13 +426,15 @@ int _mesh_disable(mesh_h handle)
        _mesh_remove_mpath();
 
        RETV_IF(NULL == h->dbus_connection, MESH_ITNL_ERR_IO_ERROR);
-       RETV_IF(NULL == _gproxy_mesh_service, MESH_ITNL_ERR_IO_ERROR);
 
-       variant = g_dbus_proxy_call_sync(_gproxy_mesh_service, "disable",
-                               NULL,
-                               G_DBUS_CALL_FLAGS_NONE,
-                               -1,
-                               NULL, &error);
+       variant = g_dbus_connection_call_sync(h->dbus_connection,
+                       MESH_MANAGER_NAME,
+                       MESH_MANAGER_OBJ_PATH,
+                       MESH_MANAGER_INTERFACE,
+                       "disable",
+                       NULL, NULL,
+                       G_DBUS_CALL_FLAGS_NONE,
+                       -1, NULL, &error);
        if (variant) {
                g_variant_get(variant, "(u)", &result);
                LOGD("Disabled status 0x%x", result);