mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-09-29 14:17:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

swayidle: when acquiring sleep lock, initialize and free variables properly

Browse source
This commit is contained in:
Ian Fan 2018-11-01 23:55:41 +00:00 committed by emersion
parent 827e5513e0
commit 6e2dccc2e9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swayidle/main.c
View file

@ -81,16 +81,16 @@ static int release_lock(void *data) {
} }
static void acquire_sleep_lock(void) { static void acquire_sleep_lock(void) {
sd_bus_message *msg; sd_bus_message *msg = NULL;
sd_bus_error error; sd_bus_error error = SD_BUS_ERROR_NULL;
int ret = sd_bus_call_method(bus, "org.freedesktop.login1", int ret = sd_bus_call_method(bus, "org.freedesktop.login1",
"/org/freedesktop/login1", "/org/freedesktop/login1",
"org.freedesktop.login1.Manager", "Inhibit", "org.freedesktop.login1.Manager", "Inhibit",
&error, &msg, "ssss", "sleep", "swayidle", &error, &msg, "ssss", "sleep", "swayidle",
"Setup Up Lock Screen", "delay"); "Setup Up Lock Screen", "delay");
if (ret < 0) { if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to send Inhibit signal: %s", wlr_log(WLR_ERROR, "Failed to send Inhibit signal: %s", error.message);
strerror(-ret)); sd_bus_error_free(&error);
return; return;
} }
@ -98,10 +98,11 @@ static void acquire_sleep_lock(void) {
if (ret < 0) { if (ret < 0) {
wlr_log(WLR_ERROR, "Failed to parse D-Bus response for Inhibit: %s", wlr_log(WLR_ERROR, "Failed to parse D-Bus response for Inhibit: %s",
strerror(-ret)); strerror(-ret));
return; } else {
wlr_log(WLR_INFO, "Got sleep lock: %d", lock_fd);
} }
sd_bus_error_free(&error);
wlr_log(WLR_INFO, "Got sleep lock: %d", lock_fd); sd_bus_message_unref(msg);
} }
static int prepare_for_sleep(sd_bus_message *msg, void *userdata, static int prepare_for_sleep(sd_bus_message *msg, void *userdata,