swc

commit 6cc5eba3b6f014bee710ae4767bd1201657b1d57
parent b8a726908351a07a370f1f22bf2830e911451aa5
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 21 Jun 2013 01:14:06 -0700

Rename swc_unbind_resource to swc_remove_resource

Resources are now freed automatically by libwayland-server

Diffstat:
M
keyboard.c
 | 
2
+-
M
output.c
 | 
2
+-
M
pointer.c
 | 
2
+-
M
seat.c
 | 
2
+-
M
util.c
 | 
3
+--
M
util.h
 | 
2
+-

6 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/keyboard.c b/keyboard.c
@@ -74,7 +74,7 @@ struct wl_resource * swc_keyboard_bind(struct swc_keyboard * keyboard,
 
     client_resource = wl_client_add_object(client, &wl_keyboard_interface,
                                            NULL, id, NULL);
-    wl_resource_set_destructor(client_resource, &swc_unbind_resource);
+    wl_resource_set_destructor(client_resource, &swc_remove_resource);
     wl_list_insert(&keyboard->resources, wl_resource_get_link(client_resource));
 
     printf("keyboard: adding client %p, resource: %p\n", client, client_resource);
diff --git a/output.c b/output.c
@@ -21,7 +21,7 @@ static void bind_output(struct wl_client * client, void * data,
     resource = wl_client_add_object(client, &wl_output_interface, NULL, id,
                                     output);
     wl_list_insert(&output->resource_list, wl_resource_get_link(resource));
-    wl_resource_set_destructor(resource, &swc_unbind_resource);
+    wl_resource_set_destructor(resource, &swc_remove_resource);
 
     wl_output_send_geometry(resource, output->x, output->y,
         output->physical_width, output->physical_height, 0, "unknown",
diff --git a/pointer.c b/pointer.c
@@ -107,7 +107,7 @@ struct wl_resource * swc_pointer_bind(struct swc_pointer * pointer,
 
     client_resource = wl_client_add_object(client, &wl_pointer_interface,
                                            &pointer_implementation, id, pointer);
-    wl_resource_set_destructor(client_resource, &swc_unbind_resource);
+    wl_resource_set_destructor(client_resource, &swc_remove_resource);
     wl_list_insert(&pointer->resources,
                    wl_resource_get_user_data(client_resource));
 
diff --git a/seat.c b/seat.c
@@ -211,7 +211,7 @@ static void bind_seat(struct wl_client * client, void * data, uint32_t version,
     resource = wl_client_add_object(client, &wl_seat_interface,
                                     &seat_implementation, id, seat);
     wl_list_insert(&seat->resources, wl_resource_get_link(resource));
-    wl_resource_set_destructor(resource, &swc_unbind_resource);
+    wl_resource_set_destructor(resource, &swc_remove_resource);
 
     wl_seat_send_capabilities(resource, seat->capabilities);
 }
diff --git a/util.c b/util.c
@@ -3,9 +3,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-void swc_unbind_resource(struct wl_resource * resource)
+void swc_remove_resource(struct wl_resource * resource)
 {
     wl_list_remove(wl_resource_get_link(resource));
-    free(resource);
 }
 
diff --git a/util.h b/util.h
@@ -3,7 +3,7 @@
 
 #include <wayland-server.h>
 
-void swc_unbind_resource(struct wl_resource * resource);
+void swc_remove_resource(struct wl_resource * resource);
 
 #endif