Change dbus function name

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

diff --git a/include/display-internal.h b/include/display-internal.h
index b8574bc..f80e58e 100644 (file)
--- a/include/display-internal.h
+++ b/include/display-internal.h
@@ -20,7 +20,7 @@
 
 
 #include <gio/gio.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "device-error.h"
 #include "display-enum.h"

diff --git a/include/touchscreen-internal.h b/include/touchscreen-internal.h
index 900b41d..2e47139 100644 (file)
--- a/include/touchscreen-internal.h
+++ b/include/touchscreen-internal.h
@@ -2,7 +2,7 @@
 #define __TIZEN_SYSTEM_TOUCHSCREEN_INTERNAL_H__
 
 #include <gio/gio.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 int device_touchscreen_enable(dbus_pending_cb cb);
 int device_touchscreen_disable(dbus_pending_cb cb);

diff --git a/src/battery.c b/src/battery.c
index d87c3a8..e3f2370 100644 (file)
--- a/src/battery.c
+++ b/src/battery.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <vconf.h>
 #include <hal/device/hal-battery.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <system_info.h>
 
 #include "battery.h"

diff --git a/src/callback.c b/src/callback.c
index 29af917..91d9d25 100644 (file)
--- a/src/callback.c
+++ b/src/callback.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <vconf.h>
 #include <gio/gio.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "callback.h"

diff --git a/src/display.c b/src/display.c
index 25f3fe8..033f950 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <vconf.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <system_info.h>
 
 #include "display.h"
@@ -77,7 +77,7 @@ int device_display_get_numbers(int *device_number)
 
        /* if it is a first request */
        if (display_cnt < 0) {
-               ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+               ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                                METHOD_GET_DISPLAY_COUNT, NULL, &reply);
                if (ret_val < 0)
@@ -115,7 +115,7 @@ int device_display_get_max_brightness(int display_index, int *max_brightness)
                return DEVICE_ERROR_OPERATION_FAILED;
 
        if (display_arr[display_index].normal_max < 0) {
-               ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+               ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                                METHOD_GET_MAX_BRIGHTNESS, g_variant_new("(i)", (int)DISPLAY_STATE_NORMAL),
                                &reply);
@@ -148,7 +148,7 @@ int device_display_get_brightness(int display_index, int *brightness)
        if (display_index < 0 || display_index >= display_cnt)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_GET_BRIGHTNESS, g_variant_new("(i)", (int)DISPLAY_STATE_NORMAL),
                        &reply);
@@ -182,7 +182,7 @@ int device_display_set_brightness(int display_index, int brightness)
        if (brightness < 0 || brightness > display_arr[display_index].normal_max)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", (int)DISPLAY_STATE_NORMAL, brightness),
                        NULL);
@@ -272,7 +272,7 @@ int device_display_change_state(display_state_e state)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        if (privilege < 0) {
-               ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+               ret = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                                METHOD_CHANGE_STATE, g_variant_new("(s)", "privilege check"),
                                NULL);
@@ -288,7 +288,7 @@ int device_display_change_state(display_state_e state)
        if (!str)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       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, g_variant_new("(s)", str), change_cb, -1, NULL);
 
@@ -325,7 +325,7 @@ int device_display_get_max_brightness_state(int display_index, display_state_e s
        if (!display_arr && alloc_display() < 0)
                return DEVICE_ERROR_OPERATION_FAILED;
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                                METHOD_GET_MAX_BRIGHTNESS, g_variant_new("(i)", (int)state),
                                &reply);
@@ -368,7 +368,7 @@ int device_display_get_brightness_state(int display_index, display_state_e state
        if (display_index < 0 || display_index >= display_cnt)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_GET_BRIGHTNESS, g_variant_new("(i)", (int)state),
                        &reply);
@@ -419,7 +419,7 @@ int device_display_set_brightness_state(int display_index, display_state_e state
                break;
        }
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", (int)state, brightness),
                        NULL);
