commit a133781

Michael Forney  ·  2013-09-05 09:00:44 +0000 UTC
parent 17319a1
Don't crash on global_remove
2 files changed,  +18, -2
+9, -1
 1@@ -52,6 +52,8 @@ struct wld_wayland_drm_context
 2 static void registry_global(void * data, struct wl_registry * registry,
 3                             uint32_t name, const char * interface,
 4                             uint32_t version);
 5+static void registry_global_remove(void * data, struct wl_registry * registry,
 6+                                   uint32_t name);
 7 
 8 static void drm_device(void * data, struct wl_drm * wl, const char * name);
 9 static void drm_format(void * data, struct wl_drm * wl, uint32_t format);
10@@ -69,7 +71,8 @@ const struct wld_wayland_interface wayland_drm_interface = {
11 };
12 
13 const static struct wl_registry_listener registry_listener = {
14-    .global = &registry_global
15+    .global = &registry_global,
16+    .global_remove = &registry_global_remove
17 };
18 
19 const static struct wl_drm_listener drm_listener = {
20@@ -225,6 +228,11 @@ void registry_global(void * data, struct wl_registry * registry, uint32_t name,
21         drm->wl = wl_registry_bind(registry, name, &wl_drm_interface, 2);
22 }
23 
24+void registry_global_remove(void * data, struct wl_registry * registry,
25+                            uint32_t name)
26+{
27+}
28+
29 void drm_device(void * data, struct wl_drm * wl, const char * name)
30 {
31     struct wld_wayland_drm_context * drm = data;
+9, -1
 1@@ -46,6 +46,8 @@ struct wld_shm_context
 2 static void registry_global(void * data, struct wl_registry * registry,
 3                             uint32_t name, const char * interface,
 4                             uint32_t version);
 5+static void registry_global_remove(void * data, struct wl_registry * registry,
 6+                                   uint32_t name);
 7 
 8 static void shm_format(void * data, struct wl_shm * wl, uint32_t format);
 9 
10@@ -57,7 +59,8 @@ const struct wld_wayland_interface wayland_shm_interface = {
11 };
12 
13 const static struct wl_registry_listener registry_listener = {
14-    .global = &registry_global
15+    .global = &registry_global,
16+    .global_remove = &registry_global_remove
17 };
18 
19 const static struct wl_shm_listener shm_listener = {
20@@ -206,6 +209,11 @@ void registry_global(void * data, struct wl_registry * registry, uint32_t name,
21         shm->wl = wl_registry_bind(registry, name, &wl_shm_interface, 1);
22 }
23 
24+void registry_global_remove(void * data, struct wl_registry * registry,
25+                            uint32_t name)
26+{
27+}
28+
29 void shm_format(void * data, struct wl_shm * wl, uint32_t format)
30 {
31     struct wld_shm_context * shm = data;