Modify block signal interface and object path

Change-Id: I636e63e2494f0675d4d4a6ecab067fb3766602e5
Signed-off-by: pr.jung <pr.jung@samsung.com>

diff --git a/src/storage-external-dbus.c b/src/storage-external-dbus.c
index 012044c..bf032b1 100755 (executable)
--- a/src/storage-external-dbus.c
+++ b/src/storage-external-dbus.c
@@ -270,7 +270,7 @@ static void storage_ext_changed(GDBusConnection *conn,
        iface_len = strlen(iface) + 1;
        signal_len = strlen(signal) + 1;
 
-       if (strncmp(iface, STORAGE_EXT_IFACE, iface_len))
+       if (strncmp(iface, STORAGE_EXT_IFACE_MANAGER, iface_len))
                return;
 
        if (!strncmp(signal, STORAGE_EXT_DEVICE_CHANGED, signal_len))
@@ -327,7 +327,7 @@ int storage_ext_register_device_change(storage_ext_changed_cb func, void *data)
 
        block_id = g_dbus_connection_signal_subscribe(conn,
                        STORAGE_EXT_BUS_NAME,
-                       STORAGE_EXT_IFACE,
+                       STORAGE_EXT_IFACE_MANAGER,
                        NULL,
                        NULL,
                        NULL,
@@ -385,7 +385,7 @@ int storage_ext_get_device_info(int storage_id, storage_ext_device *info)
        result = dbus_method_call_sync(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
-                       "GetDeviceInfoByID",
+                       "GetDeviceInfo",
                        g_variant_new("(i)", storage_id));
        if (!result) {
                _E("There is no storage with the storage id (%d)", storage_id); //LCOV_EXCL_LINE

diff --git a/src/storage-external-dbus.h b/src/storage-external-dbus.h
index 06153ee..7ae0d1f 100644 (file)
--- a/src/storage-external-dbus.h
+++ b/src/storage-external-dbus.h
@@ -26,10 +26,7 @@
 #include "list.h"
 
 #define STORAGE_EXT_BUS_NAME              "org.tizen.system.storage"
-#define STORAGE_EXT_PATH                  "/Org/Tizen/System/Storage/Block"
-#define STORAGE_EXT_PATH_DEVICES          STORAGE_EXT_PATH"/Devices"
-#define STORAGE_EXT_PATH_MANAGER          STORAGE_EXT_PATH"/Manager"
-#define STORAGE_EXT_IFACE                 STORAGE_EXT_BUS_NAME".Block"
+#define STORAGE_EXT_PATH_MANAGER          "/Org/Tizen/System/Storage/Block/Manager"
 #define STORAGE_EXT_IFACE_MANAGER         STORAGE_EXT_BUS_NAME".BlockManager"
 
 enum mount_state {