[PATCH weston 13/16] ivi-shell: remove remove_notification_remove_surface
Ucan, Emre (ADITG/SW1)
eucan at de.adit-jv.com
Thu Mar 31 11:10:07 UTC 2016
ivi_layout_remove_notification_remove_surface API is
removed, because it is not needed after the changes to
the ivi_layout_add_notification_remove_surface.
Signed-off-by: Emre Ucan <eucan at de.adit-jv.com>
---
ivi-shell/ivi-layout-export.h | 8 --------
ivi-shell/ivi-layout.c | 9 ---------
2 files changed, 17 deletions(-)
diff --git a/ivi-shell/ivi-layout-export.h b/ivi-shell/ivi-layout-export.h
index 0aaf5b3..e0beff6 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_remove_notification_func)(
- struct ivi_layout_surface *ivisurf,
- void *userdata);
-
typedef void (*surface_configure_notification_func)(
struct ivi_layout_surface *ivisurf,
void *userdata);
@@ -176,10 +172,6 @@ struct ivi_layout_interface {
*/
int32_t (*add_listener_remove_surface)(struct wl_listener *listener);
- void (*remove_notification_remove_surface)(
- surface_remove_notification_func callback,
- void *userdata);
-
/**
* \brief register/unregister for notification when ivi_surface is configured
*/
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index 63983c5..aa35327 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -1061,14 +1061,6 @@ ivi_layout_add_listener_remove_surface(struct wl_listener *listener)
return IVI_SUCCEEDED;
}
-static void
-ivi_layout_remove_notification_remove_surface(surface_remove_notification_func callback,
- void *userdata)
-{
- struct ivi_layout *layout = get_instance();
- remove_notification(&layout->surface_notification.removed.listener_list, callback, userdata);
-}
-
static int32_t
ivi_layout_add_notification_configure_surface(surface_configure_notification_func callback,
void *userdata)
@@ -2096,7 +2088,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,
- .remove_notification_remove_surface = ivi_layout_remove_notification_remove_surface,
.add_notification_configure_surface = ivi_layout_add_notification_configure_surface,
.remove_notification_configure_surface = ivi_layout_remove_notification_configure_surface,
.get_surfaces = ivi_layout_get_surfaces,
--
1.7.9.5
More information about the wayland-devel
mailing list