diff options
author | M Stoeckl <code@mstoeckl.com> | 2019-01-20 13:51:12 -0500 |
---|---|---|
committer | emersion <contact@emersion.fr> | 2019-01-21 12:59:42 +0100 |
commit | 1211a81aad18bbc4d9e8fb9973238ad8e7e1f688 (patch) | |
tree | 5c3f60e0219cb8b4a1b7cafb760a871661866e32 /sway/desktop/idle_inhibit_v1.c | |
parent | Log libinput_config_status errors (diff) | |
download | sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.gz sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.tar.zst sway-1211a81aad18bbc4d9e8fb9973238ad8e7e1f688.zip |
Replace wlr_log with sway_log
This commit mostly duplicates the wlr_log functions, although
with a sway_* prefix. (This is very similar to PR #2009.)
However, the logging function no longer needs to be replaceable,
so sway_log_init's second argument is used to set the exit
callback for sway_abort.
wlr_log_init is still invoked in sway/main.c
This commit makes it easier to remove the wlroots dependency for
the helper programs swaymsg, swaybg, swaybar, and swaynag.
Diffstat (limited to 'sway/desktop/idle_inhibit_v1.c')
-rw-r--r-- | sway/desktop/idle_inhibit_v1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c index 17d4242b..87b4ef43 100644 --- a/sway/desktop/idle_inhibit_v1.c +++ b/sway/desktop/idle_inhibit_v1.c | |||
@@ -9,7 +9,7 @@ | |||
9 | static void handle_destroy(struct wl_listener *listener, void *data) { | 9 | static void handle_destroy(struct wl_listener *listener, void *data) { |
10 | struct sway_idle_inhibitor_v1 *inhibitor = | 10 | struct sway_idle_inhibitor_v1 *inhibitor = |
11 | wl_container_of(listener, inhibitor, destroy); | 11 | wl_container_of(listener, inhibitor, destroy); |
12 | wlr_log(WLR_DEBUG, "Sway idle inhibitor destroyed"); | 12 | sway_log(SWAY_DEBUG, "Sway idle inhibitor destroyed"); |
13 | wl_list_remove(&inhibitor->link); | 13 | wl_list_remove(&inhibitor->link); |
14 | wl_list_remove(&inhibitor->destroy.link); | 14 | wl_list_remove(&inhibitor->destroy.link); |
15 | idle_inhibit_v1_check_active(inhibitor->manager); | 15 | idle_inhibit_v1_check_active(inhibitor->manager); |
@@ -20,7 +20,7 @@ void handle_idle_inhibitor_v1(struct wl_listener *listener, void *data) { | |||
20 | struct wlr_idle_inhibitor_v1 *wlr_inhibitor = data; | 20 | struct wlr_idle_inhibitor_v1 *wlr_inhibitor = data; |
21 | struct sway_idle_inhibit_manager_v1 *manager = | 21 | struct sway_idle_inhibit_manager_v1 *manager = |
22 | wl_container_of(listener, manager, new_idle_inhibitor_v1); | 22 | wl_container_of(listener, manager, new_idle_inhibitor_v1); |
23 | wlr_log(WLR_DEBUG, "New sway idle inhibitor"); | 23 | sway_log(SWAY_DEBUG, "New sway idle inhibitor"); |
24 | 24 | ||
25 | struct sway_idle_inhibitor_v1 *inhibitor = | 25 | struct sway_idle_inhibitor_v1 *inhibitor = |
26 | calloc(1, sizeof(struct sway_idle_inhibitor_v1)); | 26 | calloc(1, sizeof(struct sway_idle_inhibitor_v1)); |