From c0e7f6d9bf10346e1c4c1fbfe1662d27a425c9ed Mon Sep 17 00:00:00 2001
From: Giovanni Campagna <gcampagn@redhat.com>
Date: Wed, 11 Sep 2013 14:35:41 +0200
Subject: [PATCH] wayland: remove some wl_signal usage

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

https://bugzilla.gnome.org/show_bug.cgi?id=707863
---
 src/wayland/meta-wayland-data-device.c | 4 ----
 src/wayland/meta-wayland-keyboard.c    | 2 --
 src/wayland/meta-wayland-keyboard.h    | 1 -
 src/wayland/meta-wayland-pointer.c     | 1 -
 src/wayland/meta-wayland-pointer.h     | 1 -
 src/wayland/meta-wayland-seat.c        | 5 -----
 src/wayland/meta-wayland-seat.h        | 2 --
 7 files changed, 16 deletions(-)

diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c
index b9bb21c68..352448ae9 100644
--- a/src/wayland/meta-wayland-data-device.c
+++ b/src/wayland/meta-wayland-data-device.c
@@ -373,8 +373,6 @@ destroy_selection_data_source (struct wl_listener *listener, void *data)
       if (data_device)
         wl_data_device_send_selection (data_device, NULL);
     }
-
-  wl_signal_emit (&seat->selection_signal, seat);
 }
 
 void
@@ -419,8 +417,6 @@ meta_wayland_seat_set_selection (MetaWaylandSeat *seat,
         }
     }
 
-  wl_signal_emit (&seat->selection_signal, seat);
-
   if (source)
     {
       seat->selection_data_source_listener.notify =
diff --git a/src/wayland/meta-wayland-keyboard.c b/src/wayland/meta-wayland-keyboard.c
index 4a94e135e..944a2fbad 100644
--- a/src/wayland/meta-wayland-keyboard.c
+++ b/src/wayland/meta-wayland-keyboard.c
@@ -316,7 +316,6 @@ meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
   keyboard->default_grab.interface = &default_keyboard_grab_interface;
   keyboard->default_grab.keyboard = keyboard;
   keyboard->grab = &keyboard->default_grab;
-  wl_signal_init (&keyboard->focus_signal);
 
   keyboard->display = display;
 
@@ -539,7 +538,6 @@ meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
 
   keyboard->focus_resource = resource;
   keyboard->focus = surface;
-  wl_signal_emit (&keyboard->focus_signal, keyboard);
 }
 
 void
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index 110363d78..adb3d4428 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -96,7 +96,6 @@ struct _MetaWaylandKeyboard
   struct wl_resource *focus_resource;
   struct wl_listener focus_listener;
   uint32_t focus_serial;
-  struct wl_signal focus_signal;
 
   MetaWaylandKeyboardGrab *grab;
   MetaWaylandKeyboardGrab default_grab;
diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c
index d7f17319a..50620a88f 100644
--- a/src/wayland/meta-wayland-pointer.c
+++ b/src/wayland/meta-wayland-pointer.c
@@ -270,7 +270,6 @@ meta_wayland_pointer_init (MetaWaylandPointer *pointer,
   pointer->default_grab.interface = &default_pointer_grab_interface;
   pointer->default_grab.pointer = pointer;
   pointer->grab = &pointer->default_grab;
-  wl_signal_init (&pointer->focus_signal);
 
   manager = clutter_device_manager_get_default ();
   device = clutter_device_manager_get_core_device (manager, CLUTTER_POINTER_DEVICE);
diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h
index d355d2993..53e59f344 100644
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -51,7 +51,6 @@ struct _MetaWaylandPointer
   struct wl_listener focus_listener;
   guint32 focus_serial;
   guint32 click_serial;
-  struct wl_signal focus_signal;
 
   MetaWaylandPointerGrab *grab;
   MetaWaylandPointerGrab default_grab;
diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c
index e4678d55a..17544b353 100644
--- a/src/wayland/meta-wayland-seat.c
+++ b/src/wayland/meta-wayland-seat.c
@@ -230,11 +230,8 @@ meta_wayland_seat_new (struct wl_display *display,
 {
   MetaWaylandSeat *seat = g_new0 (MetaWaylandSeat, 1);
 
-  wl_signal_init (&seat->destroy_signal);
-
   seat->selection_data_source = NULL;
   wl_list_init (&seat->base_resource_list);
-  wl_signal_init (&seat->selection_signal);
   wl_list_init (&seat->data_device_resource_list);
 
   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_keyboard_release (&seat->keyboard);
 
-  wl_signal_emit (&seat->destroy_signal, seat);
-
   g_slice_free (MetaWaylandSeat, seat);
 }
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index 3c968ef9c..c5c88e246 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -54,12 +54,10 @@ struct _MetaWaylandDataSource
 struct _MetaWaylandSeat
 {
   struct wl_list base_resource_list;
-  struct wl_signal destroy_signal;
 
   uint32_t selection_serial;
   MetaWaylandDataSource *selection_data_source;
   struct wl_listener selection_data_source_listener;
-  struct wl_signal selection_signal;
 
   struct wl_list data_device_resource_list;
   MetaWaylandPointer pointer;