compositor: let the shells create the screenshooter

dev
Giulio Camuffo 11 years ago committed by Kristian Høgsberg
parent e9022e79c8
commit c6ab3d52f5
  1. 2
      desktop-shell/shell.c
  2. 1
      src/compositor.c
  3. 2
      src/screenshooter.c

@ -6030,6 +6030,8 @@ module_init(struct weston_compositor *ec,
create_keyboard_focus_listener(seat); create_keyboard_focus_listener(seat);
} }
screenshooter_create(ec);
shell_add_bindings(ec, shell); shell_add_bindings(ec, shell);
shell_fade_init(shell); shell_fade_init(shell);

@ -3672,7 +3672,6 @@ weston_compositor_init(struct weston_compositor *ec,
if (weston_compositor_xkb_init(ec, &xkb_names) < 0) if (weston_compositor_xkb_init(ec, &xkb_names) < 0)
return -1; return -1;
screenshooter_create(ec);
text_backend_init(ec); text_backend_init(ec);
wl_data_device_manager_init(ec->wl_display); wl_data_device_manager_init(ec->wl_display);

@ -585,7 +585,7 @@ screenshooter_destroy(struct wl_listener *listener, void *data)
free(shooter); free(shooter);
} }
void WL_EXPORT void
screenshooter_create(struct weston_compositor *ec) screenshooter_create(struct weston_compositor *ec)
{ {
struct screenshooter *shooter; struct screenshooter *shooter;

Loading…
Cancel
Save