Change dbus function name 58/255558/5 accepted/tizen/unified/20210321.225735 submit/tizen/20210319.090004
authorHyotaek Shim <hyotaek.shim@samsung.com>
Fri, 19 Mar 2021 07:51:32 +0000 (16:51 +0900)
committerHyotaek Shim <hyotaek.shim@samsung.com>
Fri, 19 Mar 2021 08:38:19 +0000 (17:38 +0900)
Change-Id: Id55622fd2a822f38328038a9e65cf0fe83960f50
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
80 files changed:
plugins/iot/display/core.c
plugins/iot/display/key-filter.c
plugins/mobile/battery/battery-notification.c
plugins/mobile/display/core.c
plugins/mobile/display/key-filter.c
plugins/tv/display/core.c
plugins/tv/display/key-filter.c
plugins/tv/display/state-tv.c
plugins/wearable/display/core.c
plugins/wearable/display/display-handler.c
plugins/wearable/display/enhance.c
plugins/wearable/display/hbm.c
plugins/wearable/display/key-filter.c
plugins/wearable/display/lbm.c
plugins/wearable/display/swim.c
src/apps/apps.c
src/apps/apps.h
src/auto-test/battery.c
src/auto-test/brightness.c
src/auto-test/display.c
src/auto-test/extcon.c
src/auto-test/ir.c
src/auto-test/led.c
src/auto-test/power.c
src/auto-test/proc.c
src/auto-test/test.h
src/auto-test/test_dbus_interface.c
src/auto-test/test_dbus_interface.h
src/auto-test/time.c
src/auto-test/udev.c
src/battery-monitor/battery-monitor.c
src/battery/battery-ops.h
src/battery/battery-time.c
src/battery/lowbat-handler.c
src/battery/power-supply.c
src/board/board-info.c
src/control/control.c
src/core/device-notifier.c
src/core/devices.c
src/core/event-handler.c
src/core/main.c
src/core/udev.c
src/cpu/pmqos.c
src/devicectl/devicectl.c
src/display/ambient-mode.c
src/display/display-dbus.c
src/display/display-lock.c
src/display/display-signal.c
src/display/display-signal.h
src/display/poll.h
src/dump/dump.c
src/extcon/cradle.c
src/extcon/earjack.c
src/extcon/extcon.c
src/extcon/hdmi.c
src/ir/ir.c
src/led/noti.c
src/led/rgb.c
src/led/torch.c
src/led/touch-key.c
src/libdeviced/deviced-noti.c
src/libdeviced/display.c
src/libdeviced/haptic.c
src/libdeviced/led.c
src/libdeviced/usbhost.c
src/power-command/command.c
src/power/boot.c
src/power/doze.c
src/power/power-control.c
src/power/power-handler.c
src/proc/cpu-info.c
src/thermal/thermal.c
src/time/time-handler.c
src/touchscreen/sensitivity.c
src/touchscreen/touchscreen.c
src/tzip/tzip.c
src/usb-host-test/usb-host-test.c
src/usb/usb-dbus.c
src/usb/usb.c
src/usbhost/usb-host.c

index f2a9588..ef4c534 100644 (file)
@@ -268,7 +268,7 @@ static int display_brightness_changed(void *data)
 
        brt = DATA_VALUE_INT(data);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        "Brightness",
@@ -1041,7 +1041,7 @@ static void proc_condition_lock(PMMsg *data)
 
                if (lock_type) {
                        /* power lock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerLock",
@@ -1095,7 +1095,7 @@ static void proc_condition_unlock(PMMsg *data)
 
                if (lock_type) {
                        /* power unlock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerUnlock",
index 9e6e343..1cd3892 100644 (file)
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <linux/input.h>
 
 #include "ambient-mode.h"
@@ -186,7 +186,7 @@ static inline void check_key_pair(int code, int new, int *old)
 
 static inline void broadcast_lcdon_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDON_BY_POWERKEY,
@@ -195,7 +195,7 @@ static inline void broadcast_lcdon_by_powerkey(void)
 
 static inline void broadcast_lcdoff_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDOFF_BY_POWERKEY,
@@ -528,7 +528,7 @@ static void sound_vibrate_hardkey(void)
        /* device notify(vibrator) */
        /* sound(dbus) */
        /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_KEY,
                                        DEVICED_INTERFACE_KEY,
                                        SIGNAL_CHANGE_HARDKEY,
@@ -679,7 +679,7 @@ static int check_key_filter(void *data, int fd)
                        _E("Same key(%d, %d) is polled [%d,%d]",
                                code, value, old_fd, fd);
                }
