aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-06-24 16:44:53 -0700
committerGitHub <noreply@github.com>2018-06-24 16:44:53 -0700
commit253a88f03065763f2f9238d0389da382e3e09090 (patch)
treebf324f490f020632023cb2df32cf23b4739d7950
parent4c6d80606d13e71ed4b538f8806d08a8d7096520 (diff)
parenta2ff144429bb52c13dd3d57ff18ecb2e6777fcc6 (diff)
Merge pull request #1086 from acrisci/input-inhibit-emit-safe
input-inhibit: use wlr_signal_emit_safe
-rw-r--r--types/wlr_input_inhibitor.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/types/wlr_input_inhibitor.c b/types/wlr_input_inhibitor.c
index fe1711fd..532ea5f4 100644
--- a/types/wlr_input_inhibitor.c
+++ b/types/wlr_input_inhibitor.c
@@ -4,6 +4,7 @@
#include <wayland-server.h>
#include "wlr/types/wlr_input_inhibitor.h"
#include "wlr-input-inhibitor-unstable-v1-protocol.h"
+#include "util/signal.h"
static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation;
static struct zwlr_input_inhibitor_v1_interface input_inhibitor_implementation;
@@ -26,7 +27,7 @@ static void input_inhibit_manager_deactivate(
}
manager->active_client = NULL;
manager->active_inhibitor = NULL;
- wl_signal_emit(&manager->events.deactivate, manager);
+ wlr_signal_emit_safe(&manager->events.deactivate, manager);
}
static void input_inhibitor_destroy(struct wl_client *client,
@@ -70,7 +71,7 @@ static void inhibit_manager_get_inhibitor(struct wl_client *client,
manager->active_client = client;
manager->active_inhibitor = wl_resource;
- wl_signal_emit(&manager->events.activate, manager);
+ wlr_signal_emit_safe(&manager->events.activate, manager);
}
static const struct zwlr_input_inhibit_manager_v1_interface inhibit_manager_implementation = {