server: Change destroy cb to deatch cb in client queue export buffer

Change-Id: Ifb539719697f6daaae1bd26e3d26eb5610697ceb

diff --git a/src/wayland-tbm-server.c b/src/wayland-tbm-server.c
index 7645d36c9cffec7b9311ae92b248f9831e7e79cf..be0d4b628c5d0ae9c383ed1306c7b54573d1e024 100644 (file)
--- a/src/wayland-tbm-server.c
+++ b/src/wayland-tbm-server.c
@@ -1289,11 +1289,11 @@ struct wl_resource *
 wayland_tbm_server_client_queue_export_buffer(
                                struct wayland_tbm_client_queue *cqueue,
                                tbm_surface_h surface, uint32_t flags,
-                               wayland_tbm_server_surface_destroy_cb destroy_cb,
+                               wayland_tbm_server_surface_detach_cb detach_cb,
                                void *user_data)
 {
        return wayland_tbm_server_client_queue_export_buffer2(cqueue, surface, flags,
-                                               (wayland_tbm_server_surface_detach_cb)NULL, destroy_cb, user_data);
+                                               detach_cb, NULL, user_data);
 }
 
 int

diff --git a/src/wayland-tbm-server.h b/src/wayland-tbm-server.h
index 1e2b3c7009523300e983b46f125add77fd772c79..2e42fd36c40ab3df80af22159edbf655a9d0f27b 100644 (file)
--- a/src/wayland-tbm-server.h
+++ b/src/wayland-tbm-server.h
@@ -102,7 +102,7 @@ wayland_tbm_server_client_queue_set_dequeue_cb(struct wayland_tbm_client_queue *
 
 struct wl_resource *
 wayland_tbm_server_client_queue_export_buffer(struct wayland_tbm_client_queue *client_queue,
-                       tbm_surface_h surface, uint32_t flags, wayland_tbm_server_surface_destroy_cb destroy_cb,
+                       tbm_surface_h surface, uint32_t flags, wayland_tbm_server_surface_detach_cb detach_cb,
                        void *user_data);
 
 struct wl_resource *

diff --git a/unittests/src/ut_base.cpp b/unittests/src/ut_base.cpp
index 7e712e4e5dd061dbc00fe1ce62c5f68c1b65e07d..1ca145e7e841f6e82e26942258b5ee1af0aaebf2 100644 (file)
--- a/unittests/src/ut_base.cpp
+++ b/unittests/src/ut_base.cpp
@@ -274,7 +274,7 @@ _wl_tbm_test_set_active(struct wl_client *client, struct wl_resource *resource,
                        tbm_surf = tbm_surface_create(width, height, format);
                        if (i == 0)
                                wl_buf = wayland_tbm_server_client_queue_export_buffer(wlt_queue, tbm_surf, 0xFF,
-                                               _wl_tbm_test_server_surface_destroy_cb, nullptr);
+                                               _wl_tbm_test_server_surface_detach_cb, nullptr);
                        else
                                wl_buf = wayland_tbm_server_client_queue_export_buffer2(wlt_queue, tbm_surf, 0xFF,
                                                _wl_tbm_test_server_surface_detach_cb,