From c1477f79e78c69311d6a12f29c30209a4d83b9bf Mon Sep 17 00:00:00 2001
From: Philip Withnall <pwithnall@endlessos.org>
Date: Fri, 27 May 2022 13:22:10 +0100
Subject: [PATCH] gmain: Factor out common GIdleSource code

This allows it to be reused and extended (internally) a little more.
This commit introduces no functional changes, but allows for more easy
additions in a following commit.

It introduces `GIdleSource` as a simple wrapper around `GSource`, which
will be extended in a following commit.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
---
 glib/gmain.c | 70 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 47 insertions(+), 23 deletions(-)

diff --git a/glib/gmain.c b/glib/gmain.c
index 53af23f51..ecff188bf 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -235,6 +235,7 @@
 
 /* Types */
 
+typedef struct _GIdleSource GIdleSource;
 typedef struct _GTimeoutSource GTimeoutSource;
 typedef struct _GChildWatchSource GChildWatchSource;
 typedef struct _GUnixSignalWatchSource GUnixSignalWatchSource;
@@ -332,6 +333,11 @@ struct _GMainLoop
   gint ref_count;  /* (atomic) */
 };
 
+struct _GIdleSource
+{
+  GSource  source;
+};
+
 struct _GTimeoutSource
 {
   GSource     source;
@@ -6012,6 +6018,23 @@ g_idle_dispatch (GSource    *source,
   return again;
 }
 
+static GSource *
+idle_source_new (void)
+{
+  GSource *source;
+  GIdleSource *idle_source;
+
+  source = g_source_new (&g_idle_funcs, sizeof (GIdleSource));
+  idle_source = (GIdleSource *) source;
+
+  g_source_set_priority (source, G_PRIORITY_DEFAULT_IDLE);
+
+  /* Set a default name on the source, just in case the caller does not. */
+  g_source_set_static_name (source, "GIdleSource");
+
+  return source;
+}
+
 /**
  * g_idle_source_new:
  * 
@@ -6027,16 +6050,34 @@ g_idle_dispatch (GSource    *source,
  **/
 GSource *
 g_idle_source_new (void)
+{
+  return idle_source_new ();
+}
+
+static guint
+idle_add_full (gint           priority,
+               GSourceFunc    function,
+               gpointer       data,
+               GDestroyNotify notify)
 {
   GSource *source;
+  guint id;
 
-  source = g_source_new (&g_idle_funcs, sizeof (GSource));
-  g_source_set_priority (source, G_PRIORITY_DEFAULT_IDLE);
+  g_return_val_if_fail (function != NULL, 0);
 
-  /* Set a default name on the source, just in case the caller does not. */
-  g_source_set_static_name (source, "GIdleSource");
+  source = idle_source_new ();
 
-  return source;
+  if (priority != G_PRIORITY_DEFAULT_IDLE)
+    g_source_set_priority (source, priority);
+
+  g_source_set_callback (source, function, data, notify);
+  id = g_source_attach (source, NULL);
+
+  TRACE (GLIB_IDLE_ADD (source, g_main_context_default (), id, priority, function, data));
+
+  g_source_unref (source);
+
+  return id;
 }
 
 /**
@@ -6070,24 +6111,7 @@ g_idle_add_full (gint           priority,
 		 gpointer       data,
 		 GDestroyNotify notify)
 {
-  GSource *source;
-  guint id;
-  
-  g_return_val_if_fail (function != NULL, 0);
-
-  source = g_idle_source_new ();
-
-  if (priority != G_PRIORITY_DEFAULT_IDLE)
-    g_source_set_priority (source, priority);
-
-  g_source_set_callback (source, function, data, notify);
-  id = g_source_attach (source, NULL);
-
-  TRACE (GLIB_IDLE_ADD (source, g_main_context_default (), id, priority, function, data));
-
-  g_source_unref (source);
-
-  return id;
+  return idle_add_full (priority, function, data, notify);
 }
 
 /**