@@ -435,7 +435,7 @@ int device_display_change_state_by_reason(display_state_e type, const char *reas
 {
        int ret;
 
-       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_BY_REASON, g_variant_new("(isi)", (int)type, reason, timeout), cb, -1, NULL);
 

diff --git a/src/haptic.c b/src/haptic.c
index dedb8d0..6d99509 100644 (file)
--- a/src/haptic.c
+++ b/src/haptic.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <system_info.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/list.h>
 
 #include "haptic.h"
@@ -88,7 +88,7 @@ int device_haptic_get_count(int *device_number)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
        /* request to deviced to get haptic count */
-       ret_val = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                        VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_GET_COUNT, NULL, &val);
        /**
@@ -112,7 +112,7 @@ static void restart_callback(void)
        int ret_dbus, val;
 
        SYS_G_LIST_FOREACH_SAFE(handle_list, elem, elem_next, temp) {
-               ret_dbus = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+               ret_dbus = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                                VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                                METHOD_OPEN_DEVICE, g_variant_new("(i)", temp->index), &val);
                if (ret_dbus < 0) {
@@ -175,7 +175,7 @@ int device_haptic_open(int device_index, haptic_device_h *device_handle)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
        /* request to deviced to open haptic device */
-       ret_val = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                        VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_OPEN_DEVICE, g_variant_new("(i)", device_index), &val);
        if (ret_val < 0)
