power: apply modified dbus spec

Change-Id: Ic17bba4c4a2b81c87deb0ff72636cec3d11b85cc
Signed-off-by: sanghyeok.oh <sanghyeok.oh@samsung.com>

diff --git a/src/dbus.h b/src/dbus.h
index 2ae4d77..8bea4e9 100644 (file)
--- a/src/dbus.h
+++ b/src/dbus.h
@@ -51,8 +51,8 @@
 #define DEVICED_INTERFACE_POWER             DEVICED_INTERFACE_NAME".power"
 
 /* Reboot service: request reboot operation */
-#define DEVICED_PATH_REBOOT                 DEVICED_OBJECT_PATH"/Reboot"
-#define DEVICED_INTERFACE_REBOOT            DEVICED_INTERFACE_NAME".reboot"
+#define DEVICED_PATH_POWEROFF                 DEVICED_OBJECT_PATH"/PowerOff"
+#define DEVICED_INTERFACE_POWEROFF            DEVICED_INTERFACE_NAME".PowerOff"
 
 /* IR service: transmit IR commands */
 #define DEVICED_PATH_IR                  DEVICED_OBJECT_PATH"/Ir"

diff --git a/src/power.c b/src/power.c
index 92499d2..0abfd3d 100644 (file)
--- a/src/power.c
+++ b/src/power.c
@@ -44,11 +44,11 @@
 #define PM_RESET_TIMER  0x1 /**< reset timer for unlock */
 #define PM_KEEP_TIMER   0x2 /**< keep timer for unlock */
 
-#define METHOD_LOCK_STATE       "lockstate"
-#define METHOD_UNLOCK_STATE     "unlockstate"
-#define METHOD_CHANGE_STATE     "changestate"
-#define METHOD_REBOOT           "Reboot"
-#define METHOD_REBOOT_WITH_OPTION "RebootWithOption"
+#define METHOD_LOCK_STATE           "lockstate"
+#define METHOD_UNLOCK_STATE         "unlockstate"
+#define METHOD_CHANGE_STATE         "changestate"
+#define METHOD_POWEROFF             "Poweroff"
+#define METHOD_POWEROFF_WITH_OPTION "PoweroffWithOption"
 
 #define TYPE_REBOOT             "reboot"
 #define REBOOT_REASON_NONE      ""
@@ -520,17 +520,17 @@ int device_power_reboot(const char *reason)
        if (reason) {
                arr[0] = TYPE_REBOOT;
                arr[1] = (char *)reason;
-               method = METHOD_REBOOT_WITH_OPTION;
+               method = METHOD_POWEROFF_WITH_OPTION;
                sig = "ss";
        } else {
-               arr[0] = REBOOT_REASON_NONE;
-               method = METHOD_REBOOT;
+               arr[0] = TYPE_REBOOT;
+               method = METHOD_POWEROFF;
                sig = "s";
        }
 
        ret = dbus_method_sync(DEVICED_BUS_NAME,
-                       DEVICED_PATH_REBOOT,
-                       DEVICED_INTERFACE_REBOOT,
+                       DEVICED_PATH_POWEROFF,
+                       DEVICED_INTERFACE_POWEROFF,
                        method, sig, arr);
        return errno_to_device_error(ret);
 }