commit 08cfdbd

Michael Forney  ·  2013-09-11 23:42:13 +0000 UTC
parent 4e7ee2e 
surface: Remove unused shell_data/shell_destructor
2 files changed,  +0, -14
M libswc/surface.c
M libswc/surface.h
M libswc/surface.c
+0, -5 
 1@@ -309,9 +309,6 @@ static void surface_destroy(struct wl_resource * resource)
 2 {
 3     struct swc_surface * surface = wl_resource_get_user_data(resource);
 4 
 5-    if (surface->shell_destructor)
 6-        surface->shell_destructor(surface);
 7-
 8     if (surface->class && surface->class->interface->remove)
 9         surface->class->interface->remove(surface);
10 
11@@ -346,8 +343,6 @@ struct swc_surface * swc_surface_new(struct wl_client * client, uint32_t id)
12     surface->geometry.width = 0;
13     surface->geometry.height = 0;
14     surface->pending.commit = 0;
15-    surface->shell_data = NULL;
16-    surface->shell_destructor = NULL;
17     surface->class = NULL;
18     surface->class_state = NULL;
19
M libswc/surface.h
+0, -9 
 1@@ -91,15 +91,6 @@ struct swc_surface
 2 
 3     struct swc_surface_state state;
 4 
 5-    /* For usage by a shell implementation. */
 6-    void * shell_data;
 7-
 8-    /* Shells may want to use this destructor, guaranteed to run after all the
 9-     * other destroy listeners, rather than a destroy listener if they want to
10-     * do something like change keyboard focus after the currently focused
11-     * surface is destroyed. */
12-    void (* shell_destructor)(struct swc_surface * surface);
13-
14     struct
15     {
16         struct swc_surface_state state;