summaryrefslogtreecommitdiff
path: root/weston-ivi-shell
diff options
context:
space:
mode:
authorEmre Ucan <eucan@de.adit-jv.com>2015-09-21 16:25:54 +0200
committerNobuhiko Tanibata <nobuhiko_tanibata@xddp.denso.co.jp>2015-09-22 13:15:55 +0900
commite812c754f1991f40819037bd49c2f72f890503da (patch)
treedbdd36430c89a6ac22b70776d18d716f5297f1af /weston-ivi-shell
parentdd1bf0fcec9acd6a5e668182ca143a9a26c1b9fb (diff)
downloadwayland-ivi-extension-e812c754f1991f40819037bd49c2f72f890503da.tar.gz
ivi-controller: remove unused members of ivishell struct
Signed-off-by: Emre Ucan <eucan@de.adit-jv.com>
Diffstat (limited to 'weston-ivi-shell')
-rw-r--r--weston-ivi-shell/src/ivi-controller-impl.c2
-rw-r--r--weston-ivi-shell/src/ivi-extension.h25
2 files changed, 0 insertions, 27 deletions
diff --git a/weston-ivi-shell/src/ivi-controller-impl.c b/weston-ivi-shell/src/ivi-controller-impl.c
index d72edee..f8f8c73 100644
--- a/weston-ivi-shell/src/ivi-controller-impl.c
+++ b/weston-ivi-shell/src/ivi-controller-impl.c
@@ -1417,9 +1417,7 @@ init_ivi_shell(struct weston_compositor *ec, struct ivishell *shell)
wl_list_init(&shell->list_surface);
wl_list_init(&shell->list_layer);
wl_list_init(&shell->list_screen);
- wl_list_init(&shell->list_weston_surface);
wl_list_init(&shell->list_controller);
- shell->event_restriction = 0;
wl_list_for_each(output, &ec->output_list, link) {
iviscrn = create_screen(shell, output);
diff --git a/weston-ivi-shell/src/ivi-extension.h b/weston-ivi-shell/src/ivi-extension.h
index df02d41..ee7e78b 100644
--- a/weston-ivi-shell/src/ivi-extension.h
+++ b/weston-ivi-shell/src/ivi-extension.h
@@ -26,38 +26,13 @@
#include <weston/compositor.h>
struct ivishell {
- struct wl_resource *resource;
-
- struct wl_listener destroy_listener;
-
struct weston_compositor *compositor;
- struct weston_surface *surface;
-
- struct weston_process process;
-
- struct weston_seat *seat;
-
struct wl_list list_surface;
struct wl_list list_layer;
struct wl_list list_screen;
- struct wl_list list_weston_surface;
-
struct wl_list list_controller;
-
- struct {
- struct weston_process process;
- struct wl_client *client;
- struct wl_resource *desktop_shell;
-
- unsigned deathcount;
- uint32_t deathstamp;
- } child;
-
- int state;
- int previous_state;
- int event_restriction;
};
int32_t