diff options
Diffstat (limited to 'src/power/power-handler.c')
| -rw-r--r-- | src/power/power-handler.c | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/src/power/power-handler.c b/src/power/power-handler.c index b4f35818..e07f18f3 100644 --- a/src/power/power-handler.c +++ b/src/power/power-handler.c @@ -544,7 +544,7 @@ static GVariant *dbus_power_handler(GDBusConnection *conn, int ret; char *type_str; - g_variant_get(param, "(si)", &type_str, NULL); + g_variant_get(param, "(s)", &type_str); ret = check_sender_process(conn, sender); if (ret < 0) @@ -580,27 +580,6 @@ out: return g_variant_new("(i)", ret); } -static GVariant *request_reboot(GDBusConnection *conn, - const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, - GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) -{ - char *str; - int ret; - - g_variant_get(param, "(s)", &str); - - ret = check_sender_process(conn, sender); - if (ret < 0) - goto out; - - _I("Poweroff PID(%d) requests reboot with command(%s).", ret, str); - ret = power_execute_pid(POWER_REBOOT, NULL); - -out: - g_free(str); - return g_variant_new("(i)", ret); -} - static GVariant *add_poweroff_time(GDBusConnection *conn, const gchar *sender, const gchar *path, const gchar *iface, const gchar *name, GVariant *param, GDBusMethodInvocation *invocation, gpointer user_data) @@ -689,10 +668,9 @@ out: } static const dbus_method_s dbus_methods[] = { - { POWER_REBOOT, "si", "i", dbus_power_handler }, - { "RebootWithOption", "ss", "i", dbus_power_option_handler }, + { "Poweroff", "s", "i", dbus_power_handler }, + { "PoweroffWithOption", "ss", "i", dbus_power_option_handler }, /* Public API device_power_reboot() calls this dbus method. */ - { "Reboot", "s", "i", request_reboot }, { "AddPoweroffWait", NULL, "i", add_poweroff_time }, { "RemovePoweroffWait", NULL, "i", remove_poweroff_time }, /* Add methods here */ @@ -700,7 +678,7 @@ static const dbus_method_s dbus_methods[] = { static const dbus_interface_u dbus_interface = { .oh = NULL, - .name = DEVICED_INTERFACE_REBOOT, + .name = DEVICED_INTERFACE_POWEROFF, .methods = dbus_methods, .nr_methods = ARRAY_SIZE(dbus_methods), }; @@ -773,7 +751,7 @@ static void power_init(void *data) int ret; /* init dbus interface */ - ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_REBOOT, &dbus_interface); + ret = dbus_handle_add_dbus_object(NULL, DEVICED_PATH_POWEROFF, &dbus_interface); if (ret < 0) _E("Failed to init dbus method: %d", ret); @@ -784,7 +762,6 @@ static void power_init(void *data) add_poweroff_option(POWEROFF_TYPE_POWEROFF, NULL); add_poweroff_option(POWEROFF_TYPE_RESTART, NULL); add_poweroff_option(POWEROFF_TYPE_POPUP, NULL); - add_poweroff_option(POWEROFF_TYPE_RESTART, NULL); ret = config_parse(POWER_CONF_FILE, load_config, NULL); if (ret < 0) |