From c6ab3d52f54c6ce9625905cf0a4c2b3a7896205f Mon Sep 17 00:00:00 2001 From: Giulio Camuffo Date: Wed, 11 Dec 2013 23:45:12 +0100 Subject: [PATCH] compositor: let the shells create the screenshooter --- desktop-shell/shell.c | 2 ++ src/compositor.c | 1 - src/screenshooter.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index b4cd93cf..59fa99c2 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -6030,6 +6030,8 @@ module_init(struct weston_compositor *ec, create_keyboard_focus_listener(seat); } + screenshooter_create(ec); + shell_add_bindings(ec, shell); shell_fade_init(shell); diff --git a/src/compositor.c b/src/compositor.c index 47a806e5..5405faa6 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -3672,7 +3672,6 @@ weston_compositor_init(struct weston_compositor *ec, if (weston_compositor_xkb_init(ec, &xkb_names) < 0) return -1; - screenshooter_create(ec); text_backend_init(ec); wl_data_device_manager_init(ec->wl_display); diff --git a/src/screenshooter.c b/src/screenshooter.c index 29f2af2b..02146c89 100644 --- a/src/screenshooter.c +++ b/src/screenshooter.c @@ -585,7 +585,7 @@ screenshooter_destroy(struct wl_listener *listener, void *data) free(shooter); } -void +WL_EXPORT void screenshooter_create(struct weston_compositor *ec) { struct screenshooter *shooter;