Revert "libweston: Add a signal to fire when the idle inhibitor is dropped"
This reverts commit ca5b62426a97b4607d60eaf1154881ac8c1ac994.
(Accidental landing)
diff --git a/libweston/compositor.c b/libweston/compositor.c
index f503933..92f74aa 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -459,7 +459,6 @@
wl_signal_init(&surface->destroy_signal);
wl_signal_init(&surface->commit_signal);
- wl_signal_init(&surface->drop_idle_inhibitor_signal);
surface->compositor = compositor;
surface->ref_count = 1;
@@ -4730,7 +4729,15 @@
struct weston_surface *surface;
};
-/* Called when the client requests destruction of the idle inhibitor */
+static void
+destroy_idle_inhibitor(struct wl_resource *resource)
+{
+ struct weston_idle_inhibitor *inhibitor = wl_resource_get_user_data(resource);
+
+ inhibitor->surface = NULL;
+ free(inhibitor);
+}
+
static void
idle_inhibitor_destroy(struct wl_client *client, struct wl_resource *resource)
{
@@ -4739,24 +4746,6 @@
assert(inhibitor);
inhibitor->surface->inhibit_idling = false;
-
- // Notify to re-queue any idle behaviors
- wl_signal_emit(&inhibitor->surface->drop_idle_inhibitor_signal,
- inhibitor->surface);
-
- weston_log("idle_inhibitor_destroy\n");
-}
-
-/* Called when the idle inhibitor is destroyed on the server-side */
-static void
-destroy_idle_inhibitor(struct wl_resource *resource)
-{
- struct weston_idle_inhibitor *inhibitor = wl_resource_get_user_data(resource);
-
- weston_log("destroy_idle_inhibitor\n");
-
- inhibitor->surface = NULL;
- free(inhibitor);
}
static const struct zwp_idle_inhibitor_v1_interface idle_inhibitor_interface = {
diff --git a/libweston/compositor.h b/libweston/compositor.h
index 0c688cc..673a4e8 100644
--- a/libweston/compositor.h
+++ b/libweston/compositor.h
@@ -1071,7 +1071,6 @@
struct wl_signal destroy_signal; /* callback argument: this surface */
struct weston_compositor *compositor;
struct wl_signal commit_signal;
- struct wl_signal drop_idle_inhibitor_signal;
/** Damage in local coordinates from the client, for tex upload. */
pixman_region32_t damage;