[PATCH weston 15/16] ivi-shell: remove remove_notification_configure_surface

[Ucan, Emre (ADITG/SW1)]

ivi_layout_remove_notification_configure_surface API is
removed, because it is not needed after the changes to
the ivi_layout_add_notification_configure_surface.

Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
 ivi-shell/ivi-layout-export.h |    8 -------
 ivi-shell/ivi-layout.c        |   49 -----------------------------------------
 2 files changed, 57 deletions(-)

diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 8ff5613..2ccdff5 100644
--- a/ivi-shell/ivi-layout-export.h
+++ b/ivi-shell/ivi-layout-export.h
@@ -138,10 +138,6 @@ enum ivi_layout_transition_type{
 	IVI_LAYOUT_TRANSITION_MAX,
 };
 
-typedef void (*surface_configure_notification_func)(
-			struct ivi_layout_surface *ivisurf,
-			void *userdata);
-
 typedef void (*ivi_controller_surface_content_callback)(
 			struct ivi_layout_surface *ivisurf,
 			int32_t content,
@@ -177,10 +173,6 @@ struct ivi_layout_interface {
 	 */
 	int32_t (*add_listener_configure_surface)(struct wl_listener *listener);
 
-	void (*remove_notification_configure_surface)(
-				surface_configure_notification_func callback,
-				void *userdata);
-
 	/**
 	 * \brief Get all ivi_surfaces which are currently registered and managed
 	 * by the services
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 5776279..0faf1a6 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -71,11 +71,6 @@
 
 #define max(a, b) ((a) > (b) ? (a) : (b))
 
-struct listener_layout_notification {
-	void *userdata;
-	struct wl_listener listener;
-};
-
 struct ivi_layout;
 
 struct ivi_layout_screen {
@@ -96,11 +91,6 @@ struct ivi_layout_screen {
 	} order;
 };
 
-struct ivi_layout_notification_callback {
-	void *callback;
-	void *data;
-};
-
 struct ivi_rectangle
 {
 	int32_t x;
@@ -109,9 +99,6 @@ struct ivi_rectangle
 	int32_t height;
 };
 
-static void
-remove_notification(struct wl_list *listener_list, void *callback, void *userdata);
-
 static struct ivi_layout ivilayout = {0};
 
 struct ivi_layout *
@@ -930,33 +917,6 @@ clear_surface_order_list(struct ivi_layout_layer *ivilayer)
 	}
 }
 
-static void
-remove_notification(struct wl_list *listener_list, void *callback, void *userdata)
-{
-	struct wl_listener *listener = NULL;
-	struct wl_listener *next = NULL;
-
-	wl_list_for_each_safe(listener, next, listener_list, link) {
-		struct listener_layout_notification *notification =
-			container_of(listener,
-				     struct listener_layout_notification,
-				     listener);
-
-		struct ivi_layout_notification_callback *notification_callback =
-			notification->userdata;
-
-		if ((notification_callback->callback != callback) ||
-		    (notification_callback->data != userdata)) {
-			continue;
-		}
-
-		wl_list_remove(&listener->link);
-
-		free(notification->userdata);
-		free(notification);
-	}
-}
-
 /**
  * Exported APIs of ivi-layout library are implemented from here.
  * Brief of APIs is described in ivi-layout-export.h.
@@ -1036,14 +996,6 @@ ivi_layout_add_listener_configure_surface(struct wl_listener *listener)
 	return IVI_SUCCEEDED;
 }
 
-static void
-ivi_layout_remove_notification_configure_surface(surface_configure_notification_func callback,
-						 void *userdata)
-{
-	struct ivi_layout *layout = get_instance();
-	remove_notification(&layout->surface_notification.configure_changed.listener_list, callback, userdata);
-}
-
 uint32_t
 ivi_layout_get_id_of_surface(struct ivi_layout_surface *ivisurf)
 {
@@ -2039,7 +1991,6 @@ static struct ivi_layout_interface ivi_layout_interface = {
 	.add_listener_create_surface	= ivi_layout_add_listener_create_surface,
 	.add_listener_remove_surface	= ivi_layout_add_listener_remove_surface,
 	.add_listener_configure_surface	= ivi_layout_add_listener_configure_surface,
-	.remove_notification_configure_surface	= ivi_layout_remove_notification_configure_surface,
 	.get_surfaces				= ivi_layout_get_surfaces,
 	.get_id_of_surface			= ivi_layout_get_id_of_surface,
 	.get_surface_from_id			= ivi_layout_get_surface_from_id,
-- 
1.7.9.5