Revert "libweston-desktop: Add listener and API to drop the idle inhibitor"

This reverts commit e7069bcf93b2ffcf04b4128cb468fe83dc18baea.

(Accidental landing)

4 files changed, 0 insertions, 33 deletions

diff --git a/libweston-desktop/internal.h b/libweston-desktop/internal.h
index e41c1e5c..a9c974b0 100644
--- a/libweston-desktop/internal.h
+++ b/libweston-desktop/internal.h
@@ -47,9 +47,6 @@ void
 weston_desktop_api_surface_removed(struct weston_desktop *desktop,
 				   struct weston_desktop_surface *surface);
 void
-weston_desktop_api_surface_drop_idle_inhibitor(struct weston_desktop *desktop,
-					       struct weston_desktop_surface *surface);
-void
 weston_desktop_api_committed(struct weston_desktop *desktop,
 			     struct weston_desktop_surface *surface,
 			     int32_t sx, int32_t sy);
diff --git a/libweston-desktop/libweston-desktop.c b/libweston-desktop/libweston-desktop.c
index 43ac081c..0ee11393 100644
--- a/libweston-desktop/libweston-desktop.c
+++ b/libweston-desktop/libweston-desktop.c
@@ -61,7 +61,6 @@ weston_desktop_create(struct weston_compositor *compositor,
 
 	assert(api->surface_added);
 	assert(api->surface_removed);
-	/* assert(api->surface_drop_idle_inhibitor); -- optional, for now */
 
 	desktop = zalloc(sizeof(struct weston_desktop));
 	desktop->compositor = compositor;
@@ -167,13 +166,6 @@ weston_desktop_api_surface_removed(struct weston_desktop *desktop,
 }
 
 void
-weston_desktop_api_surface_drop_idle_inhibitor(struct weston_desktop *desktop,
-				   struct weston_desktop_surface *surface)
-{
-	desktop->api.surface_drop_idle_inhibitor(surface, desktop->user_data);
-}
-
-void
 weston_desktop_api_committed(struct weston_desktop *desktop,
 			     struct weston_desktop_surface *surface,
 			     int32_t sx, int32_t sy)
diff --git a/libweston-desktop/libweston-desktop.h b/libweston-desktop/libweston-desktop.h
index 19dc271c..f77ab55b 100644
--- a/libweston-desktop/libweston-desktop.h
+++ b/libweston-desktop/libweston-desktop.h
@@ -59,8 +59,6 @@ struct weston_desktop_api {
 			      void *user_data);
 	void (*surface_removed)(struct weston_desktop_surface *surface,
 				void *user_data);
-	void (*surface_drop_idle_inhibitor)(struct weston_desktop_surface *surface,
-					    void *user_data);
 	void (*committed)(struct weston_desktop_surface *surface,
 			  int32_t sx, int32_t sy, void *user_data);
 	void (*show_window_menu)(struct weston_desktop_surface *surface,
diff --git a/libweston-desktop/surface.c b/libweston-desktop/surface.c
index b6075673..2205107b 100644
--- a/libweston-desktop/surface.c
+++ b/libweston-desktop/surface.c
@@ -54,7 +54,6 @@ struct weston_desktop_surface {
 	struct weston_position buffer_move;
 	struct wl_listener surface_commit_listener;
 	struct wl_listener surface_destroy_listener;
-	struct wl_listener surface_drop_idle_inhibitor_listener;
 	struct wl_listener client_destroy_listener;
 	struct wl_list children_list;
 
@@ -131,7 +130,6 @@ weston_desktop_surface_destroy(struct weston_desktop_surface *surface)
 
 	wl_list_remove(&surface->surface_commit_listener.link);
 	wl_list_remove(&surface->surface_destroy_listener.link);
-	wl_list_remove(&surface->surface_drop_idle_inhibitor_listener.link);
 	wl_list_remove(&surface->client_destroy_listener.link);
 
 	if (!wl_list_empty(&surface->resource_list)) {
@@ -220,20 +218,6 @@ weston_desktop_surface_resource_destroy(struct wl_resource *resource)
 }
 
 static void
-weston_desktop_surface_drop_idle_inhibitor(struct wl_listener *listener,
-					   void *data)
-{
-	struct weston_desktop_surface *surface =
-		wl_container_of(listener, surface, surface_drop_idle_inhibitor_listener);
-	struct weston_desktop *desktop = surface->desktop;
-
-	printf("weston_desktop_surface_drop_idle_inhibitor\n");
-	weston_desktop_api_surface_drop_idle_inhibitor(desktop, surface);
-	// TODO: Need to call shell.c's desktop_surface_drop_idle_inhibitor
-	//shell_desktop_api.surface_drop_idle_inhibitor(surface, NULL /*data?*/);
-}
-
-static void
 weston_desktop_surface_committed(struct weston_surface *wsurface,
 				 int32_t sx, int32_t sy)
 {
@@ -293,10 +277,6 @@ weston_desktop_surface_create(struct weston_desktop *desktop,
 		weston_desktop_surface_surface_destroyed;
 	wl_signal_add(&surface->surface->destroy_signal,
 		      &surface->surface_destroy_listener);
-	surface->surface_drop_idle_inhibitor_listener.notify =
-		weston_desktop_surface_drop_idle_inhibitor;
-	wl_signal_add(&surface->surface->drop_idle_inhibitor_signal,
-		      &surface->surface_drop_idle_inhibitor_listener);
 
 	wl_list_init(&surface->client_link);
 	wl_list_init(&surface->resource_list);