devilhorns pushed a commit to branch master.

commit 01717bde88dc18b700e11456ec07e89faa82c051
Author: Chris Michael <[email protected]>
Date:   Wed Sep 11 08:15:57 2013 +0100

    Remove wl_pointer_release function
    
    NB: It's redefined in the client protocol again (for now).
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/bin/e_comp_wl.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 192902a..2c567f2 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -89,6 +89,7 @@ static void _e_comp_wl_pointer_unmap(E_Wayland_Surface *ews);
 
 /* pointer interface prototypes */
 static void _e_comp_wl_pointer_cb_cursor_set(struct wl_client *client, struct 
wl_resource *resource, unsigned int serial, struct wl_resource 
*surface_resource, int x, int y);
+static void _e_comp_wl_pointer_cb_release(struct wl_client *client, struct 
wl_resource *resource);
 
 /* region interface prototypes */
 static void _e_comp_wl_region_cb_destroy(struct wl_client *client EINA_UNUSED, 
struct wl_resource *resource);
@@ -130,7 +131,8 @@ static const struct wl_seat_interface _e_input_interface =
 
 static const struct wl_pointer_interface _e_pointer_interface = 
 {
-   _e_comp_wl_pointer_cb_cursor_set
+   _e_comp_wl_pointer_cb_cursor_set,
+   _e_comp_wl_pointer_cb_release
 };
 
 static const struct wl_region_interface _e_region_interface = 
@@ -542,13 +544,6 @@ wl_pointer_init(struct wl_pointer *pointer)
 }
 
 EAPI void 
-wl_pointer_release(struct wl_pointer *pointer)
-{
-   if (pointer->focus_resource)
-     wl_list_remove(&pointer->focus_listener.link);
-}
-
-EAPI void 
 wl_pointer_set_focus(struct wl_pointer *pointer, struct wl_resource *surface, 
wl_fixed_t sx, wl_fixed_t sy)
 {
    struct wl_keyboard *kbd = pointer->seat->keyboard;
@@ -2393,6 +2388,12 @@ _e_comp_wl_pointer_cb_cursor_set(struct wl_client 
*client, struct wl_resource *r
      }
 }
 
+static void 
+_e_comp_wl_pointer_cb_release(struct wl_client *client EINA_UNUSED, struct 
wl_resource *resource)
+{
+   wl_resource_destroy(resource);
+}
+
 /* region interface functions */
 static void 
 _e_comp_wl_region_cb_destroy(struct wl_client *client EINA_UNUSED, struct 
wl_resource *resource)

-- 

------------------------------------------------------------------------------
How ServiceNow helps IT people transform IT departments:
1. Consolidate legacy IT systems to a single system of record for IT
2. Standardize and globalize service processes across IT
3. Implement zero-touch automation to replace manual, redundant tasks
http://pubads.g.doubleclick.net/gampad/clk?id=51271111&iu=/4140/ostg.clktrk

Reply via email to