brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland: remove some wl_signal usage

Browse Source 
It was a left-over from the initial code import from weston.

https://bugzilla.gnome.org/show_bug.cgi?id=707863
This commit is contained in:
Giovanni Campagna 2013-09-11 14:35:41 +02:00
parent 9a13b857f4
commit c0e7f6d9bf
7 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland/meta-wayland-data-device.c
View File

@ -373,8 +373,6 @@ destroy_selection_data_source (struct wl_listener *listener, void *data)
if (data_device) if (data_device)
wl_data_device_send_selection (data_device, NULL); wl_data_device_send_selection (data_device, NULL);
} }
wl_signal_emit (&seat->selection_signal, seat);
} }
void void
@ -419,8 +417,6 @@ meta_wayland_seat_set_selection (MetaWaylandSeat *seat,
} }
} }
wl_signal_emit (&seat->selection_signal, seat);
if (source) if (source)
{ {
seat->selection_data_source_listener.notify = seat->selection_data_source_listener.notify =

2
src/wayland/meta-wayland-keyboard.c
View File

@ -316,7 +316,6 @@ meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
keyboard->default_grab.interface = &default_keyboard_grab_interface; keyboard->default_grab.interface = &default_keyboard_grab_interface;
keyboard->default_grab.keyboard = keyboard; keyboard->default_grab.keyboard = keyboard;
keyboard->grab = &keyboard->default_grab; keyboard->grab = &keyboard->default_grab;
wl_signal_init (&keyboard->focus_signal);
keyboard->display = display; keyboard->display = display;
@ -539,7 +538,6 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
keyboard->focus_resource = resource; keyboard->focus_resource = resource;
keyboard->focus = surface; keyboard->focus = surface;
wl_signal_emit (&keyboard->focus_signal, keyboard);
} }
void void

1
src/wayland/meta-wayland-keyboard.h
View File

@ -96,7 +96,6 @@ struct _MetaWaylandKeyboard
struct wl_resource *focus_resource; struct wl_resource *focus_resource;
struct wl_listener focus_listener; struct wl_listener focus_listener;
uint32_t focus_serial; uint32_t focus_serial;
struct wl_signal focus_signal;
MetaWaylandKeyboardGrab *grab; MetaWaylandKeyboardGrab *grab;
MetaWaylandKeyboardGrab default_grab; MetaWaylandKeyboardGrab default_grab;

1
src/wayland/meta-wayland-pointer.c
View File

@ -270,7 +270,6 @@ meta_wayland_pointer_init (MetaWaylandPointer *pointer,
pointer->default_grab.interface = &default_pointer_grab_interface; pointer->default_grab.interface = &default_pointer_grab_interface;
pointer->default_grab.pointer = pointer; pointer->default_grab.pointer = pointer;
pointer->grab = &pointer->default_grab; pointer->grab = &pointer->default_grab;
wl_signal_init (&pointer->focus_signal);
manager = clutter_device_manager_get_default (); manager = clutter_device_manager_get_default ();
device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE); device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);

1
src/wayland/meta-wayland-pointer.h
View File

@ -51,7 +51,6 @@ struct _MetaWaylandPointer
struct wl_listener focus_listener; struct wl_listener focus_listener;
guint32 focus_serial; guint32 focus_serial;
guint32 click_serial; guint32 click_serial;
struct wl_signal focus_signal;
MetaWaylandPointerGrab *grab; MetaWaylandPointerGrab *grab;
MetaWaylandPointerGrab default_grab; MetaWaylandPointerGrab default_grab;

5
src/wayland/meta-wayland-seat.c
View File

@ -230,11 +230,8 @@ meta_wayland_seat_new (struct wl_display *display,
{ {
MetaWaylandSeat *seat = g_new0 (MetaWaylandSeat, 1); MetaWaylandSeat *seat = g_new0 (MetaWaylandSeat, 1);
wl_signal_init (&seat->destroy_signal);
seat->selection_data_source = NULL; seat->selection_data_source = NULL;
wl_list_init (&seat->base_resource_list); wl_list_init (&seat->base_resource_list);
wl_signal_init (&seat->selection_signal);
wl_list_init (&seat->data_device_resource_list); wl_list_init (&seat->data_device_resource_list);
meta_wayland_pointer_init (&seat->pointer, is_native); meta_wayland_pointer_init (&seat->pointer, is_native);
@ -492,7 +489,5 @@ meta_wayland_seat_free (MetaWaylandSeat *seat)
meta_wayland_pointer_release (&seat->pointer); meta_wayland_pointer_release (&seat->pointer);
meta_wayland_keyboard_release (&seat->keyboard); meta_wayland_keyboard_release (&seat->keyboard);
wl_signal_emit (&seat->destroy_signal, seat);
g_slice_free (MetaWaylandSeat, seat); g_slice_free (MetaWaylandSeat, seat);
} }

2
src/wayland/meta-wayland-seat.h
View File

@ -54,12 +54,10 @@ struct _MetaWaylandDataSource
struct _MetaWaylandSeat struct _MetaWaylandSeat
{ {
struct wl_list base_resource_list; struct wl_list base_resource_list;
struct wl_signal destroy_signal;
uint32_t selection_serial; uint32_t selection_serial;
MetaWaylandDataSource *selection_data_source; MetaWaylandDataSource *selection_data_source;
struct wl_listener selection_data_source_listener; struct wl_listener selection_data_source_listener;
struct wl_signal selection_signal;
struct wl_list data_device_resource_list; struct wl_list data_device_resource_list;
MetaWaylandPointer pointer; MetaWaylandPointer pointer;