From 6fc7bfeed51deffa27caee18ada728ca80548e65 Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Fri, 3 Mar 2017 21:55:10 +0900 Subject: [PATCH] common : change path and interface of dbus for power off Change-Id: Iae23187b256a53a9034b196f809f3dd61ef5a5a2 Signed-off-by: lokilee73 --- src/battery/battery-mobile.c | 4 ++-- src/battery/battery-wearable.c | 4 ++-- src/cooldown/cooldown-wearable.c | 4 ++-- src/org.tizen.system-syspopup.xml | 1 + src/overheat/org.tizen.overheat-syspopup.xml | 1 + src/overheat/overheat.c | 4 ++-- src/powerkey/org.tizen.powerkey-syspopup.xml | 1 + src/powerkey/powerkey-mobile.c | 4 ++-- src/powerkey/powerkey-tv.c | 4 ++-- src/powerkey/powerkey-wearable.c | 4 ++-- 10 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/battery/battery-mobile.c b/src/battery/battery-mobile.c index 2797423..3db6bb8 100755 --- a/src/battery/battery-mobile.c +++ b/src/battery/battery-mobile.c @@ -24,8 +24,8 @@ #define SYSTEMD_STOP_POWER_OFF 4 #define DEVICED_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/battery/battery-wearable.c b/src/battery/battery-wearable.c index d0d68f7..5bb6c85 100755 --- a/src/battery/battery-wearable.c +++ b/src/battery/battery-wearable.c @@ -29,8 +29,8 @@ static const struct popup_ops charge_error_high_ops; static const struct popup_ops battery_disconnected_ops; #define DEVICED_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/cooldown/cooldown-wearable.c b/src/cooldown/cooldown-wearable.c index 0d5b3e6..942ab2c 100755 --- a/src/cooldown/cooldown-wearable.c +++ b/src/cooldown/cooldown-wearable.c @@ -28,8 +28,8 @@ #define COOL_DOWN_RELEASE "Release" #define POWER_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME POWER_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME POWER_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/org.tizen.system-syspopup.xml b/src/org.tizen.system-syspopup.xml index caccf91..a1aa245 100755 --- a/src/org.tizen.system-syspopup.xml +++ b/src/org.tizen.system-syspopup.xml @@ -8,6 +8,7 @@ http://tizen.org/privilege/power + http://tizen.org/privilege/reboot http://tizen.org/privilege/display http://tizen.org/privilege/appmanager.launch http://tizen.org/privilege/window.priority.set diff --git a/src/overheat/org.tizen.overheat-syspopup.xml b/src/overheat/org.tizen.overheat-syspopup.xml index d6418c5..a4fadda 100755 --- a/src/overheat/org.tizen.overheat-syspopup.xml +++ b/src/overheat/org.tizen.overheat-syspopup.xml @@ -8,6 +8,7 @@ http://tizen.org/privilege/power + http://tizen.org/privilege/reboot http://tizen.org/privilege/window.priority.set diff --git a/src/overheat/overheat.c b/src/overheat/overheat.c index f7e5043..e83fb55 100755 --- a/src/overheat/overheat.c +++ b/src/overheat/overheat.c @@ -23,8 +23,8 @@ #define SYSTEMD_STOP_POWER_OFF 4 #define POWER_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME POWER_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME POWER_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/powerkey/org.tizen.powerkey-syspopup.xml b/src/powerkey/org.tizen.powerkey-syspopup.xml index 40a2de0..6a51cda 100755 --- a/src/powerkey/org.tizen.powerkey-syspopup.xml +++ b/src/powerkey/org.tizen.powerkey-syspopup.xml @@ -8,6 +8,7 @@ http://tizen.org/privilege/power + http://tizen.org/privilege/reboot http://tizen.org/privilege/window.priority.set http://tizen.org/privilege/haptic http://tizen.org/privilege/systemsettings.admin diff --git a/src/powerkey/powerkey-mobile.c b/src/powerkey/powerkey-mobile.c index 5ff7bc0..7ee45df 100755 --- a/src/powerkey/powerkey-mobile.c +++ b/src/powerkey/powerkey-mobile.c @@ -22,8 +22,8 @@ #define SYSTEMD_STOP_POWER_OFF 4 #define DEVICED_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/powerkey/powerkey-tv.c b/src/powerkey/powerkey-tv.c index e9ecaab..868243e 100755 --- a/src/powerkey/powerkey-tv.c +++ b/src/powerkey/powerkey-tv.c @@ -22,8 +22,8 @@ #define SYSTEMD_STOP_POWER_OFF 4 #define DEVICED_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" diff --git a/src/powerkey/powerkey-wearable.c b/src/powerkey/powerkey-wearable.c index a9857eb..fbfcfab 100755 --- a/src/powerkey/powerkey-wearable.c +++ b/src/powerkey/powerkey-wearable.c @@ -24,8 +24,8 @@ #define SYSTEMD_STOP_POWER_OFF 4 #define DEVICED_BUS_NAME "org.tizen.system.deviced" -#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Power" -#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".power" +#define POWER_OBJECT_PATH "/Org/Tizen/System/DeviceD/Reboot" +#define POWER_INTERFACE_NAME DEVICED_BUS_NAME".reboot" #define POWER_METHOD "reboot" #define POWER_OPERATION_OFF "poweroff" -- 2.7.4