commit 67f0aa87674c573fbf68a1aaa1e0b75a2f4c7c62
author Ucan, Emre (ADITG/SW1) <eucan@de.adit-jv.com> Mon Apr 04 08:05:18 2016 +0000
committer Pekka Paalanen <pekka.paalanen@collabora.co.uk> Tue Apr 05 11:53:48 2016 +0300
tree 77ff8818ddd5b843a23686fd4a6d1fcda337813f
parent 562f2ecb0cb49aba1c26b3c01d406752165c279e

ivi-shell: rework remove_surface notification

The add_notification_remove_surface API accepts a simple
wl_listener instead of a ivi-shell specific notification
function. Therefore, the API is renamed to add_listener_remove_surface.

This change has several advantages:
1. Code cleanup
2. No dynamic memory allocation. Listeners are allocated
   by controller plugins
3. Remove API is not needed. Controller plugins can easily
   remove the listener link.

The remove API is removed too:
- ivi_layout_remove_notification_remove_surface

Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

tests/ivi_layout-internal-test.c

diff --git a/tests/ivi_layout-internal-test.c b/tests/ivi_layout-internal-test.c
index d7878d3..4e17357 100644
--- a/tests/ivi_layout-internal-test.c
+++ b/tests/ivi_layout-internal-test.c
@@ -873,7 +873,7 @@
 {
 	const struct ivi_layout_interface *lyt = ctx->layout_interface;
 
-	iassert(lyt->add_notification_remove_surface(NULL, NULL) == IVI_FAILED);
+	iassert(lyt->add_listener_remove_surface(NULL) == IVI_FAILED);
 }
 
 /************************ tests end ********************************/

tests/ivi_layout-test-plugin.c

diff --git a/tests/ivi_layout-test-plugin.c b/tests/ivi_layout-test-plugin.c
index 37e5cc7..6796b33 100644
--- a/tests/ivi_layout-test-plugin.c
+++ b/tests/ivi_layout-test-plugin.c
@@ -86,6 +86,7 @@
 
 	struct wl_listener surface_property_changed;
 	struct wl_listener surface_created;
+	struct wl_listener surface_removed;
 };
 
 static struct test_context static_context;
@@ -952,11 +953,13 @@
 }
 
 static void
-test_surface_remove_notification_callback(struct ivi_layout_surface *ivisurf,
-					  void *userdata)
+test_surface_remove_notification_callback(struct wl_listener *listener, void *data)
 {
-	struct test_context *ctx = userdata;
+	struct test_context *ctx =
+			container_of(listener, struct test_context,
+					surface_removed);
 	const struct ivi_layout_interface *lyt = ctx->layout_interface;
+	struct ivi_layout_surface *ivisurf = data;
 
 	runner_assert_or_return(lyt->get_id_of_surface(ivisurf) == IVI_TEST_SURFACE_ID(0));
 
@@ -967,19 +970,19 @@
 {
 	const struct ivi_layout_interface *lyt = ctx->layout_interface;
 
-	runner_assert(lyt->add_notification_remove_surface(
-		      test_surface_remove_notification_callback, ctx) == IVI_SUCCEEDED);
+	ctx->surface_removed.notify = test_surface_remove_notification_callback;
+	runner_assert(lyt->add_listener_remove_surface(&ctx->surface_removed)
+			== IVI_SUCCEEDED);
 
 	ctx->user_flags = 0;
 }
 
 RUNNER_TEST(surface_remove_notification_p2)
 {
-	const struct ivi_layout_interface *lyt = ctx->layout_interface;
-
 	runner_assert(ctx->user_flags == 1);
 
-	lyt->remove_notification_remove_surface(test_surface_remove_notification_callback, ctx);
+	// remove surface removed listener.
+	wl_list_remove(&ctx->surface_removed.link);
 	ctx->user_flags = 0;
 }