From a10ee91bd4d0251452b7f644453ab53acb71e3d3 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Thu, 7 May 2020 11:10:12 +0300
Subject: [PATCH] core: add idle & timeout method variants that take a GClosure

---
 lib/wp/core.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 lib/wp/core.h | 10 ++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/lib/wp/core.c b/lib/wp/core.c
index 9fc7e01d..a892afcb 100644
--- a/lib/wp/core.c
+++ b/lib/wp/core.c
@@ -495,6 +495,34 @@ wp_core_idle_add (WpCore * self, GSource **source, GSourceFunc function,
     *source = g_source_ref (s);
 }
 
+/**
+ * wp_core_idle_add_closure: (rename-to wp_core_idle_add)
+ * @self: the core
+ * @source: (out) (optional): the source
+ * @closure: the closure to invoke
+ *
+ * Adds an idle callback to be called in the same #GMainContext as the
+ * one used by this core.
+ *
+ * This is the same as wp_core_idle_add(), but it allows you to specify
+ * a #GClosure instead of a C callback.
+ */
+void
+wp_core_idle_add_closure (WpCore * self, GSource **source, GClosure * closure)
+{
+  g_autoptr (GSource) s = NULL;
+
+  g_return_if_fail (WP_IS_CORE (self));
+  g_return_if_fail (closure != NULL);
+
+  s = g_idle_source_new ();
+  g_source_set_closure (s, closure);
+  g_source_attach (s, self->context);
+
+  if (source)
+    *source = g_source_ref (s);
+}
+
 /**
  * wp_core_timeout_add:
  * @self: the core
@@ -513,7 +541,7 @@ wp_core_idle_add (WpCore * self, GSource **source, GSourceFunc function,
  * used by this core instead of the default context.
  */
 void
-wp_core_timeout_add (WpCore * self, GSource **source, guint64 timeout_ms,
+wp_core_timeout_add (WpCore * self, GSource **source, guint timeout_ms,
     GSourceFunc function, gpointer data, GDestroyNotify destroy)
 {
   g_autoptr (GSource) s = NULL;
@@ -528,6 +556,36 @@ wp_core_timeout_add (WpCore * self, GSource **source, guint64 timeout_ms,
     *source = g_source_ref (s);
 }
 
+/**
+ * wp_core_timeout_add_closure: (rename-to wp_core_timeout_add)
+ * @self: the core
+ * @source: (out) (optional): the source
+ * @timeout_ms: the timeout in milliseconds
+ * @closure: the closure to invoke
+ *
+ * Adds a timeout callback to be called at regular intervals in the same
+ * #GMainContext as the one used by this core.
+ *
+ * This is the same as wp_core_timeout_add(), but it allows you to specify
+ * a #GClosure instead of a C callback.
+ */
+void
+wp_core_timeout_add_closure (WpCore * self, GSource **source, guint timeout_ms,
+    GClosure * closure)
+{
+  g_autoptr (GSource) s = NULL;
+
+  g_return_if_fail (WP_IS_CORE (self));
+  g_return_if_fail (closure != NULL);
+
+  s = g_timeout_source_new (timeout_ms);
+  g_source_set_closure (s, closure);
+  g_source_attach (s, self->context);
+
+  if (source)
+    *source = g_source_ref (s);
+}
+
 /**
  * wp_core_sync:
  * @self: the core
diff --git a/lib/wp/core.h b/lib/wp/core.h
index 5128db4a..9bafbc37 100644
--- a/lib/wp/core.h
+++ b/lib/wp/core.h
@@ -54,9 +54,17 @@ void wp_core_idle_add (WpCore * self, GSource **source, GSourceFunc function,
     gpointer data, GDestroyNotify destroy);
 
 WP_API
-void wp_core_timeout_add (WpCore * self, GSource **source, guint64 timeout_ms,
+void wp_core_idle_add_closure (WpCore * self, GSource **source,
+    GClosure * closure);
+
+WP_API
+void wp_core_timeout_add (WpCore * self, GSource **source, guint timeout_ms,
     GSourceFunc function, gpointer data, GDestroyNotify destroy);
 
+WP_API
+void wp_core_timeout_add_closure (WpCore * self, GSource **source,
+    guint timeout_ms, GClosure * closure);
+
 WP_API
 gboolean wp_core_sync (WpCore * self, GCancellable * cancellable,
     GAsyncReadyCallback callback, gpointer user_data);
-- 
GitLab