aboutsummaryrefslogtreecommitdiffstats
path: root/swayidle
diff options
context:
space:
mode:
authorLibravatar Ian Fan <ianfan0@gmail.com>2018-11-01 23:55:41 +0000
committerLibravatar emersion <contact@emersion.fr>2018-11-24 23:10:05 +0100
commit6e2dccc2e96a9e7d5ff7da6ad097c0360ece2693 (patch)
tree2a07fbcff33ea8ddfae8b88e1873a0288d2bf258 /swayidle
parentMerge pull request #3179 from baloo/baloo/title_format-pango_markup (diff)
downloadsway-6e2dccc2e96a9e7d5ff7da6ad097c0360ece2693.tar.gz
sway-6e2dccc2e96a9e7d5ff7da6ad097c0360ece2693.tar.zst
sway-6e2dccc2e96a9e7d5ff7da6ad097c0360ece2693.zip
swayidle: when acquiring sleep lock, initialize and free variables properly
Diffstat (limited to 'swayidle')
-rw-r--r--swayidle/main.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/swayidle/main.c b/swayidle/main.c
index 2b185949..4e850c92 100644
--- a/swayidle/main.c
+++ b/swayidle/main.c
@@ -81,16 +81,16 @@ static int release_lock(void *data) {
81} 81}
82 82
83static void acquire_sleep_lock(void) { 83static void acquire_sleep_lock(void) {
84 sd_bus_message *msg; 84 sd_bus_message *msg = NULL;
85 sd_bus_error error; 85 sd_bus_error error = SD_BUS_ERROR_NULL;
86 int ret = sd_bus_call_method(bus, "org.freedesktop.login1", 86 int ret = sd_bus_call_method(bus, "org.freedesktop.login1",
87 "/org/freedesktop/login1", 87 "/org/freedesktop/login1",
88 "org.freedesktop.login1.Manager", "Inhibit", 88 "org.freedesktop.login1.Manager", "Inhibit",
89 &error, &msg, "ssss", "sleep", "swayidle", 89 &error, &msg, "ssss", "sleep", "swayidle",
90 "Setup Up Lock Screen", "delay"); 90 "Setup Up Lock Screen", "delay");
91 if (ret < 0) { 91 if (ret < 0) {
92 wlr_log(WLR_ERROR, "Failed to send Inhibit signal: %s", 92 wlr_log(WLR_ERROR, "Failed to send Inhibit signal: %s", error.message);
93 strerror(-ret)); 93 sd_bus_error_free(&error);
94 return; 94 return;
95 } 95 }
96 96
@@ -98,10 +98,11 @@ static void acquire_sleep_lock(void) {
98 if (ret < 0) { 98 if (ret < 0) {
99 wlr_log(WLR_ERROR, "Failed to parse D-Bus response for Inhibit: %s", 99 wlr_log(WLR_ERROR, "Failed to parse D-Bus response for Inhibit: %s",
100 strerror(-ret)); 100 strerror(-ret));
101 return; 101 } else {
102 wlr_log(WLR_INFO, "Got sleep lock: %d", lock_fd);
102 } 103 }
103 104 sd_bus_error_free(&error);
104 wlr_log(WLR_INFO, "Got sleep lock: %d", lock_fd); 105 sd_bus_message_unref(msg);
105} 106}
106 107
107static int prepare_for_sleep(sd_bus_message *msg, void *userdata, 108static int prepare_for_sleep(sd_bus_message *msg, void *userdata,