From 65ab172e48078e739daf9f018d83d2e531651c92 Mon Sep 17 00:00:00 2001 From: "sanghyeok.oh" Date: Fri, 16 Aug 2019 10:56:36 +0900 Subject: [PATCH] dbus: modified to use renamed api change 'dbus_handle_broadcast_dbus_signal' to 'dbus_handle_emit_dbus_signal' Change-Id: If35e9bc2bb52c15585a57a8a012be3bedadd79ff Signed-off-by: sanghyeok.oh --- plugins/iot/display/core.c | 6 +++--- plugins/iot/display/key-filter.c | 6 +++--- plugins/mobile/display/core.c | 6 +++--- plugins/mobile/display/key-filter.c | 6 +++--- plugins/tv/display/core.c | 6 +++--- plugins/tv/display/key-filter.c | 6 +++--- plugins/tv/display/state-tv.c | 10 +++++----- plugins/wearable/display/core.c | 6 +++--- plugins/wearable/display/enhance.c | 2 +- plugins/wearable/display/key-filter.c | 6 +++--- src/battery/battery-time.c | 2 +- src/battery/power-supply.c | 6 +++--- src/display/ambient-mode.c | 2 +- src/dump/dump.c | 2 +- src/extcon/cradle.c | 2 +- src/extcon/earjack.c | 2 +- src/extcon/hdmi.c | 2 +- src/led/torch.c | 2 +- src/power/power-handler.c | 2 +- src/time/time-handler.c | 2 +- src/usb/usb-dbus.c | 6 +++--- src/usbhost/usb-host.c | 2 +- 22 files changed, 46 insertions(+), 46 deletions(-) diff --git a/plugins/iot/display/core.c b/plugins/iot/display/core.c index 7522866..5f08790 100644 --- a/plugins/iot/display/core.c +++ b/plugins/iot/display/core.c @@ -229,7 +229,7 @@ static void set_process_active(bool flag, pid_t pid) return; /* Send dbug to resourced */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, RESOURCED_METHOD_ACTIVE, @@ -311,7 +311,7 @@ static 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_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -343,7 +343,7 @@ static void broadcast_lcd_off(enum signal_type type, enum device_flags flags) str = UNKNOWN_STR; _I("lcdstep : Broadcast signal(%s).", signal); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, diff --git a/plugins/iot/display/key-filter.c b/plugins/iot/display/key-filter.c index b55e311..8b35f7c 100644 --- a/plugins/iot/display/key-filter.c +++ b/plugins/iot/display/key-filter.c @@ -180,7 +180,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -189,7 +189,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -404,7 +404,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_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/plugins/mobile/display/core.c b/plugins/mobile/display/core.c index c2bafa2..9d3f642 100644 --- a/plugins/mobile/display/core.c +++ b/plugins/mobile/display/core.c @@ -230,7 +230,7 @@ static void set_process_active(bool flag, pid_t pid) return; /* Send dbug to resourced */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, RESOURCED_METHOD_ACTIVE, @@ -312,7 +312,7 @@ static 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_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -344,7 +344,7 @@ static void broadcast_lcd_off(enum signal_type type, enum device_flags flags) str = UNKNOWN_STR; _I("lcdstep : Broadcast signal(%s).", signal); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, diff --git a/plugins/mobile/display/key-filter.c b/plugins/mobile/display/key-filter.c index a407b03..3462aa7 100644 --- a/plugins/mobile/display/key-filter.c +++ b/plugins/mobile/display/key-filter.c @@ -180,7 +180,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -189,7 +189,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -462,7 +462,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_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/plugins/tv/display/core.c b/plugins/tv/display/core.c index 920245f..79bd919 100644 --- a/plugins/tv/display/core.c +++ b/plugins/tv/display/core.c @@ -231,7 +231,7 @@ static void set_process_active(bool flag, pid_t pid) return; /* Send dbug to resourced */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, RESOURCED_METHOD_ACTIVE, @@ -313,7 +313,7 @@ static 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_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -345,7 +345,7 @@ static void broadcast_lcd_off(enum signal_type type, enum device_flags flags) str = UNKNOWN_STR; _I("lcdstep : Broadcast signal(%s).", signal); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, diff --git a/plugins/tv/display/key-filter.c b/plugins/tv/display/key-filter.c index b55e311..8b35f7c 100644 --- a/plugins/tv/display/key-filter.c +++ b/plugins/tv/display/key-filter.c @@ -180,7 +180,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -189,7 +189,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -404,7 +404,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_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/plugins/tv/display/state-tv.c b/plugins/tv/display/state-tv.c index e50463c..b99ea0f 100644 --- a/plugins/tv/display/state-tv.c +++ b/plugins/tv/display/state-tv.c @@ -129,7 +129,7 @@ static int lcdon_pre(void *data) if (pm_cur_state == S_STANDBY) { _I("send pre state change NORMAL"); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_PRE_CHANGE_STATE, @@ -147,7 +147,7 @@ static int lcdon_post(void *data) { int ret; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -221,7 +221,7 @@ static int lcdoff_post(void *data) int ret; /* broadcast to other application */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -301,7 +301,7 @@ static int standby_post(void *data) int ret; /* broadcast to other application */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_CHANGE_STATE, @@ -403,7 +403,7 @@ static int suspend_post(void *data) _E("Fail to change state to next_state(%s)", states[cond].name); /* Broadcast pre-wakeup signal */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_POWER, DEVICED_INTERFACE_POWER, SIGNAL_PRE_WAKEUP, diff --git a/plugins/wearable/display/core.c b/plugins/wearable/display/core.c index ea99bab..3f8c686 100644 --- a/plugins/wearable/display/core.c +++ b/plugins/wearable/display/core.c @@ -230,7 +230,7 @@ static void set_process_active(bool flag, pid_t pid) return; /* Send dbug to resourced */ - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, RESOURCED_PATH_PROCESS, RESOURCED_INTERFACE_PROCESS, RESOURCED_METHOD_ACTIVE, @@ -312,7 +312,7 @@ static 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_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, @@ -344,7 +344,7 @@ static void broadcast_lcd_off(enum signal_type type, enum device_flags flags) str = UNKNOWN_STR; _I("lcdstep : Broadcast signal(%s).", signal); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, diff --git a/plugins/wearable/display/enhance.c b/plugins/wearable/display/enhance.c index 51b9c84..4b60807 100644 --- a/plugins/wearable/display/enhance.c +++ b/plugins/wearable/display/enhance.c @@ -154,7 +154,7 @@ static void enhance_init(void *data) state = enhance_update_state(); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, "Enhance", diff --git a/plugins/wearable/display/key-filter.c b/plugins/wearable/display/key-filter.c index 5ae407e..01e43ff 100644 --- a/plugins/wearable/display/key-filter.c +++ b/plugins/wearable/display/key-filter.c @@ -199,7 +199,7 @@ static inline void check_key_pair(int code, int new, int *old) static inline void broadcast_lcdon_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDON_BY_POWERKEY, @@ -208,7 +208,7 @@ static inline void broadcast_lcdon_by_powerkey(void) static inline void broadcast_lcdoff_by_powerkey(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, SIGNAL_LCDOFF_BY_POWERKEY, @@ -503,7 +503,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_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_KEY, DEVICED_INTERFACE_KEY, SIGNAL_CHANGE_HARDKEY, diff --git a/src/battery/battery-time.c b/src/battery/battery-time.c index 5b86e63..d7bc170 100644 --- a/src/battery/battery-time.c +++ b/src/battery/battery-time.c @@ -225,7 +225,7 @@ static void broadcast_battery_time(char *signal, int time) if (!signal) return; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, signal, diff --git a/src/battery/power-supply.c b/src/battery/power-supply.c index bbc61e7..2bf2db1 100644 --- a/src/battery/power-supply.c +++ b/src/battery/power-supply.c @@ -150,7 +150,7 @@ static int power_supply_broadcast_str(char *sig, char *status) str = status; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, sig, @@ -183,7 +183,7 @@ static void abnormal_popup_timer_init(void) static void health_status_broadcast(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, SIGNAL_TEMP_GOOD, @@ -423,7 +423,7 @@ int power_supply_broadcast(char *sig, int status) snprintf(sig_old, sizeof(sig_old), "%s", sig); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_BATTERY, DEVICED_INTERFACE_BATTERY, sig, diff --git a/src/display/ambient-mode.c b/src/display/ambient-mode.c index 8de1c39..7192f44 100644 --- a/src/display/ambient-mode.c +++ b/src/display/ambient-mode.c @@ -51,7 +51,7 @@ void broadcast_ambient_state(int state) char *signal; signal = (state == true ? SIGNAL_ALPM_ON : SIGNAL_ALPM_OFF); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_DISPLAY, DEVICED_INTERFACE_DISPLAY, signal, diff --git a/src/dump/dump.c b/src/dump/dump.c index b3c29a1..1695628 100644 --- a/src/dump/dump.c +++ b/src/dump/dump.c @@ -39,7 +39,7 @@ static void send_dump_signal(char *signal) pid = getpid(); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DUMP_SERVICE_OBJECT_PATH, DUMP_SERVICE_INTERFACE_NAME, signal, diff --git a/src/extcon/cradle.c b/src/extcon/cradle.c index 1c46ea3..2f37d04 100644 --- a/src/extcon/cradle.c +++ b/src/extcon/cradle.c @@ -44,7 +44,7 @@ static void cradle_send_broadcast(int status) _I("Broadcast cradle status(%d).", status); old = status; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_CRADLE_STATE, diff --git a/src/extcon/earjack.c b/src/extcon/earjack.c index 8f76f88..aa40699 100644 --- a/src/extcon/earjack.c +++ b/src/extcon/earjack.c @@ -41,7 +41,7 @@ static void earjack_send_broadcast(int status) _I("Broadcast earjack status(%d).", status); old = status; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_EARJACK_STATE, diff --git a/src/extcon/hdmi.c b/src/extcon/hdmi.c index e145132..1a3b2f6 100644 --- a/src/extcon/hdmi.c +++ b/src/extcon/hdmi.c @@ -41,7 +41,7 @@ static void hdmi_send_broadcast(int status) _I("Broadcast hdmi status(%d)", status); old = status; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_SYSNOTI, DEVICED_INTERFACE_SYSNOTI, SIGNAL_HDMI_STATE, diff --git a/src/led/torch.c b/src/led/torch.c index 4b1e807..2024ebd 100644 --- a/src/led/torch.c +++ b/src/led/torch.c @@ -46,7 +46,7 @@ static void flash_state_broadcast(int val) { int ret; - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_LED, DEVICED_INTERFACE_LED, SIGNAL_FLASH_STATE, diff --git a/src/power/power-handler.c b/src/power/power-handler.c index e6ce746..4303a4d 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -450,7 +450,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_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, SIGNAL_POWEROFF_STATE, diff --git a/src/time/time-handler.c b/src/time/time-handler.c index a706aa0..82169e2 100644 --- a/src/time/time-handler.c +++ b/src/time/time-handler.c @@ -227,7 +227,7 @@ int set_timezone_action(int argc, char **argv) static void time_changed_broadcast(void) { - dbus_handle_broadcast_dbus_signal(NULL, + dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_TIME, DEVICED_INTERFACE_TIME, TIME_CHANGE_SIGNAL, NULL); } diff --git a/src/usb/usb-dbus.c b/src/usb/usb-dbus.c index eefb98f..b83e64c 100644 --- a/src/usb/usb-dbus.c +++ b/src/usb/usb-dbus.c @@ -76,7 +76,7 @@ void broadcast_usb_config_enabled(int state) _I("USB config(%d) enabled.", state); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_USB, DEVICED_INTERFACE_USB, SIGNAL_CONFIG_ENABLED, @@ -98,7 +98,7 @@ void broadcast_usb_state_changed(void) _I("USB state(%u) changed.", state); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_USB, DEVICED_INTERFACE_USB, SIGNAL_STATE_CHANGED, @@ -120,7 +120,7 @@ void broadcast_usb_mode_changed(void) _I("USB mode(%u) changed.", mode); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_USB, DEVICED_INTERFACE_USB, SIGNAL_MODE_CHANGED, diff --git a/src/usbhost/usb-host.c b/src/usbhost/usb-host.c index 76e7f72..3f95ea9 100644 --- a/src/usbhost/usb-host.c +++ b/src/usbhost/usb-host.c @@ -189,7 +189,7 @@ static void broadcast_usbhost_signal(enum usbhost_state state, (usbhost->product ? usbhost->product : ""), (usbhost->serial ? usbhost->serial : "")); - ret = dbus_handle_broadcast_dbus_signal(NULL, + ret = dbus_handle_emit_dbus_signal(NULL, DEVICED_PATH_USBHOST, DEVICED_INTERFACE_USBHOST, SIGNAL_USB_HOST_CHANGED, -- 2.7.4