[PATCH weston 2/2] compositor: let the shells create the screenshooter

Giulio Camuffo giuliocamuffo at gmail.com
Wed Dec 11 14:45:12 PST 2013


---
 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 9fbac00..520623f 100644
--- a/desktop-shell/shell.c
+++ b/desktop-shell/shell.c
@@ -5832,6 +5832,8 @@ module_init(struct weston_compositor *ec,
 	wl_list_for_each(seat, &ec->seat_list, link)
 		create_pointer_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 8f4bdef..66ed7de 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3343,7 +3343,6 @@ weston_compositor_init(struct weston_compositor *ec,
 
 	ec->ping_handler = NULL;
 
-	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 14ee35a..95b84ad 100644
--- a/src/screenshooter.c
+++ b/src/screenshooter.c
@@ -604,7 +604,7 @@ screenshooter_destroy(struct wl_listener *listener, void *data)
 	free(shooter);
 }
 
-void
+WL_EXPORT void
 screenshooter_create(struct weston_compositor *ec)
 {
 	struct screenshooter *shooter;
-- 
1.8.5.1



More information about the wayland-devel mailing list