1 files changed, 11 insertions, 12 deletions

diff --git a/src/ivi-compositor.h b/src/ivi-compositor.h
index 695cf95..1e8c55a 100644
--- a/src/ivi-compositor.h
+++ b/src/ivi-compositor.h
@@ -59,14 +59,18 @@ struct ivi_output_config {
 	uint32_t transform;
 };
 
+struct ivi_backend {
+	struct weston_backend *backend;
+	struct wl_listener heads_changed;
+	int (*simple_output_configure)(struct weston_output *output);
+	struct wl_list link;
+};
+
 struct ivi_compositor {
 	struct weston_compositor *compositor;
-	struct weston_backend *backend;
 	struct weston_config *config;
 	struct ivi_output_config *parsed_options;
 
-	struct wl_listener heads_changed;
-	int (*simple_output_configure)(struct weston_output *output);
 
 	bool init_failed;
 	bool disable_cursor;
@@ -89,10 +93,8 @@ struct ivi_compositor {
 	} cmdline;
 	const struct weston_windowed_output_api *window_api;
 	const struct weston_drm_output_api *drm_api;
-	const struct weston_remoting_api *remoting_api;
 
 	struct wl_global *agl_shell;
-	struct wl_global *agl_shell_desktop;
 	struct wl_global *agl_shell_ext;
 
 	struct {
@@ -119,6 +121,7 @@ struct ivi_compositor {
 	struct wl_list outputs; /* ivi_output.link */
 	struct wl_list saved_outputs; /* ivi_output.link */
 	struct wl_list surfaces; /* ivi_surface.link */
+	struct wl_list backends;
 
 	struct weston_desktop *desktop;
 	struct wl_listener seat_created_listener;
@@ -318,7 +321,6 @@ struct ivi_surface {
 		int32_t width, height;
 	} pending;
 	bool mapped;
-	bool advertised_on_launch;
 	bool checked_pending;
 	enum {
 		NORMAL,
@@ -339,9 +341,6 @@ struct ivi_surface {
 		struct ivi_remote_surface remote;
 	};
 
-	struct wl_listener listener_advertise_app;
-	struct wl_signal signal_advertise_app;
-
 	struct {
 		bool is_set;
 		int32_t x;
@@ -501,9 +500,6 @@ void
 ivi_seat_reset_caps_sent(struct ivi_compositor *ivi);
 
 void
-agl_shell_desktop_advertise_application_id(struct ivi_compositor *ivi,
-					   struct ivi_surface *surface);
-void
 ivi_check_pending_surface_desktop(struct ivi_surface *surface,
 				  enum ivi_surface_role *role);
 
@@ -572,4 +568,7 @@ ivi_init_parsed_options(struct weston_compositor *compositor);
 void
 ivi_process_destroy(struct wet_process *process, int status, bool call_cleanup);
 
+void
+create_black_curtain_view(struct ivi_output *output);
+
 #endif