@@ -204,7 +204,7 @@ int device_haptic_open(int device_index, haptic_device_h *device_handle)
                *device_handle = (haptic_device_h)handle;
        }
        if (SYS_G_LIST_LENGTH(handle_list) == 1) {
-               haptic_id = subscribe_dbus_signal(NULL,
+               haptic_id = gdbus_signal_subscribe(NULL,
                                VIBRATOR_PATH_HAPTIC,
                                VIBRATOR_INTERFACE_HAPTIC,
                                NULL,
@@ -245,7 +245,7 @@ int device_haptic_close(haptic_device_h device_handle)
        SYS_G_LIST_REMOVE(handle_list, handle);
 
        /* request to deviced to open haptic device */
-       ret_val = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                        VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_CLOSE_DEVICE, g_variant_new("(u)", (unsigned int)handle->handle),
                        NULL);
@@ -256,7 +256,7 @@ int device_haptic_close(haptic_device_h device_handle)
                return errno_to_device_error(ret_val); //LCOV_EXCL_LINE System Error
 
        if (SYS_G_LIST_LENGTH(handle_list) == 0)
-               unsubscribe_dbus_signal(NULL, haptic_id);
+               gdbus_signal_unsubscribe(NULL, haptic_id);
 
        return DEVICE_ERROR_NONE;
 }
@@ -294,7 +294,7 @@ int device_haptic_vibrate(haptic_device_h device_handle, int duration, int feedb
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        /* request to deviced to vibrate haptic device */
-       ret_val = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                        VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_VIBRATE_MONOTONE,
                        g_variant_new("(uiii)", (unsigned int)handle->handle, duration, feedback, priority),
@@ -335,7 +335,7 @@ int device_haptic_stop(haptic_device_h device_handle, haptic_effect_h effect_han
        /* TODO : support to stop haptic effect */
 
        /* request to deviced to open haptic device */
-       ret_val = dbus_handle_method_sync_var(VIBRATOR_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(VIBRATOR_BUS_NAME,
                        VIBRATOR_PATH_HAPTIC, VIBRATOR_INTERFACE_HAPTIC,
                        METHOD_STOP_DEVICE, g_variant_new("(u)", (unsigned int)handle->handle),
                        NULL);

diff --git a/src/ir.c b/src/ir.c
index 63a686d..a96392b 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -16,7 +16,7 @@
 
 #include <stdio.h>
 #include <system_info.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "ir.h"
 #include "common.h"
@@ -46,7 +46,7 @@ int device_ir_is_available(bool *available)
                return DEVICE_ERROR_NOT_SUPPORTED;
        }
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_IR,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_IR,
                        DEVICED_INTERFACE_IR, METHOD_IS_AVAILABLE,
                        NULL, NULL);
 
@@ -95,7 +95,7 @@ int device_ir_transmit(int carrier_frequency, int *pattern, int size)
        for (i = 0; i < size; ++i)
                g_variant_builder_add(builder, "i", pattern[i]);
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_IR,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_IR,
                        DEVICED_INTERFACE_IR, METHOD_TRANSMIT,
                        g_variant_new("(ai)", builder), NULL);
 

diff --git a/src/led.c b/src/led.c
index 8f1c38b..3faff2c 100644 (file)
--- a/src/led.c
+++ b/src/led.c
@@ -19,7 +19,7 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <system_info.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "led.h"
 #include "led-internal.h"
@@ -64,7 +64,7 @@ int device_flash_get_max_brightness(int *max_brightness)
        if (!max_brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                        METHOD_GET_MAX_BRIGHTNESS, NULL, &val);
        if (ret_dbus < 0)
@@ -84,7 +84,7 @@ int device_flash_get_brightness(int *brightness)
        if (!brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                        METHOD_GET_BRIGHTNESS, NULL, &val);
        if (ret_dbus < 0)
@@ -109,7 +109,7 @@ int device_flash_set_brightness(int brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        /* if camera API preempt a flash device, it will return -EBUSY error. */
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                        METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", brightness, 0), NULL);
        if (ret_dbus < 0)
@@ -128,7 +128,7 @@ int device_led_play_custom(int on, int off, unsigned int color, unsigned int fla
        if (on < 0 || off < 0)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                        METHOD_PLAY_CUSTOM, g_variant_new("(iiuu)", on, off, (unsigned int)color, (unsigned int)flags), NULL);
 //LCOV_EXCL_START System Error
@@ -146,7 +146,7 @@ int device_led_stop_custom(void)
        if (!support_front_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                        METHOD_STOP_CUSTOM, NULL, NULL);
 //LCOV_EXCL_START System Error
@@ -169,7 +169,7 @@ int device_multi_led_get_number(int *num_of_leds)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        if (number_of_devices < 0) {
-               ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+               ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                                DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
                                METHOD_GET_LED_NUMBER, NULL, &val);
                if (ret_dbus < 0)
@@ -209,7 +209,7 @@ int device_multi_led_control(unsigned int color[])
        var = g_variant_new("(au)", builder);
        g_variant_builder_unref(builder);
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_LED,
                                DEVICED_INTERFACE_LED, METHOD_MULTI_LED_CONTROL, var, NULL);
        if (ret_val < 0)
                return errno_to_device_error(ret_val); //LCOV_EXCL_LINE System Error

diff --git a/src/pmqos.c b/src/pmqos.c
index f07194a..4e0cbcf 100644 (file)
--- a/src/pmqos.c
+++ b/src/pmqos.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "pmqos-internal.h"
 #include "common.h"
@@ -30,7 +30,7 @@ int device_pmqos_app_launch_home(int timeout)
        if (timeout < 0)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_PMQOS,
                        DEVICED_INTERFACE_PMQOS,
                        METHOD_APP_LAUNCH_HOME,
@@ -50,7 +50,7 @@ int device_pmqos_homescreen(int timeout)
        if (timeout < 0)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_PMQOS,
                        DEVICED_INTERFACE_PMQOS,
                        METHOD_HOMESCREEN,

diff --git a/src/power.c b/src/power.c
index 8256679..a8fcfaf 100644 (file)
--- a/src/power.c
+++ b/src/power.c
@@ -23,7 +23,7 @@
 #include <limits.h>
 #include <tracker.h>
 #include <sys/time.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 #include <libsyscommon/ini-parser.h>
 
 #include "power.h"
@@ -193,7 +193,7 @@ static int notice_power_lock_expired(void)
                return -ENOMEM;
        }
 
