From 8703f8a75bd55e9bdd7683a99565f760f04521aa Mon Sep 17 00:00:00 2001 From: "taemin.yeom" Date: Fri, 19 Mar 2021 16:03:42 +0900 Subject: [PATCH] Change dbus function name Change-Id: I60e0727ed5c522d1a7c24bb8a17be46a7697aa1c Signed-off-by: taemin.yeom --- apps/extended-sd/src/es-internal-storage-page.c | 6 ++--- apps/extended-sd/src/es-portable-storage-page.c | 10 +++---- apps/extended-sd/src/extended-sd-main.c | 4 +-- src/auto-test/block.c | 14 +++++----- src/auto-test/storage.c | 2 +- src/auto-test/test.h | 2 +- src/block/block.c | 36 ++++++++++++------------- src/core/dbus_main.c | 2 +- src/core/dbus_main.h | 2 +- src/core/main.c | 8 +++--- src/shared/apps.c | 2 +- src/shared/apps.h | 2 +- src/shared/udev.c | 6 ++--- src/storage/storage.c | 20 +++++++------- 14 files changed, 58 insertions(+), 58 deletions(-) diff --git a/apps/extended-sd/src/es-internal-storage-page.c b/apps/extended-sd/src/es-internal-storage-page.c index b6c4aef..38c6974 100644 --- a/apps/extended-sd/src/es-internal-storage-page.c +++ b/apps/extended-sd/src/es-internal-storage-page.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include "extended-sd-main.h" #include "log-util.h" @@ -108,7 +108,7 @@ encryption_format(void *data) elm_object_part_content_set(ad->internal_storage_page_data->internal_storage_page_base_layout, "elm.swallow.content", page_content); // Unmount sdcard - ret_val = dbus_handle_method_sync_var(STORAGED_BUS_NAME, + ret_val = gdbus_call_sync_with_reply_int(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "Unmount", g_variant_new("(ii)", ad->storage_id, UNMOUNT_FORCE), NULL); if (ret_val < 0) { DMSG("Failed to mount sd card as portable storage: %d", ret_val); @@ -185,7 +185,7 @@ _format_click_cb(void *data, Evas_Object* obj, void *event_info) page_content = create_page_2(ad); elm_object_part_content_set(ad->internal_storage_page_data->internal_storage_page_base_layout, "elm.swallow.content", page_content); - ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_async_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "CheckSpeed", diff --git a/apps/extended-sd/src/es-portable-storage-page.c b/apps/extended-sd/src/es-portable-storage-page.c index cf73b1a..93bfdc6 100644 --- a/apps/extended-sd/src/es-portable-storage-page.c +++ b/apps/extended-sd/src/es-portable-storage-page.c @@ -15,7 +15,7 @@ */ #include -#include +#include #include "extended-sd-main.h" #include "log-util.h" @@ -68,7 +68,7 @@ format_done(GVariant *result, void *data, GError *err) goto out; } - ret = dbus_handle_method_sync_var(STORAGED_BUS_NAME, + ret = gdbus_call_sync_with_reply_int(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "Mount", g_variant_new("(is)", ad->storage_id, ""), NULL); if (ret < 0) { DMSG("Failed to mount sd card as portable storage: %d", ret); @@ -116,7 +116,7 @@ mapper_device_cb(int mapper_id, storage_dev_e dev, storage_state_e state, return; if (primary) { - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "GetDeviceList", g_variant_new("(s)", "mmc"), &reply); if (ret_dbus < 0) { DMSG("Failed to get storage information."); @@ -148,7 +148,7 @@ mapper_device_cb(int mapper_id, storage_dev_e dev, storage_state_e state, g_variant_unref(reply); } - ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_async_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "FormatwithType", @@ -201,7 +201,7 @@ _format_click_cb(void *data, Evas_Object* obj, void *event_info) elm_object_part_content_set(ad->portable_storage_page_data->portable_storage_page_base_layout, "elm.swallow.content", page_content); - ret_dbus = dbus_handle_method_async_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_async_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "Unmount", diff --git a/apps/extended-sd/src/extended-sd-main.c b/apps/extended-sd/src/extended-sd-main.c index 82ce06f..ce2b4ee 100644 --- a/apps/extended-sd/src/extended-sd-main.c +++ b/apps/extended-sd/src/extended-sd-main.c @@ -14,7 +14,7 @@ * limitations under the License */ -#include +#include #include "extended-sd-main.h" #include "es-preference-util.h" @@ -145,7 +145,7 @@ app_control(app_control_h app_control, void *data) } else create_home_page_base_layout(ad); - ret_val = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_val = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, "GetMmcPrimary", diff --git a/src/auto-test/block.c b/src/auto-test/block.c index 5b6c282..29f0ef7 100644 --- a/src/auto-test/block.c +++ b/src/auto-test/block.c @@ -40,7 +40,7 @@ static bool request_block_method(const char *method, GVariant *param, int timeou bool ret = FALSE; GVariant *reply; - ret_dbus = dbus_handle_method_sync_with_reply_var_timeout(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply_timeout(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, method, param, &reply, timeout); @@ -76,7 +76,7 @@ static int get_id() int reply_id, ret_dbus; int ret = -1; - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_GETMMCPRIMARY, @@ -106,7 +106,7 @@ static bool block_showdevicelist() _D("----------------------------------------------------------------------------------"); - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_SHOWDEVICELIST, @@ -130,7 +130,7 @@ static bool block_getdevicelist(char *type) int ret = FALSE; _D("----------------------------------------------------------------------------------"); - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_GETDEVICELIST, @@ -172,7 +172,7 @@ static bool block_getdevicelist2(char *type) int ret_dbus; _D("----------------------------------------------------------------------------------"); - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_GETDEVICELIST2, @@ -237,7 +237,7 @@ static bool block_getdeviceinfo(int id) int ret_dbus; _D("----------------------------------------------------------------------------------"); - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_GETDEVICEINFO, @@ -275,7 +275,7 @@ static bool block_getmmcprimary() int ret_dbus; _D("----------------------------------------------------------------------------------"); - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, METHOD_BLOCK_GETMMCPRIMARY, diff --git a/src/auto-test/storage.c b/src/auto-test/storage.c index 89ef69a..c02d3b4 100644 --- a/src/auto-test/storage.c +++ b/src/auto-test/storage.c @@ -27,7 +27,7 @@ static bool request_storage_method(const char *method, GVariant *param) bool ret = FALSE; int ret_dbus; - ret_dbus = dbus_handle_method_sync_with_reply_var(STORAGED_BUS_NAME, + ret_dbus = gdbus_call_sync_with_reply(STORAGED_BUS_NAME, STORAGED_PATH_STORAGE, STORAGED_INTERFACE_STORAGE, method, param, &reply); diff --git a/src/auto-test/test.h b/src/auto-test/test.h index 90aab94..16e8ad9 100644 --- a/src/auto-test/test.h +++ b/src/auto-test/test.h @@ -21,7 +21,7 @@ #define STORAGED__TEST_H__ #include #include -#include +#include #include "log.h" #include "storaged_common.h" diff --git a/src/block/block.c b/src/block/block.c index e866ebe..f0e5b0b 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #ifdef EXTENDED_STORAGE @@ -409,7 +409,7 @@ static void broadcast_device_blocked(struct block_device *bdev) data = bdev->data; - ret_dbus = dbus_handle_emit_dbus_signal(NULL, + ret_dbus = gdbus_signal_emit(NULL, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, BLOCK_DEVICE_BLOCKED, @@ -465,7 +465,7 @@ static void broadcast_device_changed(struct block_device *bdev, /* Broadcast outside with BlockManager iface */ param = block_data_to_gvariant(data, flags); - ret_dbus = dbus_handle_emit_dbus_signal(NULL, + ret_dbus = gdbus_signal_emit(NULL, STORAGED_PATH_BLOCK_MANAGER, STORAGED_INTERFACE_BLOCK_MANAGER, signal_name, @@ -954,7 +954,7 @@ static void create_external_apps_directory(void) { int ret_dbus; - ret_dbus = dbus_handle_method_async_var(PKGDIR_BUS_NAME, PKGDIR_PATH, + ret_dbus = gdbus_call_async(PKGDIR_BUS_NAME, PKGDIR_PATH, PKGDIR_INTERFACE, "CreateExternalDirsForAllPkgs", NULL); if (ret_dbus) _E("Failed to create external directory."); @@ -1024,7 +1024,7 @@ static bool pipe_cb(int fd, void *data) create_external_apps_directory(); mmc_make_default_path(pdata.bdev->data->mount_point); - ret_val = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_val = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, MMC_POPUP_NOTI, @@ -1042,7 +1042,7 @@ static bool pipe_cb(int fd, void *data) pdata.bdev->data->primary && BLOCK_IS_FLAG_SET(pdata.bdev->data, UNMOUNT_UNSAFE)) { - ret_val = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret_val = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, MMC_POPUP_NOTI, @@ -2715,7 +2715,7 @@ static void booting_done(void) /* if there is the attached device, try to mount */ block_init_from_udev_enumerate(); - ret_val = dbus_handle_method_async_with_reply_var(DEVICED_BUS_NAME, + ret_val = gdbus_call_async_with_reply(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, METHOD_ADD_POWEROFF_WAIT, @@ -2749,7 +2749,7 @@ static void block_poweroff(GDBusConnection *conn, terminate_threads(); if (add_poweroff_wait) { - 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_REMOVE_POWEROFF_WAIT, @@ -2882,7 +2882,7 @@ static GVariant *request_mount_block(GDBusConnection *conn, if (onprivate) { bdev->on_private_op = REQ_PRIVATE; - bdev->private_pid = dbus_handle_get_sender_pid(NULL, sender); + bdev->private_pid = gdbus_connection_get_sender_pid(NULL, sender); _D("Private operation state(%d). pid=%d.", bdev->on_private_op, bdev->private_pid); } @@ -2956,7 +2956,7 @@ static GVariant *request_unmount_block(GDBusConnection *conn, } if (onprivate) { - pid = dbus_handle_get_sender_pid(NULL, sender); + pid = gdbus_connection_get_sender_pid(NULL, sender); if (bdev->on_private_op == REQ_NORMAL || (bdev->on_private_op != REQ_NORMAL && pid != bdev->private_pid)) { _E("Failed to process private unmount operation pid=%d private_pid=%d.", pid, bdev->private_pid); ret = -EPERM; @@ -3035,7 +3035,7 @@ static GVariant *request_format_block(GDBusConnection *conn, goto out; } - pid = dbus_handle_get_sender_pid(NULL, sender); + pid = gdbus_connection_get_sender_pid(NULL, sender); if (bdev->on_private_op != REQ_NORMAL && pid != bdev->private_pid) { _E("Failed to format on private state."); ret = -EPERM; @@ -3116,7 +3116,7 @@ static GVariant *request_format_block_type(GDBusConnection *conn, goto out; } - pid = dbus_handle_get_sender_pid(NULL, sender); + pid = gdbus_connection_get_sender_pid(NULL, sender); if (bdev->on_private_op != REQ_NORMAL && pid != bdev->private_pid) { _E("Failed to format on private state."); ret = -EPERM; @@ -3168,7 +3168,7 @@ out: static GVariant *block_data_to_gvariant(struct block_data *data, int flags) { if (!data) - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); return g_variant_new("(issssssisibii)", data->block_type, @@ -3270,7 +3270,7 @@ static GVariant *request_show_device_list(GDBusConnection *conn, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) { show_block_device_list(); - return dbus_handle_new_g_variant_tuple(); + return gdbus_new_g_variant_tuple(); } static enum block_device_type get_bdev_type_from_type_string(const char *type_str) @@ -3701,7 +3701,7 @@ static void block_init(void *data) _E("Failed to mount tmpfs to root mount path: %d", ret_val); /* register block manager object and interface */ - ret_val = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_BLOCK_MANAGER, &block_interface); + ret_val = gdbus_register_object(NULL, STORAGED_PATH_BLOCK_MANAGER, &block_interface); if (ret_val < 0) _E("Failed to register block interface and methods: %d", ret_val); @@ -3737,7 +3737,7 @@ static void block_init(void *data) if (ret_val < 0) _E("Failed to get internal storage number."); - id_block_poweroff = subscribe_dbus_signal(NULL, DEVICED_PATH_POWEROFF, + id_block_poweroff = gdbus_signal_subscribe(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, block_poweroff, NULL, NULL); @@ -3776,7 +3776,7 @@ static void block_exit(void *data) udev_exit(NULL); /* unregister notifier for below each event */ - unsubscribe_dbus_signal(NULL, id_block_poweroff); + gdbus_signal_unsubscribe(NULL, id_block_poweroff); /* unregister mmc uevent control routine */ ret_val = unregister_udev_uevent_control(&uh); @@ -3792,7 +3792,7 @@ static void block_exit(void *data) pipe_exit(); if (add_poweroff_wait) { - ret_val = dbus_handle_method_sync_var(DEVICED_BUS_NAME, + ret_val = gdbus_call_sync_with_reply_int(DEVICED_BUS_NAME, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, METHOD_REMOVE_POWEROFF_WAIT, diff --git a/src/core/dbus_main.c b/src/core/dbus_main.c index d63d992..02695cb 100644 --- a/src/core/dbus_main.c +++ b/src/core/dbus_main.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include "fd_handler.h" #include "log.h" diff --git a/src/core/dbus_main.h b/src/core/dbus_main.h index d43ac79..8efa069 100644 --- a/src/core/dbus_main.h +++ b/src/core/dbus_main.h @@ -19,7 +19,7 @@ #ifndef __STORAGED_DBUS_MAIN_H__ #define __STORAGED_DBUS_MAIN_H__ -#include +#include int set_dbus_connection(const char *bus); diff --git a/src/core/main.c b/src/core/main.c index 6a32315..346212b 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -93,17 +93,17 @@ int main(int argc, char **argv) return -ENOMEM; } - 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.");; dir_init(); modules_init(NULL); - ret = dbus_handle_request_bus_name(handle, STORAGED_BUS_NAME, dbus_name_acquired, NULL); + ret = gdbus_request_name(handle, STORAGED_BUS_NAME, dbus_name_acquired, NULL); if (ret <= 0) { _E("Failed to request bus name."); - dbus_handle_check_owner_name(NULL, STORAGED_BUS_NAME); + gdbus_check_name_owner(NULL, STORAGED_BUS_NAME); } signal(SIGTERM, sig_quit); diff --git a/src/shared/apps.c b/src/shared/apps.c index 2e25a52..2257a75 100644 --- a/src/shared/apps.c +++ b/src/shared/apps.c @@ -79,7 +79,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, diff --git a/src/shared/apps.h b/src/shared/apps.h index 908a200..9b0d67a 100644 --- a/src/shared/apps.h +++ b/src/shared/apps.h @@ -19,7 +19,7 @@ #ifndef __APPS_H__ #define __APPS_H__ -#include +#include #define POPUP_DEFAULT "system" diff --git a/src/shared/udev.c b/src/shared/udev.c index 196bda0..21d902f 100644 --- a/src/shared/udev.c +++ b/src/shared/udev.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "log.h" @@ -283,7 +283,7 @@ static void device_change_poweroff(GDBusConnection *conn, void udev_init(void *data) { - id_device_change_poweroff = subscribe_dbus_signal(NULL, DEVICED_PATH_POWEROFF, + id_device_change_poweroff = gdbus_signal_subscribe(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, device_change_poweroff, @@ -298,5 +298,5 @@ void udev_init(void *data) void udev_exit(void *data) { - unsubscribe_dbus_signal(NULL, id_device_change_poweroff); + gdbus_signal_unsubscribe(NULL, id_device_change_poweroff); } diff --git a/src/storage/storage.c b/src/storage/storage.c index f960d77..1cbf337 100644 --- a/src/storage/storage.c +++ b/src/storage/storage.c @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include "log.h" @@ -179,7 +179,7 @@ static void memcleanup_send_broadcast(struct storage_config_info *info, enum mem _D("time=%s path=%d level=%s", buf, path, value); out: - ret_dbus = dbus_handle_emit_dbus_signal(NULL, + ret_dbus = gdbus_signal_emit(NULL, STORAGED_PATH_LOWMEM, STORAGED_INTERFACE_LOWMEM, SIGNAL_NEED_CLEANUP, @@ -217,7 +217,7 @@ static int launch_memory_popup(int num, ...) va_start(args, num); - ret = dbus_handle_method_async_pairs_with_reply(POPUP_BUS_NAME, + ret = gdbus_call_pairs_async_with_reply(POPUP_BUS_NAME, POPUP_PATH_SYSTEM, POPUP_INTERFACE_SYSTEM, "PopupLaunch", @@ -257,7 +257,7 @@ static int remove_notification(void) { int ret; - ret = dbus_handle_method_sync_var(POPUP_BUS_NAME, + ret = gdbus_call_sync_with_reply_int(POPUP_BUS_NAME, POPUP_PATH_NOTI, POPUP_INTERFACE_NOTI, INTERNAL_STORAGE_NOTIOFF, @@ -273,7 +273,7 @@ static int create_notification(void) { int ret; - 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, INTERNAL_STORAGE_NOTION, @@ -551,7 +551,7 @@ static GVariant *dbus_get_storage_status(GDBusConnection *conn, dAvail = (unsigned long long)s.f_bsize * s.f_bavail; } - pid = dbus_handle_get_sender_pid(NULL, sender); + pid = gdbus_connection_get_sender_pid(NULL, sender); _D("PID=%d path='%s' total=%4.0llu avail=%4.0llu", pid, str_path, dTotal, dAvail); @@ -571,7 +571,7 @@ static GVariant *dbus_getstatvfs(GDBusConnection *conn, storage_get_memory_size(str_path, &s); - pid = dbus_handle_get_sender_pid(NULL, sender); + pid = gdbus_connection_get_sender_pid(NULL, sender); _D("PID=%d path='%s'", pid, str_path); @@ -700,7 +700,7 @@ static void storage_init(void *data) storage_config_load(&storage_internal_info); - ret_val = dbus_handle_register_dbus_object(NULL, STORAGED_PATH_STORAGE, + ret_val = gdbus_register_object(NULL, STORAGED_PATH_STORAGE, &storage_interface); if (ret_val < 0) _E("Failed to register dbus interface and methods: %d", ret_val); @@ -714,7 +714,7 @@ static void storage_init(void *data) init_cleanup_storage(); - id_storage_poweroff = subscribe_dbus_signal(NULL, DEVICED_PATH_POWEROFF, + id_storage_poweroff = gdbus_signal_subscribe(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, storage_poweroff, NULL, NULL); @@ -726,7 +726,7 @@ static void storage_exit(void *data) { free_cleanup_storage(); /* unregister notifier for below each event */ - unsubscribe_dbus_signal(NULL, id_storage_poweroff); + gdbus_signal_unsubscribe(NULL, id_storage_poweroff); } static storaged_module_interface storage_module = { -- 2.7.4