summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-03-15 17:16:47 +0200
committerPekka Paalanen <pekka.paalanen@collabora.co.uk>2016-03-16 13:11:11 +0200
commit4a7503976b5d300a4474b149d877cf579c2a8c05 (patch)
tree31752d59842220dab8f7717373550fddad42c97f
parent1f82193379027842762fcd098170d4c58d508fd9 (diff)
ivi-shell: remove configured signal from ivi-layout
Now that ivi-layout calls directly into ivi-shell.c, this signal is no longer used. Remove it. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
-rw-r--r--ivi-shell/ivi-layout-private.h6
-rw-r--r--ivi-shell/ivi-layout-transition.c1
-rw-r--r--ivi-shell/ivi-layout.c24
3 files changed, 1 insertions, 30 deletions
diff --git a/ivi-shell/ivi-layout-private.h b/ivi-shell/ivi-layout-private.h
index 2edbae85..118a6d6a 100644
--- a/ivi-shell/ivi-layout-private.h
+++ b/ivi-shell/ivi-layout-private.h
@@ -53,8 +53,6 @@ struct ivi_layout_surface {
struct wl_list link;
struct wl_list layer_list;
} order;
-
- struct wl_signal configured;
};
struct ivi_layout_layer {
@@ -169,9 +167,7 @@ ivi_layout_surface_create(struct weston_surface *wl_surface,
uint32_t id_surface);
void
ivi_layout_init_with_compositor(struct weston_compositor *ec);
-void
-ivi_layout_surface_add_configured_listener(struct ivi_layout_surface* ivisurf,
- struct wl_listener* listener);
+
/**
* methods of interaction between transition animation with ivi-layout
*/
diff --git a/ivi-shell/ivi-layout-transition.c b/ivi-shell/ivi-layout-transition.c
index 966473bf..04b62a50 100644
--- a/ivi-shell/ivi-layout-transition.c
+++ b/ivi-shell/ivi-layout-transition.c
@@ -303,7 +303,6 @@ transition_move_resize_view_destroy(struct ivi_layout_transition *transition)
(struct move_resize_view_data *)transition->private_data;
struct ivi_layout_surface *layout_surface = data->surface;
- wl_signal_emit(&layout_surface->configured, layout_surface);
shell_surface_send_configure(layout_surface->surface,
layout_surface->prop.dest_width,
layout_surface->prop.dest_height);
diff --git a/ivi-shell/ivi-layout.c b/ivi-shell/ivi-layout.c
index f1ea9bd7..204ead02 100644
--- a/ivi-shell/ivi-layout.c
+++ b/ivi-shell/ivi-layout.c
@@ -168,17 +168,6 @@ get_weston_view(struct ivi_layout_surface *ivisurf)
}
static void
-remove_configured_listener(struct ivi_layout_surface *ivisurf)
-{
- struct wl_listener *link = NULL;
- struct wl_listener *next = NULL;
-
- wl_list_for_each_safe(link, next, &ivisurf->configured.listener_list, link) {
- wl_list_remove(&link->link);
- }
-}
-
-static void
remove_all_notification(struct wl_list *listener_list)
{
struct wl_listener *listener = NULL;
@@ -244,8 +233,6 @@ ivi_layout_surface_destroy(struct ivi_layout_surface *ivisurf)
ivi_layout_remove_all_surface_transitions(ivisurf);
- remove_configured_listener(ivisurf);
-
ivi_layout_surface_remove_notification(ivisurf);
free(ivisurf);
@@ -778,7 +765,6 @@ commit_surface_list(struct ivi_layout *layout)
ivisurf->pending.prop.transition_type = IVI_LAYOUT_TRANSITION_NONE;
if (configured && !is_surface_transition(ivisurf)) {
- wl_signal_emit(&ivisurf->configured, ivisurf);
shell_surface_send_configure(ivisurf->surface,
ivisurf->prop.dest_width,
ivisurf->prop.dest_height);
@@ -795,7 +781,6 @@ commit_surface_list(struct ivi_layout *layout)
ivisurf->pending.prop.transition_type = IVI_LAYOUT_TRANSITION_NONE;
if (configured && !is_surface_transition(ivisurf)) {
- wl_signal_emit(&ivisurf->configured, ivisurf);
shell_surface_send_configure(ivisurf->surface,
ivisurf->prop.dest_width,
ivisurf->prop.dest_height);
@@ -2431,7 +2416,6 @@ ivi_layout_surface_create(struct weston_surface *wl_surface,
}
wl_signal_init(&ivisurf->property_changed);
- wl_signal_init(&ivisurf->configured);
ivisurf->id_surface = id_surface;
ivisurf->layout = layout;
@@ -2491,14 +2475,6 @@ ivi_layout_init_with_compositor(struct weston_compositor *ec)
wl_list_init(&layout->pending_transition_list);
}
-
-void
-ivi_layout_surface_add_configured_listener(struct ivi_layout_surface* ivisurf,
- struct wl_listener* listener)
-{
- wl_signal_add(&ivisurf->configured, listener);
-}
-
static struct ivi_layout_interface ivi_layout_interface = {
/**
* commit all changes