Change the method name for PowerOffWait

Change-Id: Idd53dc0d20c675edb1c030d620df174024211031
Signed-off-by: sinikang <sinikang@samsung.com>

diff --git a/packaging/tel-plugin-manager.spec b/packaging/tel-plugin-manager.spec
index 9b7c64ff7e90bd24e918edde30e0e6e050b7b77c..c1eb3359c89f4bab6f2e76985bf5a05835174d3d 100644 (file)
--- a/packaging/tel-plugin-manager.spec
+++ b/packaging/tel-plugin-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 16
+%define patchlevel 17
 
 Name:           tel-plugin-manager
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/manager_modem.c b/src/manager_modem.c
index 54029991edbb903e792803ed85607e7b04f49029..5718b30f0237ebcd62fd2a6e0a748adc63310860 100644 (file)
--- a/src/manager_modem.c
+++ b/src/manager_modem.c
@@ -59,17 +59,14 @@
  * Dbus interface info for power off wait timer handling
  */
 #define DEVICED_BUS_NAME                                       "org.tizen.system.deviced"
-#define DEVICED_OBJECT_PATH                                    "/Org/Tizen/System/DeviceD"
-#define DEVICED_INTERFACE_NAME              DEVICED_BUS_NAME
+#define DEVICED_OBJECT_PATH                            "/Org/Tizen/System/DeviceD"
+#define DEVICED_INTERFACE_NAME                 DEVICED_BUS_NAME
 
-#define DEVICED_PATH_REBOOT                                    DEVICED_OBJECT_PATH"/Reboot"
-#define DEVICED_PATH_POWEROFF                          DEVICED_OBJECT_PATH"/PowerOff"
+#define DEVICED_PATH_POWEROFF                  DEVICED_OBJECT_PATH"/PowerOff"
+#define DEVICED_INTERFACE_POWEROFF             DEVICED_INTERFACE_NAME".PowerOff"
 
-#define DEVICED_INTERFACE_REBOOT                       DEVICED_INTERFACE_NAME".reboot"
-#define DEVICED_INTERFACE_POWEROFF                     DEVICED_INTERFACE_NAME".PowerOff"
-
-#define DBUS_METHOD_ADD_POWEROFF_WAIT          "AddPoweroffWait"
-#define DBUS_METHOD_REMOVE_POWEROFF_WAIT       "RemovePoweroffWait"
+#define DBUS_METHOD_ADD_POWEROFF_WAIT          "AddPowerOffWait"
+#define DBUS_METHOD_REMOVE_POWEROFF_WAIT       "RemovePowerOffWait"
 #define DBUS_SIGNAL_POWEROFF_STATE                     "ChangeState"
 
 static void __manager_modem_add_poweroff_wait(ModemPrivateInfo *modem_info);
@@ -400,7 +397,7 @@ static void __manager_modem_add_poweroff_wait_cb(GObject *source_object, GAsyncR
                err("Failed: %s", error->message);
                g_error_free(error);
        } else {
-               dbg("PoweroffWait Added Successufully");
+               dbg("PowerOffWait Added Successufully");
                modem_info->sys_power.set_poweroff_wait = TRUE;
        }
 
@@ -428,7 +425,7 @@ static void __manager_modem_add_poweroff_wait(ModemPrivateInfo *modem_info)
 
        if (modem_info->sys_power.conn) {
                g_dbus_connection_call(modem_info->sys_power.conn, DEVICED_BUS_NAME,
-                                       DEVICED_PATH_REBOOT, DEVICED_INTERFACE_REBOOT, DBUS_METHOD_ADD_POWEROFF_WAIT,
+                                       DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, DBUS_METHOD_ADD_POWEROFF_WAIT,
                                        NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
                                        MANAGER_DEFAULT_TIMEOUT, modem_info->sys_power.ca,
                                        __manager_modem_add_poweroff_wait_cb, modem_info);
@@ -455,7 +452,7 @@ static void __manager_modem_remove_poweroff_wait_cb(GObject *source_object, GAsy
                err("Failed: %s", error->message);
                g_error_free(error);
        } else {
-               dbg("PoweroffWait Removed Successufully");
+               dbg("PowerOffWait Removed Successufully");
                modem_info->sys_power.set_poweroff_wait = FALSE;
        }
 
@@ -478,7 +475,7 @@ static void __manager_modem_remove_poweroff_wait(ModemPrivateInfo *modem_info)
 
        if (modem_info->sys_power.conn) {
                g_dbus_connection_call(modem_info->sys_power.conn, DEVICED_BUS_NAME,
-                                       DEVICED_PATH_REBOOT, DEVICED_INTERFACE_REBOOT, DBUS_METHOD_REMOVE_POWEROFF_WAIT,
+                                       DEVICED_PATH_POWEROFF, DEVICED_INTERFACE_POWEROFF, DBUS_METHOD_REMOVE_POWEROFF_WAIT,
                                        NULL, NULL, G_DBUS_CALL_FLAGS_NONE,
                                        MANAGER_DEFAULT_TIMEOUT, modem_info->sys_power.ca,
                                        __manager_modem_remove_poweroff_wait_cb, NULL);