-       ret_dbus = dbus_handle_method_async_with_reply_var(
+       ret_dbus = gdbus_call_async_with_reply(
                        DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY,
                        DEVICED_INTERFACE_DISPLAY,
@@ -367,7 +367,7 @@ static int lock_state(display_state_e state, unsigned int flag, int timeout_ms)
        if (privilege < 0) {
                arr[0] = "privilege check";
 
-               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_LOCK_STATE, g_variant_new("(sssi)", arr[0], arr[1], arr[2], timeout_ms),
                                NULL);
@@ -383,7 +383,7 @@ static int lock_state(display_state_e state, unsigned int flag, int timeout_ms)
        if (!arr[0])
                return -EINVAL;
 
-       return dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       return gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_LOCK_STATE, g_variant_new("(sssi)", arr[0], arr[1], arr[2], timeout_ms), lock_cb, -1, NULL);
 }
@@ -421,7 +421,7 @@ static int unlock_state(display_state_e state, unsigned int flag)
        if (privilege < 0) {
                arr[0] = "privilege check";
 
-               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_UNLOCK_STATE, g_variant_new("(ss)", arr[0], arr[1]),
                                NULL);
@@ -437,7 +437,7 @@ static int unlock_state(display_state_e state, unsigned int flag)
        if (!arr[0])
                return -EINVAL;
 
-       return dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       return gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY,
                        METHOD_UNLOCK_STATE, g_variant_new("(ss)", arr[0], arr[1]), unlock_cb, -1, NULL);
 }
@@ -558,7 +558,7 @@ int device_power_reboot(const char *reason)
                param = g_variant_new("(s)", TYPE_REBOOT);
        }
 
-       ret_dbus = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_POWEROFF,
                        DEVICED_INTERFACE_POWEROFF,
                        method, param, NULL);
@@ -571,7 +571,7 @@ int device_power_poweroff(void)
 {
        int 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_POWEROFF, DEVICED_INTERFACE_POWEROFF,
                        METHOD_POWEROFF, g_variant_new("(s)", TYPE_POWEROFF),
                        NULL);

diff --git a/src/temperature.c b/src/temperature.c
index 6e6a14b..db8ab17 100644 (file)
--- a/src/temperature.c
+++ b/src/temperature.c
@@ -21,7 +21,7 @@
 #include <errno.h>
 #include <glib.h>
 #include <system_info.h>
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "common.h"
 #include "temperature.h"
@@ -68,7 +68,7 @@ int device_thermal_get_temperature(device_thermal_e type, int *temp)
        if (!ret_val)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
-       ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
+       ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME,
                        DEVICED_PATH_TEMPERATURE,
                        DEVICED_INTERFACE_TEMPERATURE,
                        METHOD_GET_TEMPERATURE, g_variant_new("(i)", type),

diff --git a/src/touchscreen-internal.c b/src/touchscreen-internal.c
index b07430d..f5eabfc 100644 (file)
--- a/src/touchscreen-internal.c
+++ b/src/touchscreen-internal.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <libsyscommon/dbus-system.h>
+#include <libsyscommon/libgdbus.h>
 
 #include "common.h"
 #include "touchscreen-internal.h"
@@ -27,7 +27,7 @@ int device_touchscreen_enable(dbus_pending_cb cb)
 {
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_TOUCH, DEVICED_INTERFACE_TOUCH,
                        METHOD_TOUCHSCREEN_ENABLE, NULL, cb, -1, NULL);
 
@@ -40,7 +40,7 @@ int device_touchscreen_disable(dbus_pending_cb cb)
 {
        int ret_dbus;
 
-       ret_dbus = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME,
+       ret_dbus = gdbus_call_async_with_reply(DEVICED_BUS_NAME,
                        DEVICED_PATH_TOUCH, DEVICED_INTERFACE_TOUCH,
                        METHOD_TOUCHSCREEN_DISABLE, NULL, cb, -1, NULL);