-               dbus_handle_emit_dbus_signal(NULL,
+               gdbus_signal_emit(NULL,
                                 DEVICED_PATH_INPUT,
                                 DEVICED_INTERFACE_INPUT,
                                 "key",
index 459f455..c116a73 100644 (file)
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "apps/apps.h"
 #include "core/log.h"
@@ -141,7 +141,7 @@ static int launch_lowbat_noti(int capacity, int option)
                        /* remove waring notiid*/
                        noti_id = noti_crit;
                        for (retry = RETRY_MAX; retry > 0; retry--) {
-                               ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                               ret = gdbus_call_async(POPUP_BUS_NAME,
                                                POPUP_PATH_BATTERY,
                                                POPUP_INTERFACE_BATTERY,
                                                METHOD_LOW_NOTI_OFF,
@@ -165,13 +165,13 @@ static int launch_lowbat_noti(int capacity, int option)
                }
                prev_level = battery_info.warning;
                if (battery->charge_now)
-                       ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async(POPUP_BUS_NAME,
                                POPUP_PATH_BATTERY,
                                POPUP_INTERFACE_BATTERY,
                                noti_type,
                                g_variant_new("(ss)", pa[0], pa[1]));
                else
-                       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                                POPUP_PATH_BATTERY,
                                POPUP_INTERFACE_BATTERY,
                                noti_type,
@@ -182,7 +182,7 @@ static int launch_lowbat_noti(int capacity, int option)
                        /* remove waring notiid*/
                        noti_id = noti_low;
                        for (retry = RETRY_MAX; retry > 0; retry--) {
-                               ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                               ret = gdbus_call_async(POPUP_BUS_NAME,
                                                POPUP_PATH_BATTERY,
                                                POPUP_INTERFACE_BATTERY,
                                                METHOD_CRITICAL_NOTI_OFF,
@@ -206,13 +206,13 @@ static int launch_lowbat_noti(int capacity, int option)
                }
                prev_level = battery_info.critical;
                if (battery->charge_now)
-                       ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async(POPUP_BUS_NAME,
                                POPUP_PATH_BATTERY,
                                POPUP_INTERFACE_BATTERY,
                                noti_type,
                                g_variant_new("(ss)", pa[0], pa[1]));
                else
-                       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                                POPUP_PATH_BATTERY,
                                POPUP_INTERFACE_BATTERY,
                                noti_type,
@@ -249,7 +249,7 @@ static void clean_lowbat_noti(const char *prev, const char *str)
                        /* remove critical notiid */
                        noti_id = noti_crit;
                        for (retry = RETRY_MAX; retry > 0; retry--) {
-                               ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                               ret = gdbus_call_async(POPUP_BUS_NAME,
                                                POPUP_PATH_BATTERY,
                                                POPUP_INTERFACE_BATTERY,
                                                METHOD_CRITICAL_NOTI_OFF,
@@ -267,7 +267,7 @@ static void clean_lowbat_noti(const char *prev, const char *str)
                        /* remove waring notiid*/
                        noti_id = noti_low;
                        for (retry = RETRY_MAX; retry > 0; retry--) {
-                               ret = dbus_handle_method_async_var(POPUP_BUS_NAME,
+                               ret = gdbus_call_async(POPUP_BUS_NAME,
                                                POPUP_PATH_BATTERY,
                                                POPUP_INTERFACE_BATTERY,
                                                METHOD_LOW_NOTI_OFF,
@@ -393,7 +393,7 @@ static void battery_notification_init(void *data)
 
        plugin->display_changed = display_changed;
 
-       ret = subscribe_dbus_signal(NULL, DEVICED_PATH_SYSNOTI,
+       ret = gdbus_signal_subscribe(NULL, DEVICED_PATH_SYSNOTI,
                DEVICED_INTERFACE_SYSNOTI, SIGNAL_CHARGEERR_RESPONSE, abnormal_popup_dbus_signal_handler, NULL, NULL);
        if (ret <= 0)
                _E("Failed to init dbus signal: %d", ret);
index 2818a4f..067ed82 100644 (file)
@@ -270,7 +270,7 @@ static int display_brightness_changed(void *data)
 
        brt = DATA_VALUE_INT(data);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        "Brightness",
@@ -1052,7 +1052,7 @@ static void proc_condition_lock(PMMsg *data)
 
                if (lock_type) {
                        /* power lock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerLock",
@@ -1105,7 +1105,7 @@ static void proc_condition_unlock(PMMsg *data)
 
                if (lock_type) {
                        /* power unlock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerUnlock",
index 93bcaaf..0c834f7 100644 (file)
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <linux/input.h>
 
 #include "ambient-mode.h"
@@ -175,7 +175,7 @@ static inline void check_key_pair(int code, int new, int *old)
 
 static inline void broadcast_lcdon_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDON_BY_POWERKEY,
@@ -184,7 +184,7 @@ static inline void broadcast_lcdon_by_powerkey(void)
 
 static inline void broadcast_lcdoff_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDOFF_BY_POWERKEY,
@@ -561,7 +561,7 @@ static void sound_vibrate_hardkey(void)
        /* device notify(vibrator) */
        /* sound(dbus) */
        /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_KEY,
                                        DEVICED_INTERFACE_KEY,
                                        SIGNAL_CHANGE_HARDKEY,
index 806237a..7d611e2 100644 (file)
@@ -268,7 +268,7 @@ static int display_brightness_changed(void *data)
 
        brt = DATA_VALUE_INT(data);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        "Brightness",
@@ -1041,7 +1041,7 @@ static void proc_condition_lock(PMMsg *data)
 
                if (lock_type) {
                        /* power lock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerLock",
@@ -1095,7 +1095,7 @@ static void proc_condition_unlock(PMMsg *data)
 
                if (lock_type) {
                        /* power unlock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerUnlock",
index 90a94dd..2e88788 100644 (file)
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <linux/input.h>
 
 #include "ambient-mode.h"
@@ -186,7 +186,7 @@ static inline void check_key_pair(int code, int new, int *old)
 
 static inline void broadcast_lcdon_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDON_BY_POWERKEY,
@@ -195,7 +195,7 @@ static inline void broadcast_lcdon_by_powerkey(void)
 
 static inline void broadcast_lcdoff_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDOFF_BY_POWERKEY,
@@ -528,7 +528,7 @@ static void sound_vibrate_hardkey(void)
        /* device notify(vibrator) */
        /* sound(dbus) */
        /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangedHardKey signal */
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_KEY,
                                        DEVICED_INTERFACE_KEY,
                                        SIGNAL_CHANGE_HARDKEY,
index ceb85d0..8a1fcfe 100644 (file)
@@ -134,7 +134,7 @@ static int lcdon_pre(void *data)
 
        if (get_pm_cur_state() == S_STANDBY) {
                _I("send pre state change NORMAL");
-               ret = dbus_handle_emit_dbus_signal(NULL,
+               ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        SIGNAL_PRE_CHANGE_STATE,
@@ -152,7 +152,7 @@ static int lcdon_post(void *data)
 {
        int ret;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                SIGNAL_CHANGE_STATE,
@@ -226,7 +226,7 @@ static int lcdoff_post(void *data)
        int ret;
 
        /* broadcast to other application */
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                SIGNAL_CHANGE_STATE,
@@ -306,7 +306,7 @@ static int standby_post(void *data)
        int ret;
 
        /* broadcast to other application */
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                SIGNAL_CHANGE_STATE,
@@ -408,7 +408,7 @@ static int suspend_post(void *data)
                _E("Fail to change state to next_state(%s)", state_st(cond)->name);
 
        /* Broadcast pre-wakeup signal */
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_POWER,
                                                DEVICED_INTERFACE_POWER,
                                                SIGNAL_PRE_WAKEUP,
index ebb2c6b..b1f17a7 100644 (file)
@@ -290,7 +290,7 @@ static int display_brightness_changed(void *data)
 
        brt = DATA_VALUE_INT(data);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        "Brightness",
@@ -1297,7 +1297,7 @@ static void proc_condition_lock(PMMsg *data)
 
                if (lock_type) {
                        /* power lock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerLock",
@@ -1351,7 +1351,7 @@ static void proc_condition_unlock(PMMsg *data)
 
                if (lock_type) {
                        /* power unlock signal */
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "PowerUnlock",
@@ -2383,7 +2383,7 @@ static void sec_dsim_uevent_changed(struct udev_device *dev)
        if (!fnmatch(SEC_DSIM_PATH, devpath, 0)) {
                action = udev_device_get_action(dev);
                if (!strcmp(action, UDEV_CHANGE)) {
-                       ret = dbus_handle_emit_dbus_signal(NULL,
+                       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        DISPLAY_DETACH_STR,
index 0b0c784..d4d9441 100644 (file)
@@ -196,7 +196,7 @@ static void display_handler_init(void *data)
        register_notifier(DEVICE_NOTIFIER_LCD, display_state_changed);
 
        aod_clock_displayed = false;
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                DEVICED_OBJECT_PATH,
                                DEVICED_INTERFACE_NAME,
                                SIGNAL_HOMESCREEN,
@@ -209,7 +209,7 @@ static void display_handler_init(void *data)
        if (ret < 0)
                _E("Can't write %s node.", CHARGER_LCD_NODE);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
        if (ret < 0)
                _E("Failed to register dbus object.");
 }
index d4e0495..24c34a7 100644 (file)
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 #include <vconf.h>
 #include <hal/device/hal-display.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "display/core.h"
 #include "display/display-ops.h"
@@ -140,7 +140,7 @@ static void enhance_init(void *data)
 
        state = enhance_update_state();
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        "Enhance",
index 376a662..d9d1be2 100644 (file)
@@ -51,7 +51,7 @@ static char *hbm_path;
 
 static void broadcast_hbm_state(char *state)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        state,
@@ -400,7 +400,7 @@ static void hbm_init(void *data)
                _I("HBM node: %s.", hbm_path);
        }
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
        if (ret < 0)
                _E("Failed to register dbus object.");
 
index 17ee67e..ac438cd 100644 (file)
@@ -24,7 +24,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <sys/types.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <linux/input.h>
 
 #include "ambient-mode.h"
@@ -174,7 +174,7 @@ static inline void check_key_pair(int code, int new, int *old)
 
 static inline void broadcast_lcdon_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDON_BY_POWERKEY,
@@ -183,7 +183,7 @@ static inline void broadcast_lcdon_by_powerkey(void)
 
 static inline void broadcast_lcdoff_by_powerkey(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        SIGNAL_LCDOFF_BY_POWERKEY,
index bb495a1..7e34b36 100644 (file)
@@ -61,7 +61,7 @@ static void broadcast_lbm_state(int state)
        else
                str = SIGNAL_LBM_OFF;
 
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        str,
@@ -329,7 +329,7 @@ static void lbm_init(void *data)
 
        vconf_notify_key_changed(VCONFKEY_SETAPPL_ACCESSIBILITY_AUTOMATIC_LOW_BRIGHTNESS, lbm_mode_changed, NULL);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method, %d.", ret);
 
index eab5f88..6c510f0 100644 (file)
@@ -25,7 +25,7 @@
 #include "display/display-ops.h"
 #include "shared/plugin.h"
 
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #define DBUS_COREAPPS_SWIMMODE_PATH            "/Org/Tizen/Coreapps/home/swimmode"
 #define DBUS_COREAPPS_SWIMMODE_INTERFACE       "org.tizen.coreapps.home.swimmode"
@@ -83,7 +83,7 @@ static void swimmode_signal_handler(GDBusConnection  *conn,
                return;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Sender(%d) does not exist.", pid);
                return;
@@ -119,7 +119,7 @@ static void swim_init(void *data)
 
        touchscreen_ops = find_device("touchscreen");
 
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                DBUS_COREAPPS_SWIMMODE_PATH,
                                DBUS_COREAPPS_SWIMMODE_INTERFACE,
                                DBUS_SWIMMODE_MEMBER_STATUS,
index 49ee2f5..6c33fad 100644 (file)
@@ -90,7 +90,7 @@ int launch_system_app(char *type, int num, ...)
 
        va_start(args, num);
 
-       ret = dbus_handle_method_async_pairs_with_reply(app_match[match].bus,
+       ret = gdbus_call_pairs_async_with_reply(app_match[match].bus,
                app_match[match].path,
                app_match[match].iface,
                app_match[match].method,
@@ -115,7 +115,7 @@ int launch_message_post(char *type)
        if (!type)
                return -EINVAL;
 
-       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                        POPUP_PATH_NOTI,
                        POPUP_INTERFACE_NOTI,
                        "MessagePostOn",
@@ -134,7 +134,7 @@ int add_async_notification(char *type, dbus_pending_cb func, GVariant *param)
        if (!type)
                return -EINVAL;
 
-       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                        POPUP_PATH_NOTI,
                        POPUP_INTERFACE_NOTI,
                        type,
@@ -151,7 +151,7 @@ int remove_notification(char *type, int id)
        if (!type || id < 0)
                return -EINVAL;
 
-       return dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+       return gdbus_call_async_with_reply(POPUP_BUS_NAME,
                        POPUP_PATH_NOTI,
                        POPUP_INTERFACE_NOTI,
                        type, g_variant_new("(i)", id),
index c6d7070..7ae83e3 100644 (file)
@@ -20,7 +20,7 @@
 #define __APPS_H__
 
 #include <string.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include "core/common.h"
 #include "display/poll.h"
 #include "display/display-ops.h"
index cf8c138..10c44e0 100644 (file)
@@ -226,7 +226,7 @@ static bool get_battery_method(const char *method, int *value)
        char* health = NULL;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        method, NULL, &reply);
@@ -268,7 +268,7 @@ static bool get_battery_method_vconf(const char *method)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        method, NULL, &reply);
@@ -315,7 +315,7 @@ static bool set_battery_low_level(int newlevel)
        int ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        METHOD_BATTERY_SETLOWBATLEVEL, g_variant_new("(i)", newlevel),
@@ -404,7 +404,7 @@ static bool get_battery_info()
        bool ret = FALSE;
        char *reply_argv[3];
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        METHOD_BATTERY_GETINFO, NULL, &reply);
@@ -703,7 +703,7 @@ static bool set_battery_power_supply(int index)
                                power_supply_types[index].current_avg,
                                power_supply_types[index].temperature);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_BATTERY,
                                                DEVICED_INTERFACE_BATTERY,
                                                POWER_SUBSYSTEM, var, &reply);
@@ -736,7 +736,7 @@ static bool get_battery_power_supply(int out_rsp[], char **out_power_source)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_BATTERY,
                        DEVICED_INTERFACE_BATTERY,
                        METHOD_BATTERY_GET_POWERSUPPLY, NULL, &reply);
index 28e559d..1acc89c 100644 (file)
@@ -24,7 +24,7 @@ static int success, fail;
 
 static void start_udev(void)
 {
-       dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_SYSNOTI,
                        DEVICED_INTERFACE_SYSNOTI,
                        "udev",
@@ -34,7 +34,7 @@ static void start_udev(void)
 
 static void stop_udev(void)
 {
-       dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_SYSNOTI,
                        DEVICED_INTERFACE_SYSNOTI,
                        "udev",
@@ -45,7 +45,7 @@ static void stop_udev(void)
 static int call_display_method_sync(const char *method, GVariant *param)
 {
        int ret_dbus;
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        method, param, NULL);
@@ -66,7 +66,7 @@ static void check_result(int expect_default, int expect_current)
        bool match_current;
        GVariant *reply;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        "GetBrightnessInfo", NULL, &reply);
index 9a9c5d4..d2b3e85 100644 (file)
@@ -60,7 +60,7 @@ static bool get_display_method(const char *method, GVariant *param, int *out_val
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        method, param, &reply);
@@ -87,7 +87,7 @@ static bool set_display_method(const char *method, GVariant *param)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        method, param, &reply);
@@ -119,7 +119,7 @@ static bool set_display_method_noreply(const char *method, GVariant *var)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        method, var, &reply);
@@ -158,7 +158,7 @@ static bool set_display_autobrightness_min(int min)
        int reply_val = 0, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                METHOD_DISPLAY_SETAUTOBRIGHTNESSMIN,
@@ -309,7 +309,7 @@ static bool set_display_locktimeout_expired(char *req_id)
        char *ret_req_id;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
                        METHOD_DISPLAY_LOCKTIMEOUT_EXPIRED, g_variant_new("(s)", req_id),
index bf8efa9..d1ad091 100644 (file)
@@ -30,7 +30,7 @@ static bool request_extcon_method(const char *method, GVariant *param)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_EXTCON,
                                                DEVICED_INTERFACE_EXTCON,
                                                method,
@@ -65,7 +65,7 @@ static bool get_sysnoti_method(const char *method)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        DEVICED_PATH_SYSNOTI,
                                        DEVICED_INTERFACE_SYSNOTI,
                                        method, NULL, &reply);
@@ -98,7 +98,7 @@ static bool get_extcon_status(char *device_name)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_EXTCON,
                                                DEVICED_INTERFACE_EXTCON,
                                                METHOD_EXTCON_GETSTATUS,
index 87d11e0..665d75f 100644 (file)
@@ -34,7 +34,7 @@ static bool request_ir_method(const char *method, const char *sig, int *param)
        GVariant *var = NULL;
 
        if (sig && g_variant_type_is_array(G_VARIANT_TYPE(sig))) {
-               var = dbus_handle_make_simple_array(sig, param);
+               var = gdbus_make_simple_array(sig, param);
        } else if (!sig && !param) {
                var = NULL;
        } else {
@@ -42,7 +42,7 @@ static bool request_ir_method(const char *method, const char *sig, int *param)
                return FALSE;
        }
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_IR,
                                                DEVICED_INTERFACE_IR,
                                                method,
@@ -97,7 +97,7 @@ static bool set_ir_command(char *command)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                METHOD_IR_SETIRCOMMAND,
index 8a4deae..1e31aa9 100755 (executable)
@@ -43,7 +43,7 @@ static bool get_led_method(const char *method)
        int val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        method, NULL, &msg);
@@ -69,7 +69,7 @@ static bool set_led_method(const char *method, GVariant *param)
        int val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                method, param, &msg);
index ae4d96a..09c7dd2 100644 (file)
@@ -26,7 +26,7 @@ static bool set_reboot_method(const char *method, GVariant *param)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                method,
index 39dad46..b76dbb4 100644 (file)
@@ -26,7 +26,7 @@ static bool get_sysnoti_revision()
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        DEVICED_PATH_SYSNOTI,
                                        DEVICED_INTERFACE_SYSNOTI,
                                        METHOD_SYSNOTI_GETREVISION, NULL, &reply);
index 33e221c..17056da 100644 (file)
@@ -23,7 +23,7 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <sys/stat.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 #include <device-error.h>
 #include <device/booting-internal.h>
index ffa4e34..92d7404 100644 (file)
@@ -40,7 +40,7 @@ gint test_deviced_Tzip_IsMounted(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "IsMounted",
@@ -65,7 +65,7 @@ gint test_deviced_Tzip_UnmountSync(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "UnmountSync",
@@ -90,7 +90,7 @@ gint test_deviced_Tzip_MountSync(const gchar *param1, const gchar *param2, const
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "MountSync",
@@ -115,7 +115,7 @@ gint test_deviced_Tzip_Unmount(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "Unmount",
@@ -140,7 +140,7 @@ gint test_deviced_Tzip_Mount(const gchar *param1, const gchar *param2, const gch
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Tzip",
                        "org.tizen.system.deviced.Tzip",
                        "Mount",
@@ -168,7 +168,7 @@ gint test_deviced_ExtCon_disable(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "disable",
@@ -193,7 +193,7 @@ gint test_deviced_ExtCon_enable(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "enable",
@@ -218,7 +218,7 @@ gint test_deviced_ExtCon_GetStatus(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/ExtCon",
                        "org.tizen.system.deviced.ExtCon",
                        "GetStatus",
@@ -244,7 +244,7 @@ void test_deviced_UsbHostTest_stop(void)
 {
        int ret_dbus;
        GVariant *reply;
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/UsbHostTest",
                        "org.tizen.system.deviced.UsbHostTest",
                        "stop",
@@ -263,7 +263,7 @@ void test_deviced_UsbHostTest_start(void)
 {
        int ret_dbus;
        GVariant *reply;
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/UsbHostTest",
                        "org.tizen.system.deviced.UsbHostTest",
                        "start",
@@ -287,7 +287,7 @@ gint test_deviced_lowpower_GetState(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "GetState",
@@ -312,7 +312,7 @@ gint test_deviced_lowpower_Stop(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "Stop",
@@ -337,7 +337,7 @@ gint test_deviced_lowpower_Start(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/LowPower",
                        "org.tizen.system.deviced.lowpower",
                        "Start",
@@ -365,7 +365,7 @@ gint test_deviced_ir_TransmitIR(gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Ir",
                        "org.tizen.system.deviced.ir",
                        "TransmitIR",
@@ -390,7 +390,7 @@ gint test_deviced_ir_IRIsAvailable(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Ir",
                        "org.tizen.system.deviced.ir",
                        "IRIsAvailable",
@@ -418,7 +418,7 @@ gint test_deviced_PowerOff_RemovePowerOffWait(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "RemovePowerOffWait",
@@ -443,7 +443,7 @@ gint test_deviced_PowerOff_AddPowerOffWait(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "AddPowerOffWait",
@@ -468,7 +468,7 @@ gint test_deviced_PowerOff_PowerOffWithOption(const gchar *param1, const gchar *
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "PowerOffWithOption",
@@ -493,7 +493,7 @@ gint test_deviced_PowerOff_PowerOff(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PowerOff",
                        "org.tizen.system.deviced.PowerOff",
                        "PowerOff",
@@ -521,7 +521,7 @@ gint test_deviced_Battery_MiscEvent(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "MiscEvent",
@@ -544,7 +544,7 @@ GVariant * test_deviced_Battery_BatteryProperties(void)
 {
        GVariant *reply;
        int ret_dbus;
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "BatteryProperties",
@@ -562,7 +562,7 @@ gint test_deviced_Battery_ChargerCharging(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerCharging",
@@ -587,7 +587,7 @@ gint test_deviced_Battery_ChargerType(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerType",
@@ -611,7 +611,7 @@ GVariant * test_deviced_Battery_GetBatteryInfo(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetBatteryInfo",
@@ -630,7 +630,7 @@ gint test_deviced_Battery_power_supply(const gchar *param1, gint param2, const g
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "power_supply",
@@ -655,7 +655,7 @@ gchar * test_deviced_Battery_GetHealth(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetHealth",
@@ -680,7 +680,7 @@ gint test_deviced_Battery_IsFull(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "IsFull",
@@ -705,7 +705,7 @@ gint test_deviced_Battery_GetPercentRaw(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetPercentRaw",
@@ -730,7 +730,7 @@ gint test_deviced_Battery_GetPercent(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetPercent",
@@ -755,7 +755,7 @@ gint test_deviced_Battery_BatteryStatusLow(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "BatteryStatusLow",
@@ -780,7 +780,7 @@ gint test_deviced_Battery_ChargeNow(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargeNow",
@@ -805,7 +805,7 @@ gint test_deviced_Battery_ChargerStatus(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "ChargerStatus",
@@ -830,7 +830,7 @@ gint test_deviced_Battery_GetLowbatLevel(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "GetLowbatLevel",
@@ -855,7 +855,7 @@ gint test_deviced_Battery_SetLowbatLevel(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "SetLowbatLevel",
@@ -880,7 +880,7 @@ gint test_deviced_Battery_TimeToEmpty(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "TimeToEmpty",
@@ -905,7 +905,7 @@ gint test_deviced_Battery_TimeToFull(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Battery",
                        "org.tizen.system.deviced.Battery",
                        "TimeToFull",
@@ -933,7 +933,7 @@ gint test_deviced_temperature_GetTemperature(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Temperature",
                        "org.tizen.system.deviced.temperature",
                        "GetTemperature",
@@ -960,7 +960,7 @@ GVariant * test_deviced_BatteryMonitor_GetBMData(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/BatteryMonitor",
                        "org.tizen.system.deviced.BatteryMonitor",
                        "GetBMData",
@@ -981,7 +981,7 @@ void test_deviced_core_DeviceList(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Core",
                        "org.tizen.system.deviced.core",
                        "DeviceList",
@@ -1003,7 +1003,7 @@ GVariant * test_deviced_Usbhost_OpenDevice(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "OpenDevice",
@@ -1022,7 +1022,7 @@ gint test_deviced_Usbhost_GetDeviceListCount(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "GetDeviceListCount",
@@ -1046,7 +1046,7 @@ GVariant * test_deviced_Usbhost_GetDeviceList(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "GetDeviceList",
@@ -1064,7 +1064,7 @@ void test_deviced_Usbhost_PrintPolicy(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "PrintPolicy",
@@ -1084,7 +1084,7 @@ void test_deviced_Usbhost_PrintDeviceList(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usbhost",
                        "org.tizen.system.deviced.Usbhost",
                        "PrintDeviceList",
@@ -1108,7 +1108,7 @@ guint test_deviced_Usb_GetMode(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usb",
                        "org.tizen.system.deviced.Usb",
                        "GetMode",
@@ -1133,7 +1133,7 @@ guint test_deviced_Usb_GetState(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Usb",
                        "org.tizen.system.deviced.Usb",
                        "GetState",
@@ -1161,7 +1161,7 @@ gint test_deviced_SysNoti_GetHDMI(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetHDMI",
@@ -1186,7 +1186,7 @@ gint test_deviced_SysNoti_GetCradle(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetCradle",
@@ -1211,7 +1211,7 @@ gint test_deviced_SysNoti_set_timezone(const gchar *param1, gint param2, const g
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "set_timezone",
@@ -1236,7 +1236,7 @@ gint test_deviced_SysNoti_set_datetime(const gchar *param1, gint param2, const g
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "set_datetime",
@@ -1261,7 +1261,7 @@ gint test_deviced_SysNoti_GetRevision(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "GetRevision",
@@ -1286,7 +1286,7 @@ gint test_deviced_SysNoti_udev(const gchar *param1, gint param2, const gchar *pa
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "udev",
@@ -1311,7 +1311,7 @@ gint test_deviced_SysNoti_EventStop(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "EventStop",
@@ -1336,7 +1336,7 @@ gint test_deviced_SysNoti_EventStart(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "EventStart",
@@ -1361,7 +1361,7 @@ gint test_deviced_SysNoti_getcontrol(const gchar *param1, gint param2, const gch
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "getcontrol",
@@ -1386,7 +1386,7 @@ gint test_deviced_SysNoti_control(const gchar *param1, gint param2, const gchar
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/SysNoti",
                        "org.tizen.system.deviced.SysNoti",
                        "control",
@@ -1414,7 +1414,7 @@ gint test_deviced_Led_SetIrCommand(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "SetIrCommand",
@@ -1439,7 +1439,7 @@ gint test_deviced_Led_SetBrightness(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "SetBrightness",
@@ -1464,7 +1464,7 @@ gint test_deviced_Led_GetMaxBrightness(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetMaxBrightness",
@@ -1489,7 +1489,7 @@ gint test_deviced_Led_GetBrightness(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetBrightness",
@@ -1514,7 +1514,7 @@ gint test_deviced_Led_GetBrightnessForCamera(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Led",
                        "org.tizen.system.deviced.Led",
                        "GetBrightnessForCamera",
@@ -1542,7 +1542,7 @@ gint test_deviced_display_LockTimeoutInput(const gchar *param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockTimeoutInput",
@@ -1567,7 +1567,7 @@ gint test_deviced_display_LockTimeoutExpired(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockTimeoutExpired",
@@ -1592,7 +1592,7 @@ gint test_deviced_display_CurrentBrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CurrentBrightness",
@@ -1617,7 +1617,7 @@ gint test_deviced_display_CustomBrightness(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomBrightness",
@@ -1642,7 +1642,7 @@ gint test_deviced_display_ActorControl(const gchar *param1, gint param2, gint pa
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ActorControl",
@@ -1667,7 +1667,7 @@ gint test_deviced_display_LCDPanelOffMode(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LCDPanelOffMode",
@@ -1692,7 +1692,7 @@ gint test_deviced_display_StayTouchScreenOff(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "StayTouchScreenOff",
@@ -1717,7 +1717,7 @@ gint test_deviced_display_PlatformLCDControl(gint param1, const gchar *param2, g
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PlatformLCDControl",
@@ -1742,7 +1742,7 @@ gint test_deviced_display_CustomLCDOff(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomLCDOff",
@@ -1767,7 +1767,7 @@ gint test_deviced_display_CustomLCDOn(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "CustomLCDOn",
@@ -1792,7 +1792,7 @@ gint test_deviced_display_PowerKeyLCDOff(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PowerKeyLCDOff",
@@ -1817,7 +1817,7 @@ gint test_deviced_display_PowerKeyIgnore(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "PowerKeyIgnore",
@@ -1841,7 +1841,7 @@ void test_deviced_display_SaveLog(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SaveLog",
@@ -1862,7 +1862,7 @@ gint test_deviced_display_Dumpmode(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "Dumpmode",
@@ -1887,7 +1887,7 @@ gint test_deviced_display_SetRefreshRate(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetRefreshRate",
@@ -1912,7 +1912,7 @@ gint test_deviced_display_ReleaseBrightness(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ReleaseBrightness",
@@ -1937,7 +1937,7 @@ gint test_deviced_display_HoldBrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "HoldBrightness",
@@ -1962,7 +1962,7 @@ gint test_deviced_display_SetBrightness(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetBrightness",
@@ -1987,7 +1987,7 @@ gint test_deviced_display_GetBrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetBrightness",
@@ -2012,7 +2012,7 @@ gint test_deviced_display_SetMaxBrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "SetMaxBrightness",
@@ -2037,7 +2037,7 @@ gint test_deviced_display_GetMaxBrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetMaxBrightness",
@@ -2062,7 +2062,7 @@ gint test_deviced_display_GetDisplayCount(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "GetDisplayCount",
@@ -2087,7 +2087,7 @@ gint test_deviced_display_LockScreenBgOn(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "LockScreenBgOn",
@@ -2112,7 +2112,7 @@ gint test_deviced_display_setlcdtimeout(gint param1, gint param2, gint param3)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setlcdtimeout",
@@ -2137,7 +2137,7 @@ gint test_deviced_display_setautobrightnessmin(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setautobrightnessmin",
@@ -2162,7 +2162,7 @@ gint test_deviced_display_setframerate(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setframerate",
@@ -2187,7 +2187,7 @@ gint test_deviced_display_setbrightness(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "setbrightness",
@@ -2212,7 +2212,7 @@ gint test_deviced_display_getbrightness(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "getbrightness",
@@ -2237,7 +2237,7 @@ gint test_deviced_display_ChangeState(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "ChangeState",
@@ -2262,7 +2262,7 @@ gint test_deviced_display_changestate(const gchar *param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "changestate",
@@ -2287,7 +2287,7 @@ gint test_deviced_display_unlockstate(const gchar *param1, const gchar *param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "unlockstate",
@@ -2312,7 +2312,7 @@ gint test_deviced_display_lockstate(const gchar *param1, const gchar *param2, co
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "lockstate",
@@ -2336,7 +2336,7 @@ void test_deviced_display_stop(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "stop",
@@ -2356,7 +2356,7 @@ void test_deviced_display_start(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Display",
                        "org.tizen.system.deviced.display",
                        "start",
@@ -2378,7 +2378,7 @@ GVariant * test_deviced_Board_GetNum(void)
 {
        GVariant *reply;
        int ret_dbus;
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetNum",
@@ -2397,7 +2397,7 @@ gint test_deviced_Board_GetHWRev(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetHWRev",
@@ -2420,7 +2420,7 @@ GVariant * test_deviced_Board_GetSerial(void)
 {
        GVariant *reply;
        int ret_dbus;
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/Board",
                        "org.tizen.system.deviced.Board",
                        "GetSerial",
@@ -2442,7 +2442,7 @@ gint test_deviced_PmQos_MyfilesScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MyfilesScroll",
@@ -2467,7 +2467,7 @@ gint test_deviced_PmQos_CallLogScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CallLogScroll",
@@ -2492,7 +2492,7 @@ gint test_deviced_PmQos_TizenStoreScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "TizenStoreScroll",
@@ -2517,7 +2517,7 @@ gint test_deviced_PmQos_ContactScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ContactScroll",
@@ -2542,7 +2542,7 @@ gint test_deviced_PmQos_EmailScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "EmailScroll",
@@ -2567,7 +2567,7 @@ gint test_deviced_PmQos_VideoScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "VideoScroll",
@@ -2592,7 +2592,7 @@ gint test_deviced_PmQos_FileScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "FileScroll",
@@ -2617,7 +2617,7 @@ gint test_deviced_PmQos_MusicScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MusicScroll",
@@ -2642,7 +2642,7 @@ gint test_deviced_PmQos_UgLaunch(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "UgLaunch",
@@ -2667,7 +2667,7 @@ gint test_deviced_PmQos_SensorWakeup(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SensorWakeup",
@@ -2692,7 +2692,7 @@ gint test_deviced_PmQos_WebAppFlick(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebAppFlick",
@@ -2717,7 +2717,7 @@ gint test_deviced_PmQos_WebAppDrag(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebAppDrag",
@@ -2742,7 +2742,7 @@ gint test_deviced_PmQos_PowerOff(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "PowerOff",
@@ -2767,7 +2767,7 @@ gint test_deviced_PmQos_WifiThroughput(gint param1, gint param2)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WifiThroughput",
@@ -2792,7 +2792,7 @@ gint test_deviced_PmQos_WebappLaunch(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "WebappLaunch",
@@ -2817,7 +2817,7 @@ gint test_deviced_PmQos_SVoice(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SVoice",
@@ -2842,7 +2842,7 @@ gint test_deviced_PmQos_SmemoZoom(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "SmemoZoom",
@@ -2867,7 +2867,7 @@ gint test_deviced_PmQos_ScreenMirroring(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ScreenMirroring",
@@ -2892,7 +2892,7 @@ gint test_deviced_PmQos_ReservedMode(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ReservedMode",
@@ -2917,7 +2917,7 @@ gint test_deviced_PmQos_ProcessCrashed(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ProcessCrashed",
@@ -2942,7 +2942,7 @@ gint test_deviced_PmQos_PowerSaving(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "PowerSaving",
@@ -2967,7 +2967,7 @@ gint test_deviced_PmQos_MusicPlayLcdOn(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MusicPlayLcdOn",
@@ -2992,7 +2992,7 @@ gint test_deviced_PmQos_MtpSendFile(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "MtpSendFile",
@@ -3017,7 +3017,7 @@ gint test_deviced_PmQos_LowBattery(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "LowBattery",
@@ -3042,7 +3042,7 @@ gint test_deviced_PmQos_LockScreen(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "LockScreen",
@@ -3067,7 +3067,7 @@ gint test_deviced_PmQos_IMEInput(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "IMEInput",
@@ -3092,7 +3092,7 @@ gint test_deviced_PmQos_ImageViewer(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ImageViewer",
@@ -3117,7 +3117,7 @@ gint test_deviced_PmQos_HomeScreen(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "HomeScreen",
@@ -3142,7 +3142,7 @@ gint test_deviced_PmQos_GpuWakeup(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpuWakeup",
@@ -3167,7 +3167,7 @@ gint test_deviced_PmQos_GpuBoost(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpuBoost",
@@ -3192,7 +3192,7 @@ gint test_deviced_PmQos_GpsSerialCno(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GpsSerialCno",
@@ -3217,7 +3217,7 @@ gint test_deviced_PmQos_GetDefaultLockTime(void)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GetDefaultLockTime",
@@ -3242,7 +3242,7 @@ gint test_deviced_PmQos_GalleryRotation(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GalleryRotation",
@@ -3267,7 +3267,7 @@ gint test_deviced_PmQos_GalleryScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "GalleryScroll",
@@ -3292,7 +3292,7 @@ gint test_deviced_PmQos_Emergency(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "Emergency",
@@ -3317,7 +3317,7 @@ gint test_deviced_PmQos_ContactSearch(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "ContactSearch",
@@ -3342,7 +3342,7 @@ gint test_deviced_PmQos_CameraSoundAndShot(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraSoundAndShot",
@@ -3367,7 +3367,7 @@ gint test_deviced_PmQos_CameraRecording(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraRecording",
@@ -3392,7 +3392,7 @@ gint test_deviced_PmQos_CameraPreview(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraPreview",
@@ -3417,7 +3417,7 @@ gint test_deviced_PmQos_CameraCaptureAtRec(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraCaptureAtRec",
@@ -3442,7 +3442,7 @@ gint test_deviced_PmQos_CameraBurstShot(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CameraBurstShot",
@@ -3467,7 +3467,7 @@ gint test_deviced_PmQos_CallSound(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "CallSound",
@@ -3492,7 +3492,7 @@ gint test_deviced_PmQos_BrowserScroll(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserScroll",
@@ -3517,7 +3517,7 @@ gint test_deviced_PmQos_BrowserLoading(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserLoading",
@@ -3542,7 +3542,7 @@ gint test_deviced_PmQos_BrowserJavaScript(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserJavaScript",
@@ -3567,7 +3567,7 @@ gint test_deviced_PmQos_BrowserDash(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BrowserDash",
@@ -3592,7 +3592,7 @@ gint test_deviced_PmQos_Browser(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "Browser",
@@ -3617,7 +3617,7 @@ gint test_deviced_PmQos_BeautyShot(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "BeautyShot",
@@ -3642,7 +3642,7 @@ gint test_deviced_PmQos_AppLaunchHome(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "AppLaunchHome",
@@ -3667,7 +3667,7 @@ gint test_deviced_PmQos_AppLaunch(gint param1)
        GVariant *reply;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var("org.tizen.system.deviced",
+       ret_dbus = gdbus_call_sync_with_reply("org.tizen.system.deviced",
                        "/Org/Tizen/System/DeviceD/PmQos",
                        "org.tizen.system.deviced.PmQos",
                        "AppLaunch",
@@ -3682,4 +3682,4 @@ gint test_deviced_PmQos_AppLaunch(gint param1)
        g_variant_unref(reply);
 
        return val1;
-}
\ No newline at end of file
+}
index 28332cc..fdab751 100644 (file)
@@ -20,7 +20,7 @@
 #ifndef __TEST_DBUS_INTERFACE_H__
 #define __TEST_DBUS_INTERFACE_H__
 
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 // headers
 gint test_deviced_Tzip_IsMounted(const gchar *param1);
index 5313995..7078aa1 100755 (executable)
@@ -26,7 +26,7 @@ static bool request_sysnoti_method(const char *method, GVariant *param)
        int reply_val, ret_dbus;
        bool ret = FALSE;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                method,
index 06d047c..2a341fb 100644 (file)
@@ -30,7 +30,7 @@ static int udev(int index)
        GVariant *reply;
        int ret = 0, reply_val = 0, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_SYSNOTI,
                        DEVICED_INTERFACE_SYSNOTI,
                        "udev",
index f6168dc..3e693fd 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <sys/time.h>
 #include <unistd.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "battery-monitor.h"
 
@@ -530,11 +530,11 @@ static void bm_init(void *data)
        if (!ht_apptime)
                _E("Failed to init hash table");
 
-       ret = dbus_handle_add_dbus_object(NULL, DBUS_DEVICED_BM_PATH, &bm_dbus_interface);
+       ret = gdbus_add_object(NULL, DBUS_DEVICED_BM_PATH, &bm_dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
-       dbus_sub_id = subscribe_dbus_signal(NULL,
+       dbus_sub_id = gdbus_signal_subscribe(NULL,
                                "/Org/Tizen/Aul/AppStatus",
                                "org.tizen.aul.AppStatus",
                                "AppStatusChange",
@@ -548,12 +548,12 @@ static void bm_exit(void *data)
 {
        int ret;
 
-       ret = dbus_handle_unregister_dbus_object(NULL, DBUS_DEVICED_BM_PATH);
+       ret = gdbus_unregister_object(NULL, DBUS_DEVICED_BM_PATH);
        if (ret < 0)
                _E("Failed to unregister dbus object: %d", ret);
 
        if (dbus_sub_id > 0)
-               unsubscribe_dbus_signal(NULL, dbus_sub_id);
+               gdbus_signal_unsubscribe(NULL, dbus_sub_id);
        dbus_sub_id = 0;
 
        bm_data_init();
index dc30a69..b9be61b 100644 (file)
@@ -23,7 +23,7 @@
 #include <errno.h>
 #include "core/common.h"
 #include "power-supply.h"
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 struct battery_ops {
        char *name;
index 7e12b30..74718c0 100644 (file)
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <vconf.h>
 #include <hal/device/hal-battery.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/common.h"
 #include "core/devices.h"
@@ -226,7 +226,7 @@ static void broadcast_battery_time(char *signal, int time)
        if (!signal)
                return;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_BATTERY,
                                                DEVICED_INTERFACE_BATTERY,
                                                signal,
@@ -417,7 +417,7 @@ static void battery_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 3e280bc..783499d 100644 (file)
@@ -25,7 +25,7 @@
 #include <bundle.h>
 #include <eventsystem.h>
 #include <hal/device/hal-battery.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "lowbat-handler.h"
@@ -714,7 +714,7 @@ static void lowbat_init(void *data)
        register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
        register_notifier(DEVICE_NOTIFIER_POWER_SUPPLY, lowbat_monitor_init);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index edb8e7b..f42b8aa 100644 (file)
@@ -144,7 +144,7 @@ static int power_supply_broadcast_str(char *sig, char *status)
 
        str = status;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_BATTERY,
                                                DEVICED_INTERFACE_BATTERY,
                                                sig,
@@ -168,7 +168,7 @@ static void pm_check_and_change(int bInserted)
 
 static void health_status_broadcast(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                DEVICED_PATH_BATTERY,
                DEVICED_INTERFACE_BATTERY,
                SIGNAL_TEMP_GOOD,
@@ -224,7 +224,7 @@ static int send_full_noti(enum charge_full_type state)
        switch (state) {
        case CHARGING_FULL:
                for (retry = RETRY_MAX; retry > 0; retry--) {
-                       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                                        POPUP_PATH_NOTI,
                                        POPUP_INTERFACE_NOTI,
                                        METHOD_FULL_NOTI_ON,
@@ -240,7 +240,7 @@ static int send_full_noti(enum charge_full_type state)
                if (noti_id <= 0)
                        return -EPERM;
                for (retry = RETRY_MAX; retry > 0; retry--) {
-                       ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+                       ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                                        POPUP_PATH_NOTI,
                                        POPUP_INTERFACE_NOTI,
                                        METHOD_FULL_NOTI_OFF,
@@ -282,7 +282,7 @@ static int send_charge_noti(void)
        int retry;
 
        for (retry = RETRY_MAX; retry > 0; retry--) {
-               ret = dbus_handle_method_async_with_reply_var(POPUP_BUS_NAME,
+               ret = gdbus_call_async_with_reply(POPUP_BUS_NAME,
                                POPUP_PATH_NOTI,
                                POPUP_INTERFACE_NOTI,
                                METHOD_CHARGE_NOTI_ON,
@@ -353,7 +353,7 @@ int power_supply_broadcast(char *sig, int status)
 
        snprintf(sig_old, sizeof(sig_old), "%s", sig);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_BATTERY,
                                                DEVICED_INTERFACE_BATTERY,
                                                sig,
@@ -1277,7 +1277,7 @@ static GVariant *dbus_power_supply_handler(GDBusConnection *conn,
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Process(%d) does not exist, dbus ignored.", pid);
                ret = -ESRCH;
@@ -1696,7 +1696,7 @@ static void power_supply_init(void *data)
        register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
        register_notifier(DEVICE_NOTIFIER_EVENT_HANDLER, event_handler_state_changed);
 
-       ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
+       ret_dbus = gdbus_add_object(NULL, DEVICED_PATH_BATTERY, &dbus_interface);
        if (ret_dbus < 0)
                _E("Failed to init dbus method: %d", ret_dbus);
 
index e8d2218..eb2710d 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/devices.h"
@@ -162,7 +162,7 @@ static void board_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_BOARD, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_BOARD, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index 87f5801..66d564a 100644 (file)
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <sys/types.h>
 #include <dd-control.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/common.h"
@@ -130,7 +130,7 @@ static GVariant *dbus_control_handler(GDBusConnection *conn,
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Process(%d) does not exist. Dbus ignored.", pid);
                ret = -ESRCH;
@@ -161,7 +161,7 @@ static GVariant *dbus_get_control_handler(GDBusConnection *conn,
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Process(%d) does not exist. Dbus ignored.", pid);
                ret = -ESRCH;
@@ -192,7 +192,7 @@ static void control_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index f606525..6b7ddc7 100644 (file)
@@ -21,7 +21,7 @@
 #include "device-notifier.h"
 #include "common.h"
 #include "core/devices.h"
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 struct device_notifier {
index da86123..f12e557 100644 (file)
@@ -18,7 +18,7 @@
 
 
 #include <stdio.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "log.h"
 #include "common.h"
@@ -126,12 +126,12 @@ void devices_init(void *data)
                        dev->init(data);
        }
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_CORE, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_CORE, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
        /* register every objects */
-       if (dbus_handle_register_dbus_object_all(NULL) < 0)
+       if (gdbus_register_object_all(NULL) < 0)
                _E("Failed to register dbus method: %d", ret);
 }
 
index e5ecec4..7629d59 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "common.h"
 #include "devices.h"
@@ -91,7 +91,7 @@ static void event_handler_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &eh_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &eh_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 0201395..3c957e4 100644 (file)
@@ -22,8 +22,8 @@
 #include <sys/reboot.h>
 #include <systemd/sd-daemon.h>
 #include <glib.h>
-#include <libsyscommon/dbus-system.h>
-#include <libsyscommon/systemd-state.h>
+#include <libsyscommon/libgdbus.h>
+#include <libsyscommon/libsystemd.h>
 #include <device/booting-internal.h>
 #include <argos.h>
 
@@ -111,7 +111,7 @@ static int deviced_main(int argc, char **argv)
                return 0;
        }
 
-       handle = dbus_handle_get_connection(G_BUS_TYPE_SYSTEM, FALSE);
+       handle = gdbus_get_connection(G_BUS_TYPE_SYSTEM, FALSE);
        if (!handle)
                _E("Failed to get dbus connection.");
 
@@ -121,10 +121,10 @@ static int deviced_main(int argc, char **argv)
 
        devices_init(NULL);
 
-       ret = dbus_handle_request_bus_name(handle, DEVICED_BUS_NAME, deviced_dbus_name_acquired, NULL);
+       ret = gdbus_request_name(handle, DEVICED_BUS_NAME, deviced_dbus_name_acquired, NULL);
        if (ret <= 0) {
                _E("Failed to request bus name.");
-               dbus_handle_check_owner_name(NULL, DEVICED_BUS_NAME);
+               gdbus_check_name_owner(NULL, DEVICED_BUS_NAME);
        }
 
        signal(SIGTERM, sig_quit);
index 008ebf2..9209c2b 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <assert.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "log.h"
index b232288..ebf387e 100644 (file)
@@ -22,7 +22,7 @@
 #include <limits.h>
 
 #include <glib.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "core/log.h"
@@ -47,7 +47,7 @@ static int pmqos_cpu_request(const char *name, int val)
 
        if (val > 0) {
                _D("Set pm scenario. Lock %s.", name);
-               ret = dbus_handle_method_async_var(PASS_BUS_NAME,
+               ret = gdbus_call_async(PASS_BUS_NAME,
                                PASS_PATH_PMQOS,
                                PASS_INTERFACE_PMQOS,
                                PASS_METHOD_SET_SCENARIO,
@@ -217,7 +217,7 @@ static int booting_done(void *data)
                goto out;
        _I("Booting done.");
 
-       ret = dbus_handle_register_dbus_object_all(NULL);
+       ret = gdbus_register_object_all(NULL);
        if (ret < 0)
                _E("Failed to register dbus method: %d", ret);
 
@@ -239,7 +239,7 @@ static void pmqos_init(void *data)
        int ret;
 
        /* register dbus methods */
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_PMQOS, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 80cb678..143da13 100644 (file)
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <core/common.h>
 #include "usb.h"
 
@@ -71,7 +71,7 @@ static int start_device(char **args)
 
        printf("Start %s device.\n", args[1]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                devices[arg_id].path,
                devices[arg_id].iface,
                "start",
@@ -95,7 +95,7 @@ static int stop_device(char **args)
 
        printf("Stop %s device.\n", args[1]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "stop",
@@ -122,7 +122,7 @@ static int dump_mode(char **args)
 
        printf("%s (%s %s).\n", args[1], args[2], args[3]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        devices[arg_id].path,
                                        devices[arg_id].iface,
                                        "Dumpmode",
@@ -158,7 +158,7 @@ static int display_state(char **args)
 
        printf("%s (%s %s)!\n", args[1], args[2], args[3]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                    devices[arg_id].path,
                    devices[arg_id].iface,
                    "changestate",
@@ -192,7 +192,7 @@ static int save_log(char **args)
 
        printf("Save log %s device.\n", args[1]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                devices[arg_id].path,
                                devices[arg_id].iface,
                                "SaveLog",
@@ -243,7 +243,7 @@ static int save_dbus_name(char **args)
 
        printf("Save dbus name.\n");
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DBUS_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DBUS_BUS_NAME,
                                                DBUS_OBJECT_PATH,
                                                DBUS_INTERFACE_NAME,
                                                "ListNames",
@@ -263,7 +263,7 @@ static int save_dbus_name(char **args)
        printf("%" G_GSIZE_FORMAT " connections.\n", g_variant_iter_n_children(iter));
 
        while (g_variant_iter_loop(iter, "s", &str)) {
-               pid = dbus_handle_get_sender_pid(NULL, str);
+               pid = gdbus_get_sender_pid(NULL, str);
                get_pname(pid, pname);
                printf("%6d  %6s  %s\n", pid, str, pname);
        }
@@ -284,7 +284,7 @@ static int device_list(char **args)
 
        printf("Print %s to dlog.\n", args[1]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "DeviceList",
@@ -321,7 +321,7 @@ static int enable_device(char **args)
 
        printf("Enable %s device.\n", args[3]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "enable",
@@ -356,7 +356,7 @@ static int disable_device(char **args)
 
        printf("Disable %s device.\n", args[3]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "disable",
@@ -391,7 +391,7 @@ static int power_operation(char **args, char *type)
 
        printf("Power %s device.\n", args[2]);
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                devices[arg_id].path,
                                                devices[arg_id].iface,
                                                "PowerOff",
index 5fecba8..8ab6f4c 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <fcntl.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "util.h"
 #include "core.h"
@@ -57,7 +57,7 @@ void broadcast_ambient_state(int state)
        char *signal;
 
        signal = (state == true ? SIGNAL_ALPM_ON : SIGNAL_ALPM_OFF);
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                signal,
@@ -219,7 +219,7 @@ static void homescreen_signal_handler(GDBusConnection  *conn,
        }
        _D("screen : %s", screen);
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
 
        if (!strncmp(screen, CLOCK_START, strlen(CLOCK_START)))
                ambient_start_clock();
@@ -271,7 +271,7 @@ static void ambient_init(void *data)
                vconf_notify_key_changed("db/starter/always_on_display",
                        ambient_set_condition, NULL);
        }
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                DEVICED_OBJECT_PATH,
                                DEVICED_INTERFACE_NAME,
                                SIGNAL_HOMESCREEN,
@@ -280,7 +280,7 @@ static void ambient_init(void *data)
        if (ret <= 0)
                _E("Failed to register signal handler: %d", ret);
 
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                DEVICED_OBJECT_PATH,
                                DEVICED_INTERFACE_NAME,
                                SIGNAL_ALPMLCDOFF,
index b653706..2c5c101 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <error.h>
 #include <stdbool.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <device/display.h>
 
 #include "ambient-mode.h"
@@ -87,7 +87,7 @@ static GVariant *dbus_start(GDBusConnection *conn,
 
        display_device_ops->start(CORE_LOGIC_MODE);
 out:
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static GVariant *dbus_stop(GDBusConnection *conn,
@@ -106,7 +106,7 @@ static GVariant *dbus_stop(GDBusConnection *conn,
 
        display_device_ops->stop(CORE_LOGIC_MODE);
 out:
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static GVariant *dbus_lockstate(GDBusConnection *conn,
@@ -134,7 +134,7 @@ static GVariant *dbus_lockstate(GDBusConnection *conn,
        if (!strcmp(state_str, "privilege check"))
                goto out;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -224,7 +224,7 @@ static GVariant *dbus_unlockstate(GDBusConnection *conn,
        if (!strcmp(state_str, "privilege check"))
                goto out;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -288,7 +288,7 @@ static GVariant *dbus_changestate(GDBusConnection *conn,
        if (!strcmp(state_str, "privilege check"))
                goto out;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -493,7 +493,7 @@ static GVariant *dbus_setbrightness(GDBusConnection *conn,
        } else
                ret = -EINVAL;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Set brightness pid=%d brt=%d ret=%d", pid, brt, ret);
 
 error:
@@ -548,7 +548,7 @@ static GVariant *dbus_holdbrightness(GDBusConnection *conn,
                        _E("Failed to set vconf value for automatic brightness: %d", vconf_get_ext_errno());
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Hold brightness pid=%d brt=%d ret=%d", pid, brt, ret);
 
 error:
@@ -562,7 +562,7 @@ static GVariant *dbus_releasebrightness(GDBusConnection *conn,
        int bat, charger, changed, setting, brt, autobrt, ret = 0;
        pid_t pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Release brightness pid=%d", pid);
 
        ret = vconf_get_int(VCONFKEY_SYSMAN_BATTERY_STATUS_LOW, &bat);
@@ -685,7 +685,7 @@ static GVariant *dbus_setautobrightnessmin(GDBusConnection *conn,
        }
        g_variant_get(param, "(i)", &val);
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -697,7 +697,7 @@ static GVariant *dbus_setautobrightnessmin(GDBusConnection *conn,
                goto error;
        }
        if (display_info.reset_autobrightness_min) {
-               id = dbus_handle_watch_name(sender, display_info.reset_autobrightness_min, NULL, NULL, NULL);
+               id = gdbus_watch_name(sender, display_info.reset_autobrightness_min, NULL, NULL, NULL);
                if (id <= 0) {
                        _E("failed to watch name %s, id %d", sender, id);
                        //todo: set return value
@@ -718,7 +718,7 @@ static GVariant *dbus_setlcdtimeout(GDBusConnection *conn,
 
        g_variant_get(param, "(iii)", &on, &dim, &holdkey_block);
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -729,7 +729,7 @@ static GVariant *dbus_setlcdtimeout(GDBusConnection *conn,
        if (ret) {
                _W("fail to set lcd timeout %d by %d", ret, pid);
        } else {
-               id = dbus_handle_watch_name(sender, reset_lcd_timeout, NULL, NULL, NULL);
+               id = gdbus_watch_name(sender, reset_lcd_timeout, NULL, NULL, NULL);
                if (id <= 0) {
                        _E("failed to watch name %s, id %d", sender, id);
                        //todo: set return value
@@ -798,7 +798,7 @@ static GVariant *dbus_savelog(GDBusConnection *conn,
        GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data)
 {
        pm_save_logdump();
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static GVariant *dbus_powerkeyignore(GDBusConnection *conn,
@@ -838,7 +838,7 @@ static GVariant *dbus_customlcdon(GDBusConnection *conn,
        int timeout, lcdon_blocked;
        pid_t pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Change state to S_LCDON pid=%d", pid);
 
        g_variant_get(param, "(i)", &timeout);
@@ -863,7 +863,7 @@ static GVariant *dbus_customlcdoff(GDBusConnection *conn,
        char *reason_str = NULL;
        pid_t pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Change state to S_LCDOFF pid=%d", pid);
 
        g_variant_get(param, "(s)", &reason_str);
@@ -911,7 +911,7 @@ static GVariant *dbus_changestatebyreason(GDBusConnection *conn,
                ret = -EINVAL;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Change state pid=%d state=%s reason=%s ret=%d", pid, state, reason, ret);
 
        g_free(reason);
@@ -926,7 +926,7 @@ static GVariant *dbus_staytouchscreenoff(GDBusConnection *conn,
        int val;
        pid_t pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Stay touchscreen off pid=%d", pid);
 
        g_variant_get(param, "(i)", &val);
@@ -944,7 +944,7 @@ static GVariant *dbus_lcdpaneloffmode(GDBusConnection *conn,
        int val;
        pid_t pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        _I("Set lcd panel off mode pid=%d", pid);
 
        g_variant_get(param, "(i)", &val);
@@ -1043,7 +1043,7 @@ static GVariant *dbus_locktimeout_expired(GDBusConnection *conn,
 
        g_variant_get(param, "(s)", &req_id);
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("%d process does not exist, dbus ignored!", pid);
                ret = -ESRCH;
@@ -1203,7 +1203,7 @@ static GVariant *dbus_dimstay_control(GDBusConnection *conn,
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (dimstay) {
                _I("Set DIM_FLAG pid=%d", pid);
                set_pm_status_flag(DIM_FLAG);
@@ -1360,12 +1360,12 @@ int init_pm_dbus(void)
        display_add_actor(&display_api_actor);
        display_add_actor(&display_gesture_actor);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_DISPLAY, &dbus_interface);
        if (ret < 0)
                _E("fail to init dbus method(%d)", ret);
 
 
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                AUL_APPSTATUS_PATH,
                                AUL_APPSTATUS_INTERFACE,
                                APP_CHANGE_STATE,
@@ -1374,7 +1374,7 @@ int init_pm_dbus(void)
        if (ret <= 0)
                _E("Failed to register signal handler: %d", ret);
 
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                        AUL_APPSTATUS_PATH,
                        AUL_APPSTATUS_INTERFACE,
                        APP_TERMINATED,
index 60b093a..641aede 100644 (file)
@@ -81,7 +81,7 @@ static void broadcast_pmlock_expired(pid_t pid, enum state_t state, const char*
        CRITICAL_LOG("%s(%d) has held %s lock for a long time(%.0f s).",
                        appid ? appid : "NULL", pid, state_st(state)->name + 2, diff);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                "pmlock_expired",
@@ -173,7 +173,7 @@ static gboolean default_pmlock_check(void *data)
                return G_SOURCE_REMOVE;
        }
 
-       ret = dbus_handle_method_async_with_reply_var(RESOURCED_BUS_NAME,
+       ret = gdbus_call_async_with_reply(RESOURCED_BUS_NAME,
                RESOURCED_PATH_PROCESS,
                RESOURCED_INTERFACE_PROCESS,
                METHOD_APP_STATUS,
@@ -364,7 +364,7 @@ void print_node(int next)
 
                if (diff > LOCK_TIME_WARNING) {
                        if (diff > LOCK_TIME_WARNING * 60 && n->pid < INTERNAL_LOCK_BASE && n->broadcast_warning) {
-                               ret = dbus_handle_emit_dbus_signal(NULL,
+                               ret = gdbus_signal_emit(NULL,
                                                                                DEVICED_PATH_DISPLAY,
                                                                                DEVICED_INTERFACE_DISPLAY,
                                                                                "pmlock_over",
index 67c3877..ddb02df 100644 (file)
@@ -48,7 +48,7 @@ void broadcast_pm_suspend(void)
 
        pmstate_suspend = PM_SUSPEND;
        now = clock_gettime_to_long();
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        DEVICED_PATH_DISPLAY,
                                                        DEVICED_INTERFACE_DISPLAY,
                                                        "sleep",
@@ -69,7 +69,7 @@ void broadcast_pm_wakeup(void)
 
         pmstate_suspend = PM_WAKEUP;
         now = clock_gettime_to_long();
-        ret = dbus_handle_emit_dbus_signal(NULL,
+        ret = gdbus_signal_emit(NULL,
                                                         DEVICED_PATH_DISPLAY,
                                                         DEVICED_INTERFACE_DISPLAY,
                                                         "wakeup",
@@ -103,7 +103,7 @@ void broadcast_lcd_on(enum signal_type type, enum device_flags flags)
 
        signal = lcdon_sig_lookup[type];
        _I("lcdstep : Broadcast signal(%s:%s).", signal, str);
-       ret = dbus_handle_emit_dbus_signal_sync(NULL,
+       ret = gdbus_signal_emit_sync(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                signal,
@@ -136,7 +136,7 @@ void broadcast_lcd_off(enum signal_type type, enum device_flags flags)
        str = disp_plgn->device_flags_to_string(flags);
 
        _I("lcdstep : Broadcast signal(%s).", signal);
-       ret = dbus_handle_emit_dbus_signal_sync(NULL,
+       ret = gdbus_signal_emit_sync(NULL,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                signal,
@@ -165,7 +165,7 @@ void set_process_active(bool flag, pid_t pid)
                return;
 
        /* Send dbus signal to resourced */
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                        RESOURCED_PATH_PROCESS,
                                                    RESOURCED_INTERFACE_PROCESS,
                                                    RESOURCED_METHOD_ACTIVE,
index f68b0b2..6589590 100644 (file)
@@ -20,7 +20,7 @@
 #define __DISPLAY_SIGNAL_H__
 
 #include <time.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "util.h"
 #include "core/devices.h"
index 2a7dd4b..662b0f3 100644 (file)
@@ -27,7 +27,7 @@
 #define __PM_POLL_H__
 
 #include <glib.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 /**
  * @addtogroup POWER_MANAGER
  * @{
index 3f70f9e..a86136e 100644 (file)
@@ -23,7 +23,7 @@
 #include "core/log.h"
 #include "core/common.h"
 #include "core/devices.h"
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #define SERVICE_NAME           "deviced"
@@ -39,7 +39,7 @@ static void send_dump_signal(char *signal)
 
        pid = getpid();
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                        DUMP_SERVICE_OBJECT_PATH,
                        DUMP_SERVICE_INTERFACE_NAME,
                        signal,
@@ -117,7 +117,7 @@ static void dump_init(void *data)
        int ret;
 
        /* register dump signal */
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                                DUMP_SERVICE_OBJECT_PATH,
                                DUMP_SERVICE_INTERFACE_NAME,
                                DUMP_SIGNAL,
index 382dcde..023d638 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <vconf.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/device-notifier.h"
@@ -46,7 +46,7 @@ static void cradle_send_broadcast(int status)
        _I("Broadcast cradle status(%d).", status);
        old = status;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                SIGNAL_CRADLE_STATE,
@@ -127,7 +127,7 @@ static void cradle_init(void *data)
 
        register_notifier(DEVICE_NOTIFIER_LCD, display_changed);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index 0b89fb5..adce493 100644 (file)
@@ -43,7 +43,7 @@ static void earjack_send_broadcast(int status)
        _I("Broadcast earjack status(%d).", status);
        old = status;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                SIGNAL_EARJACK_STATE,
index 8f698c6..1c28ceb 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <hal/device/hal-external_connection.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/ini-parser.h>
 
 #include "core/log.h"
@@ -120,7 +120,7 @@ static int extcon_update(const char *name, const char *index, const char *value)
        if (dev->enabled == false && strncmp(name, "USB", strlen("USB")) == 0) {
                if (status > 0) {
                        snprintf(buf, BUF_MAX, "usb-client");
-                       ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
+                       ret_dbus = gdbus_call_sync_with_reply_int(DEVICEMANAGER_BUS_NAME,
                                                        DEVICEMANAGER_PATH_POPUP,
                                                        DEVICEMANAGER_INTERFACE_POPUP,
                                                        METHOD_SYSPOPUP_SHOW,
@@ -183,7 +183,7 @@ int extcon_disable_device(const char *name)
                return -ENODEV;
 
        snprintf(buf, BUF_MAX, "usb-client");
-       ret_dbus = dbus_handle_method_sync_var(DEVICEMANAGER_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICEMANAGER_BUS_NAME,
                                        DEVICEMANAGER_PATH_POPUP,
                                        DEVICEMANAGER_INTERFACE_POPUP,
                                        METHOD_SYSPOPUP_SHOW,
@@ -486,7 +486,7 @@ static void extcon_init(void *data)
 
        event_handler_state_changed((void *)&state);
 
-       ret_dbus = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface);
+       ret_dbus = gdbus_add_object(NULL, DEVICED_PATH_EXTCON, &dbus_interface);
        if (ret_dbus < 0)
                _E("Failed to init dbus method: %d", ret_dbus);
 
index 02e91bd..e5bb737 100644 (file)
@@ -18,7 +18,7 @@
 
 
 #include <vconf.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 #include "core/log.h"
 #include "core/bitmap.h"
@@ -48,7 +48,7 @@ static void hdmi_send_broadcast(int status)
        _I("Broadcast hdmi status(%d)", status);
        old = status;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                SIGNAL_HDMI_STATE,
@@ -189,7 +189,7 @@ static void hdmi_init(void *data)
 
        register_notifier(DEVICE_NOTIFIER_LCD, display_changed);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 91b56d4..05f9a0e 100644 (file)
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <hal/device/hal-ir.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include "core/devices.h"
 #include "core/common.h"
 #include "core/log.h"
@@ -147,11 +147,11 @@ static void ir_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_IR, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_IR, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface_legacy);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface_legacy);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index bac00b6..2c706b2 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 
@@ -36,7 +36,7 @@ int ongoing_show(void)
                return 0;
        }
 
-       ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME,
                        POPUP_PATH_NOTI,
                        POPUP_INTERFACE_NOTI,
                        METHOD_TORCH_NOTI_ON,
@@ -59,7 +59,7 @@ int ongoing_clear(void)
                return 0;
        }
 
-       ret_dbus = dbus_handle_method_sync_var(POPUP_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME,
                        POPUP_PATH_LED,
                        POPUP_INTERFACE_LED,
                        METHOD_TORCH_NOTI_OFF,
index ec4d96f..2e4b45b 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <vconf.h>
 #include <hal/device/hal-led.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "core/log.h"
@@ -216,7 +216,7 @@ static GVariant *dbus_playcustom(GDBusConnection *conn,
 
        g_variant_get(param, "(iiuu)", &on, &off, &color, &flags);
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Sender(%d) does not exist.", pid);
                ret = -EINVAL;
@@ -256,7 +256,7 @@ static GVariant *dbus_stopcustom(GDBusConnection *conn,
        pid_t pid;
        static pid_t old_pid;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Sender(%d) does not exist.", pid);
                ret = -EINVAL;
@@ -308,7 +308,7 @@ static GVariant *dbus_multi_led_control(GDBusConnection *conn,
        static pid_t old_pid;
        struct led_state state;
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Sender(%d) does not exist.", pid);
                ret = -EINVAL;
@@ -388,7 +388,7 @@ static void rgb_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 752174c..a9304eb 100644 (file)
@@ -22,7 +22,7 @@
 #include <assert.h>
 #include <vconf.h>
 #include <hal/device/hal-led.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/devices.h"
@@ -45,7 +45,7 @@ static void flash_state_broadcast(int val)
 {
        int ret;
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                SIGNAL_FLASH_STATE,
@@ -176,7 +176,7 @@ static void torch_init(void *data)
        int ret;
 
        /* init dbus interface */
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_LED, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_LED, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index dfd865b..f816d9c 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <vconf.h>
 #include <hal/device/hal-led.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/devices.h"
index 5496e66..401a365 100644 (file)
@@ -27,7 +27,7 @@
 #include <vconf.h>
 #include <vconf-keys.h>
 #include <limits.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "dd-deviced.h"
 #include "deviced-priv.h"
@@ -59,7 +59,7 @@ static int dbus_proc_handler(char* type, char *buf)
        GVariant *reply;
        int reply_val, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_PROCESS,
                                                DEVICED_INTERFACE_PROCESS,
                                                type,
@@ -114,7 +114,7 @@ static int dbus_power_handler(char* type)
        GVariant *reply;
        int reply_val, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                "PowerOff",
@@ -159,7 +159,7 @@ static int dbus_time_handler(char* type, char* buf)
        if (ret_val != 0)
                snprintf(name, sizeof(name), "%d", pid);
 
-       ret_val = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                type,
@@ -194,7 +194,7 @@ static int alarm_set_time(time_t timet)
                snprintf(name, sizeof(name), "%d", pid);
        _SI("[%s]start %s %ld.", name, ALARM_INTERFACE_NAME, timet);
 
-       ret_val = dbus_handle_method_sync_with_reply_var(ALARM_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply(ALARM_BUS_NAME,
                                                ALARM_PATH_NAME,
                                                ALARM_INTERFACE_NAME,
                                                ALARM_SET_TIME_METHOD,
@@ -239,7 +239,7 @@ static int dbus_cpu_handler(char* type, char* buf_pid, char* buf_freq)
        GVariant *reply;
        int reply_val, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_SYSNOTI,
                                                DEVICED_INTERFACE_SYSNOTI,
                                                type,
index 06f276b..b41d816 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "log.h"
 #include "common.h"
@@ -63,7 +63,7 @@ API int display_get_max_brightness(void)
 {
        int reply, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY,
                                DEVICED_INTERFACE_DISPLAY,
                                METHOD_GET_MAX_BRIGHTNESS,
@@ -82,7 +82,7 @@ API int display_set_brightness_with_setting(int val)
        if (val < 0 || val > 100)
                return -EINVAL;
 
-       ret = dbus_handle_method_async_var(DEVICED_BUS_NAME,
+       ret = gdbus_call_async(DEVICED_BUS_NAME,
                                        DEVICED_PATH_DISPLAY,
                                        DEVICED_INTERFACE_DISPLAY,
                                        METHOD_SET_BRIGHTNESS,
@@ -136,7 +136,7 @@ API int display_change_state(unsigned int s_bits)
        if (!lcd_str)
                return -EINVAL;
 
-       ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                METHOD_CHANGE_STATE,
@@ -194,7 +194,7 @@ API int display_lock_state(unsigned int s_bits, unsigned int flag,
                p = STR_NULL;
        pa[2] = p;
 
-       ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                METHOD_LOCK_STATE,
@@ -253,7 +253,7 @@ API int display_unlock_state(unsigned int s_bits, unsigned int flag)
        }
        pa[1] = p;
 
-       ret = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       ret = gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_DISPLAY,
                                                DEVICED_INTERFACE_DISPLAY,
                                                METHOD_UNLOCK_STATE,
index d935aa5..d158a4a 100644 (file)
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 #include <vconf.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "log.h"
 #include "dd-haptic.h"
index 8d09a25..4c467b4 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "log.h"
 #include "common.h"
@@ -36,7 +36,7 @@ API int led_get_brightness(void)
        int reply_val = 0;
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        METHOD_GET_BRIGHTNESS,
@@ -60,7 +60,7 @@ API int led_get_max_brightness(void)
        GVariant *reply = NULL;
        int reply_val, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                        DEVICED_PATH_LED,
                                        DEVICED_INTERFACE_LED,
                                        METHOD_GET_MAX_BRIGHTNESS,
@@ -84,7 +84,7 @@ API int led_set_brightness_with_noti(int val, bool enable)
        GVariant *reply = NULL;
        int reply_val, ret_dbus;
 
-       ret_dbus = dbus_handle_method_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply(DEVICED_BUS_NAME,
                                                DEVICED_PATH_LED,
                                                DEVICED_INTERFACE_LED,
                                                METHOD_SET_BRIGHTNESS,
index 5e55845..713aacd 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "log.h"
@@ -66,7 +66,7 @@ static int register_signal_handler(const char *path, const char *iface, const ch
        handler->name = name;
        handler->action = action;
        handler->data = data;
-       handler->id = subscribe_dbus_signal(NULL, path, iface, name, cb, NULL, NULL);
+       handler->id = gdbus_signal_subscribe(NULL, path, iface, name, cb, NULL, NULL);
        if (!handler->id) {
                _E("Failed to add dbus handler.");
                ret = -1;
@@ -189,7 +189,7 @@ API void deinit_usbhost_signal(void)
        SYS_G_LIST_FOREACH_SAFE(handlers, n, next, handler) {
                SYS_G_LIST_REMOVE(handlers, handler);
                if (handler->id) {
-                       unsubscribe_dbus_signal(NULL, handler->id);
+                       gdbus_signal_unsubscribe(NULL, handler->id);
                        handler->id = 0;
                }
 
@@ -205,7 +205,7 @@ API void deinit_usbhost_signal(void)
 API int request_usb_storage_info(void)
 {
        int reply, ret_dbus;
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_USBHOST,
                                DEVICED_INTERFACE_USBHOST,
                                METHOD_REQUEST_STORAGE_INFO_ALL,
@@ -274,7 +274,7 @@ API int unregister_usb_storage_change_handler(void)
                if (handler->id == 0)
                        continue;
 
-               unsubscribe_dbus_signal(NULL, handler->id);
+               gdbus_signal_unsubscribe(NULL, handler->id);
                SYS_G_LIST_REMOVE(handlers, handler);
                free(handler);
        }
@@ -296,7 +296,7 @@ API int unregister_usb_device_change_handler(
                if (handler->action.device != device_changed)
                        continue;
 
-               unsubscribe_dbus_signal(NULL, handler->id);
+               gdbus_signal_unsubscribe(NULL, handler->id);
                SYS_G_LIST_REMOVE(handlers, handler);
                free(handler);
        }
@@ -311,7 +311,7 @@ API int mount_usb_storage(char *path)
        if (!path)
                return -1;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_MOUNT,
@@ -329,7 +329,7 @@ API int unmount_usb_storage(char *path)
        if (!path)
                return -1;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_UNMOUNT,
@@ -347,7 +347,7 @@ API int format_usb_storage(char *path)
        if (!path)
                return -1;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                        DEVICED_PATH_USBHOST,
                                        DEVICED_INTERFACE_USBHOST,
                                        METHOD_REQUEST_STORAGE_FORMAT,
@@ -368,7 +368,7 @@ API int open_usb_device(char *path, int *out_fd)
        if (!out_fd || !path)
                return -EINVAL;
 
-       ret_dbus = dbus_handle_method_with_unix_fd_list_sync_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_unix_fd_list_sync_with_reply(DEVICED_BUS_NAME,
                                                                DEVICED_PATH_USBHOST,
                                                                DEVICED_INTERFACE_USBHOST,
                                                                METHOD_OPEN_DEVICE,
index 6974548..808aa18 100644 (file)
@@ -17,7 +17,7 @@
  */
 
 #include <getopt.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <stdio.h>
 #include <stdbool.h>
 #include <core/common.h>
@@ -286,8 +286,8 @@ struct parse_result parse_reboot_et_al(enum application application, int argc, c
 int call_deviced_poweroff(const char *type, const char *extra_option, const char *message)
 {
        int ret_dbus = extra_option
-               ? dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL)
-               : dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL)
+               ? gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOffWithOption", g_variant_new("(ss)", type, extra_option), NULL)
+               : gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, "PowerOff", g_variant_new("(s)", type), NULL)
        ;
        if (ret_dbus < 0) {
                fprintf(stderr, "Error: %d", ret_dbus);
index e49ca75..0f38a39 100644 (file)
@@ -20,9 +20,8 @@
 #include <unistd.h>
 #include <bundle.h>
 #include <eventsystem.h>
-#include <libsyscommon/dbus-system.h>
-#include <libsyscommon/dbus-systemd.h>
-#include <libsyscommon/systemd-state.h>
+#include <libsyscommon/libgdbus.h>
+#include <libsyscommon/libsystemd.h>
 
 #include "core/log.h"
 #include "core/device-notifier.h"
@@ -40,8 +39,8 @@ static guint sig_id[2] = {0, 0};
 
 void remove_booting_done_handler(void *data)
 {
-       unsubscribe_dbus_signal(NULL, sig_id[0]);
-       unsubscribe_dbus_signal(NULL, sig_id[1]);
+       gdbus_signal_unsubscribe(NULL, sig_id[0]);
+       gdbus_signal_unsubscribe(NULL, sig_id[1]);
 }
 
 static void booting_done_received(GDBusConnection  *conn,
@@ -92,7 +91,7 @@ void add_booting_done_handler(void *data)
 {
        /* System Session is loaded completely */
        /*ret = */
-       sig_id[0] = subscribe_dbus_signal(NULL,
+       sig_id[0] = gdbus_signal_subscribe(NULL,
                                        SYSTEMD_DBUS_PATH,
                                        SYSTEMD_DBUS_IFACE_MANAGER,
                                        SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED,
@@ -103,7 +102,7 @@ void add_booting_done_handler(void *data)
                _E("Failed to init dbus signal(%s).", SYSTEMD_DBUS_SIGNAL_SYSTEM_STARTUP_FINISHED);
 
        /* User Session is loaded completely */
-       sig_id[1] = subscribe_dbus_signal(NULL,
+       sig_id[1] = gdbus_signal_subscribe(NULL,
                                        SYSTEMD_DBUS_PATH,
                                        SYSTEMD_DBUS_IFACE_MANAGER,
                                        SYSTEMD_DBUS_SIGNAL_USER_STARTUP_FINISHED,
index a8b090f..3b1ae4e 100644 (file)
@@ -39,7 +39,7 @@ int doze_pmqos_request(int req)
 {
        int ret = 0;
 
-       ret = dbus_handle_method_async_var(PASS_BUS_NAME,
+       ret = gdbus_call_async(PASS_BUS_NAME,
                                        PASS_PATH_PMQOS,
                                        PASS_INTERFACE_PMQOS,
                                        PASS_METHOD_SET_SCENARIO,
index 0bce7ae..fa013a1 100644 (file)
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <dlfcn.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/devices.h"
@@ -159,7 +159,7 @@ int suspend_other_process(int type)
                return ret;
 
        if (type == VITAL_SLEEP) {
-               dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME,
+               gdbus_call_sync_with_reply_timeout(RESOURCED_BUS_NAME,
                                                RESOURCED_PATH_FREEZER,
                                                RESOURCED_INTERFACE_FREEZER,
                                                "SetSuspend",
@@ -168,13 +168,13 @@ int suspend_other_process(int type)
                                                SET_SUSPEND_TIME*1000);
                vital_sleep = true;
        } else if (type == VITAL_WAKEUP) {
-               ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME,
+               ret = gdbus_call_async(RESOURCED_BUS_NAME,
                                                RESOURCED_PATH_FREEZER,
                                                RESOURCED_INTERFACE_FREEZER,
                                                "SetSuspend",
                                                g_variant_new("(s)", "wakeup"));
        } else if (type == VITAL_EXIT) {
-               ret = dbus_handle_method_async_var(RESOURCED_BUS_NAME,
+               ret = gdbus_call_async(RESOURCED_BUS_NAME,
                                                RESOURCED_PATH_FREEZER,
                                                RESOURCED_INTERFACE_FREEZER,
                                                "SetSuspend",
index 9c007fe..fdc1540 100644 (file)
@@ -33,8 +33,8 @@
 #include <stdbool.h>
 #include <signal.h>
 #include <systemd/sd-daemon.h>
-#include <libsyscommon/dbus-system.h>
-#include <libsyscommon/dbus-systemd.h>
+#include <libsyscommon/libgdbus.h>
+#include <libsyscommon/libsystemd.h>
 #include <libsyscommon/ini-parser.h>
 
 #include "dd-deviced.h"
@@ -123,7 +123,7 @@ static void poweroff_start_animation(void)
 static void poweroff_notify_resourced(void)
 {
        _I("Request to stop systemd service to resourced.");
-       dbus_handle_method_sync_with_reply_var_timeout(RESOURCED_BUS_NAME,
+       gdbus_call_sync_with_reply_timeout(RESOURCED_BUS_NAME,
                                RESOURCED_PATH_PROCESS,
                                RESOURCED_INTERFACE_PROCESS,
                                "PrePoweroff",
@@ -194,7 +194,7 @@ void poweroff_request_shutdown(void)
        }
 
        CRITICAL_LOG("Requested %s via systemd.", method);
-       dbus_handle_method_sync_with_reply_var_timeout(SYSTEMD_DBUS_DEST,
+       gdbus_call_sync_with_reply_timeout(SYSTEMD_DBUS_DEST,
                                        SYSTEMD_DBUS_PATH,
                                        SYSTEMD_DBUS_IFACE_MANAGER,
                                        method,
@@ -467,7 +467,7 @@ static void poweroff_send_broadcast(int status)
        old = status;
 
        /* Need to notify to deviced-vibrator. deviced-vibrator receives ChangeState signal for POWEROFF_TYPE_DIRECT and POWEROFF_TYPE_RESTART */
-       ret_dbus = dbus_handle_emit_dbus_signal(NULL,
+       ret_dbus = gdbus_signal_emit(NULL,
                                                DEVICED_PATH_POWEROFF,
                                                DEVICED_INTERFACE_POWEROFF,
                                                SIGNAL_POWEROFF_STATE,
@@ -540,7 +540,7 @@ static int check_sender_process(GDBusConnection *conn, const char *sender)
                return -EINVAL;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Process(%d) does not exist, dbus ignored.", pid);
                return -ESRCH;
@@ -769,7 +769,7 @@ static void power_init(void *data)
        int ret_val;
 
        /* init dbus interface */
-       ret_val = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface);
+       ret_val = gdbus_add_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface);
        if (ret_val < 0)
                _E("Failed to init dbus method: %d", ret_val);
 
index cbf3db2..2fb1a57 100644 (file)
@@ -18,7 +18,7 @@
 
 
 #include <fcntl.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/log.h"
 #include "core/devices.h"
@@ -148,7 +148,7 @@ static void cpu_info_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index e3ca4f8..e2eb623 100644 (file)
@@ -21,7 +21,7 @@
 #include <stdbool.h>
 
 #include <hal/device/hal-thermal.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "apps/apps.h"
 #include "core/devices.h"
@@ -89,7 +89,7 @@ static void thermal_init(void *data)
        if (ret < 0)
                _E("Failed to register booting done notifier.");
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TEMPERATURE, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_TEMPERATURE, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 }
index 42f49a6..fcf6a3d 100644 (file)
@@ -30,7 +30,7 @@
 #include <linux/rtc.h>
 #include <fcntl.h>
 #include <sys/timerfd.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <dlfcn.h>
 
 #include "core/log.h"
@@ -233,7 +233,7 @@ int set_timezone_action(int argc, char **argv)
 
 static void time_changed_broadcast(void)
 {
-       dbus_handle_emit_dbus_signal(NULL,
+       gdbus_signal_emit(NULL,
                        DEVICED_PATH_TIME, DEVICED_INTERFACE_TIME,
                        TIME_CHANGE_SIGNAL, NULL);
 }
@@ -323,7 +323,7 @@ static GVariant *dbus_time_handler(GDBusConnection *conn,
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (pid == -1 || kill(pid, 0) == -1) {
                _E("Process(%d) does not exist, dbus ignored.", pid);
                ret = -ESRCH;
@@ -391,7 +391,7 @@ static void time_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_SYSNOTI, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 65d3746..13c75b7 100644 (file)
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <vconf.h>
 #include <hal/device/hal-touchscreen.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "core/devices.h"
 #include "core/common.h"
@@ -182,11 +182,11 @@ static void sensitivity_init(void *data)
        _I("Touch sensitivity device structure load success.");
 
        /* init dbus interface */
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
-       ret = subscribe_dbus_signal(NULL,
+       ret = gdbus_signal_subscribe(NULL,
                DEVICED_PATH_TOUCH,
                DEVICED_INTERFACE_TOUCH,
                DISABLE_SENSITIVITY_SIGNAL,
index aefb70a..21032a1 100644 (file)
@@ -19,7 +19,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <hal/device/hal-touchscreen.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <vconf.h>
 #include <dlfcn.h>
 #include "core/devices.h"
@@ -349,7 +349,7 @@ static void touchscreen_init(void *data)
                display_conf->touch_wakeup = val;
 
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_TOUCH, &dbus_interface);
 
        if (ret < 0)
                _E("Failed to init dbus method. (%d)", ret);
index 0f0dff4..88c4802 100644 (file)
@@ -35,7 +35,7 @@
 #include <sys/xattr.h>
 #include <linux/limits.h>
 #include <tzplatform_config.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "core/log.h"
@@ -766,7 +766,7 @@ static GVariant *dbus_request_mount_tzip_internal(GDBusConnection *conn, const g
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (is_app(pid) != 0) {
                _E("PID(%d) is not privileged to use tzip.", pid);
                ret = -EPERM;
@@ -851,7 +851,7 @@ static GVariant *dbus_request_unmount_tzip_internal(GDBusConnection *conn, const
                goto out;
        }
 
-       pid = dbus_connection_get_sender_pid(conn, sender);
+       pid = gdbus_connection_get_sender_pid(conn, sender);
        if (is_app(pid) != 0) {
                _E("PID(%d) is not privileged to use tzip.", pid);
                ret = -EPERM;
@@ -1023,7 +1023,7 @@ static void tzip_init(void *data)
        register_notifier(DEVICE_NOTIFIER_BOOTING_DONE, booting_done);
        register_notifier(DEVICE_NOTIFIER_POWEROFF, tzip_poweroff);
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_TZIP, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_TZIP, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method: %d", ret);
 
index 6cc1586..aeccc82 100644 (file)
@@ -22,8 +22,8 @@
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <unistd.h>
-#include <libsyscommon/dbus-system.h>
-#include <libsyscommon/dbus-systemd.h>
+#include <libsyscommon/libgdbus.h>
+#include <libsyscommon/libsystemd.h>
 #include <libsyscommon/list.h>
 #include <libsyscommon/ini-parser.h>
 
@@ -286,7 +286,7 @@ static void service_started_handler(GDBusConnection  *conn,
                        _I("Start");
 
                if (sigid_start) {
-                       unsubscribe_dbus_signal(NULL, sigid_start);
+                       gdbus_signal_unsubscribe(NULL, sigid_start);
                        sigid_start = 0;
                }
                /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH,
@@ -374,7 +374,7 @@ out:
                        usbg_cleanup(s);
 out1:
                if (sigid_stop) {
-                       unsubscribe_dbus_signal(NULL, sigid_stop);
+                       gdbus_signal_unsubscribe(NULL, sigid_stop);
                        sigid_stop = 0;
                }
        }
@@ -455,7 +455,7 @@ int start()
                goto out;
        }
 
-       ret = subscribe_dbus_signal(NULL, SYSTEMD_DBUS_PATH,
+       ret = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH,
                JOB_MANAGER_INTERFACE, JOB_REMOVED,
                service_started_handler, NULL, NULL);
        if (ret <= 0)
@@ -468,7 +468,7 @@ int start()
                /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH,
                                JOB_MANAGER_INTERFACE, JOB_REMOVED);*/
                if (sigid_start) {
-                       unsubscribe_dbus_signal(NULL, sigid_start);
+                       gdbus_signal_unsubscribe(NULL, sigid_start);
                        sigid_start = 0;
                }
                goto out;
@@ -489,7 +489,7 @@ out:
        /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH,
                        JOB_MANAGER_INTERFACE, JOB_REMOVED);*/
        if (sigid_start)
-               unsubscribe_dbus_signal(NULL, sigid_start);
+               gdbus_signal_unsubscribe(NULL, sigid_start);
 
        return ret;
 }
@@ -498,7 +498,7 @@ static int stop()
 {
        int ret = 0;
 
-       ret = subscribe_dbus_signal(NULL, SYSTEMD_DBUS_PATH,
+       ret = gdbus_signal_subscribe(NULL, SYSTEMD_DBUS_PATH,
                JOB_MANAGER_INTERFACE, JOB_REMOVED,
                service_stopped_handler, NULL, NULL);
        if (ret <= 0) {
@@ -527,7 +527,7 @@ out:
        /*unregister_dbus_signal_handler(SYSTEMD_DBUS_PATH,
                        JOB_MANAGER_INTERFACE, JOB_REMOVED);*/
        if (sigid_stop) {
-               unsubscribe_dbus_signal(NULL, sigid_stop);
+               gdbus_signal_unsubscribe(NULL, sigid_stop);
                sigid_stop = 0;
        }
        return ret;
@@ -547,7 +547,7 @@ static GVariant *dbus_start(GDBusConnection *conn,
        if (ret != 0 && ret != -EALREADY)
                _E("Failed to start usb-host-test : %d", ret);
 
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static GVariant *dbus_stop(GDBusConnection *conn,
@@ -564,7 +564,7 @@ static GVariant *dbus_stop(GDBusConnection *conn,
        if (ret != 0 && ret != -EALREADY)
                _E("Failed to stop usb-host-test : %d", ret);
 
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static int usb_host_test_start(enum device_flags flags)
@@ -600,7 +600,7 @@ static void usb_host_test_init(void *data)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USB_HOST_TEST, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_USB_HOST_TEST, &dbus_interface);
        if (ret < 0) {
                _E("Failed to register dbus method! %d", ret);
                return;
index c6ddfd3..700c86d 100644 (file)
@@ -20,7 +20,7 @@
 #include <stdbool.h>
 
 #include <vconf.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <hal/device/hal-usb_gadget-interface.h>
 
 #include "core/log.h"
@@ -69,7 +69,7 @@ void broadcast_usb_state_changed(void)
 
        _I("USB state(%u) changed.", state);
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                        DEVICED_PATH_USB,
                        DEVICED_INTERFACE_USB,
                        SIGNAL_STATE_CHANGED,
@@ -162,11 +162,11 @@ int usb_dbus_init(void)
 {
        int ret;
 
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USB, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_USB, &dbus_interface);
        if (ret < 0)
                _E("Failed to init dbus method for USB: %d", ret);
 
-       ret = subscribe_dbus_signal(NULL, DEVICED_PATH_USB,
+       ret = gdbus_signal_subscribe(NULL, DEVICED_PATH_USB,
                DEVICED_INTERFACE_USB, "ChangeUsbMode",
                change_usb_client_mode, NULL, NULL);
        if (ret <= 0) {
index 7ddf8cf..d1f9198 100644 (file)
@@ -18,7 +18,7 @@
 
 
 #include <vconf.h>
-#include <libsyscommon/dbus-systemd.h>
+#include <libsyscommon/libsystemd.h>
 #include <hal/device/hal-usb_gadget.h>
 #include <hal/device/hal-usb_gadget-interface.h>
 
index e144ae9..d321efa 100644 (file)
@@ -23,7 +23,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <tzplatform_config.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "core/log.h"
@@ -176,7 +176,7 @@ static void broadcast_usbhost_signal(enum usbhost_state state,
                                                                                (usbhost->product ? usbhost->product : ""),
                                                                                (usbhost->serial ? usbhost->serial : ""));
 
-       ret = dbus_handle_emit_dbus_signal(NULL,
+       ret = gdbus_signal_emit(NULL,
                        DEVICED_PATH_USBHOST,
                        DEVICED_INTERFACE_USBHOST,
                        SIGNAL_USB_HOST_CHANGED,
@@ -433,7 +433,7 @@ static GVariant *print_device_list(GDBusConnection *conn,
                print_usbhost(usbhost);
        }
 
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 #define nullstr(x) (x ? x : "")
 static GVariant *get_device_list(GDBusConnection *conn,
@@ -584,7 +584,7 @@ static GVariant *print_policy(GDBusConnection *conn,
                _I("\t%s", line);
        }
 
-       return dbus_handle_new_g_variant_tuple();
+       return gdbus_new_g_variant_tuple();
 }
 
 static int store_policy(void)
@@ -1052,7 +1052,7 @@ static GVariant *open_device(GDBusConnection *conn,
 
        req->invocation = invocation;
 
-       ret = dbus_handle_get_sender_credentials(NULL, sender, &req->cred);
+       ret = gdbus_get_sender_credentials(NULL, sender, &req->cred);
        if (ret < 0) {
                _E("Unable to get credentials for caller: %d", ret);
                goto out;
@@ -1139,7 +1139,7 @@ static void usbhost_init(void *data)
                _E("Failed to register usb uevent: %d", ret);
 
        /* register usbhost interface and method */
-       ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_USBHOST, &dbus_interface);
+       ret = gdbus_add_object(NULL, DEVICED_PATH_USBHOST, &dbus_interface);
        if (ret < 0)
                _E("Failed to register dbus interface and method: %d", ret);
 
@@ -1152,7 +1152,7 @@ static void usbhost_init(void *data)
                return;
        }
 
-       ret = subscribe_dbus_signal(NULL, POPUP_PATH_SYSTEM,
+       ret = gdbus_signal_subscribe(NULL, POPUP_PATH_SYSTEM,
                POPUP_INTERFACE_SYSTEM, USB_HOST_RESULT_SIGNAL,
                popup_result_signal_handler, NULL, NULL);
        if (ret < 0) {