compositor: Remove a few legacy uses of wl_object
This commit is contained in:
parent
c2d7042b9d
commit
4c6ddf102c
@ -36,7 +36,6 @@
|
|||||||
#include "../wcap/wcap-decode.h"
|
#include "../wcap/wcap-decode.h"
|
||||||
|
|
||||||
struct screenshooter {
|
struct screenshooter {
|
||||||
struct wl_object base;
|
|
||||||
struct weston_compositor *ec;
|
struct weston_compositor *ec;
|
||||||
struct wl_global *global;
|
struct wl_global *global;
|
||||||
struct wl_client *client;
|
struct wl_client *client;
|
||||||
@ -570,9 +569,6 @@ screenshooter_create(struct weston_compositor *ec)
|
|||||||
if (shooter == NULL)
|
if (shooter == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
shooter->base.interface = &screenshooter_interface;
|
|
||||||
shooter->base.implementation =
|
|
||||||
(void(**)(void)) &screenshooter_implementation;
|
|
||||||
shooter->ec = ec;
|
shooter->ec = ec;
|
||||||
shooter->client = NULL;
|
shooter->client = NULL;
|
||||||
|
|
||||||
|
@ -28,7 +28,6 @@
|
|||||||
#include "text-cursor-position-server-protocol.h"
|
#include "text-cursor-position-server-protocol.h"
|
||||||
|
|
||||||
struct text_cursor_position {
|
struct text_cursor_position {
|
||||||
struct wl_object base;
|
|
||||||
struct weston_compositor *ec;
|
struct weston_compositor *ec;
|
||||||
struct wl_global *global;
|
struct wl_global *global;
|
||||||
struct wl_listener destroy_listener;
|
struct wl_listener destroy_listener;
|
||||||
@ -77,9 +76,6 @@ text_cursor_position_notifier_create(struct weston_compositor *ec)
|
|||||||
if (text_cursor_position == NULL)
|
if (text_cursor_position == NULL)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
text_cursor_position->base.interface = &text_cursor_position_interface;
|
|
||||||
text_cursor_position->base.implementation =
|
|
||||||
(void(**)(void)) &text_cursor_position_implementation;
|
|
||||||
text_cursor_position->ec = ec;
|
text_cursor_position->ec = ec;
|
||||||
|
|
||||||
text_cursor_position->global = wl_display_add_global(ec->wl_display,
|
text_cursor_position->global = wl_display_add_global(ec->wl_display,
|
||||||
|
Loading…
Reference in New Issue
Block a user