Change dbus function name

Change-Id: I6f6aabf82a4f9e63b1ac678579cafaed5299767b
Signed-off-by: taemin.yeom <taemin.yeom@samsung.com>

diff --git a/src/storage-external-dbus.c b/src/storage-external-dbus.c
index 1b71d56..b94e311 100755 (executable)
--- a/src/storage-external-dbus.c
+++ b/src/storage-external-dbus.c
@@ -28,7 +28,7 @@
 #include <glib.h>
 #include <sys/statvfs.h>
 #include <tzplatform_config.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "log.h"
@@ -104,7 +104,7 @@ int storage_ext_get_list(GList **list)
        if (!list)
                return -EINVAL;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        STORAGE_EXT_GET_LIST,
@@ -173,7 +173,7 @@ int storage_ext_get_statvfs(char *path, struct statvfs_32 *buf)
 
        memset(buf, 0, sizeof(struct statvfs_32));
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_STORAGE,
                        STORAGE_EXT_IFACE_STORAGE,
                        STORAGE_EXT_GET_STATVFS,
@@ -220,7 +220,7 @@ int storage_ext_get_statvfs_size64(char *path, struct statvfs *buf)
 
        memset(buf, 0, sizeof(struct statvfs));
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_STORAGE,
                        STORAGE_EXT_IFACE_STORAGE,
                        STORAGE_EXT_GET_STATVFS,
@@ -265,7 +265,7 @@ int storage_ext_get_storage_level(const char *path, char **level)
                return -EINVAL;
        }
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_STORAGE,
                        STORAGE_EXT_IFACE_STORAGE,
                        STORAGE_EXT_GET_STORAGE_LEVEL,
@@ -407,7 +407,7 @@ int storage_ext_register_device_change(storage_ext_changed_cb func, void *data)
                //LCOV_EXCL_STOP
        }
 
-       block_id = subscribe_dbus_signal(NULL, NULL,
+       block_id = gdbus_signal_subscribe(NULL, NULL,
                        STORAGE_EXT_IFACE_MANAGER,
                        NULL,
                        storage_ext_changed,
@@ -443,7 +443,7 @@ void storage_ext_unregister_device_change(storage_ext_changed_cb func)
                if (callback->func != func)
                        continue;
                if (callback->block_id > 0)
-                       unsubscribe_dbus_signal(NULL, callback->block_id);
+                       gdbus_signal_unsubscribe(NULL, callback->block_id);
 
                SYS_G_LIST_REMOVE(changed_list, callback);
                free(callback);
@@ -455,7 +455,7 @@ int storage_ext_get_device_info(int storage_id, storage_ext_device *info)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        "GetDeviceInfo",

diff --git a/src/storage-inhouse.c b/src/storage-inhouse.c
index c2d5d1b..1d89af4 100755 (executable)
--- a/src/storage-inhouse.c
+++ b/src/storage-inhouse.c
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include <tzplatform_config.h>
 #include <blkid.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "common.h"
 #include "log.h"
@@ -174,7 +174,7 @@ API int storage_get_primary_sdcard(int *storage_id, char **path)
        if (!storage_ext_is_supported())
                return STORAGE_ERROR_NOT_SUPPORTED;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        "GetMmcPrimary",
@@ -285,7 +285,7 @@ API int storage_request_mount_mmc(struct mmc_contents *mmc_data)
                free(path);
 //LCOV_EXCL_STOP
 
-       ret_val = dbus_handle_method_async_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_val = gdbus_call_async_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        "Mount",
@@ -354,7 +354,7 @@ API int storage_request_unmount_mmc(struct mmc_contents *mmc_data, int option)
                free(path);
 //LCOV_EXCL_STOP
 
-       ret_val = dbus_handle_method_async_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_val = gdbus_call_async_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        "Unmount",
@@ -428,7 +428,7 @@ API int storage_format_mmc(struct mmc_contents *mmc_data, int option)
                free(path);
 //LCOV_EXCL_STOP
 
-       ret_val = dbus_handle_method_async_with_reply_var(STORAGE_EXT_BUS_NAME,
+       ret_val = gdbus_call_async_with_reply(STORAGE_EXT_BUS_NAME,
                        STORAGE_EXT_PATH_MANAGER,
                        STORAGE_EXT_IFACE_MANAGER,
                        "Format",