Add macros for GSourceFunc return values

The boolean values to be returned by a GSourceFunc are always ambiguous,
and even in case of experienced developers then can lead to confusion.

The Perl bindings for GLib have two simple constants, mapping to TRUE
and FALSE, that make the return values less confusing: G_SOURCE_CONTINUE
and G_SOURCE_REMOVE respectively.

https://bugzilla.gnome.org/show_bug.cgi?id=631413

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 069270c37edcab9fe586ae53e496f6e6a6a51e6d..13f35268615ef2b0dff9a2e767e2640b4000e4e2 100644 (file)
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -446,6 +446,10 @@ G_PRIORITY_HIGH_IDLE
 G_PRIORITY_DEFAULT_IDLE
 G_PRIORITY_LOW
 
+<SUBSECTION>
+G_SOURCE_CONTINUE
+G_SOURCE_REMOVE
+
 <SUBSECTION>
 GMainContext
 g_main_context_new

diff --git a/glib/gmain.h b/glib/gmain.h
index e6336b872c764f935e73ad7b64bcf8a2857936ce..80895e29ab4e4847e43d2b8788f2d42536b9bd72 100644 (file)
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -258,6 +258,26 @@ struct _GSourceFuncs
  */
 #define G_PRIORITY_LOW              300
 
+/**
+ * G_SOURCE_REMOVE:
+ *
+ * Use this macro as the return value of a #GSourceFunc to remove
+ * the #GSource from the main loop.
+ *
+ * Since: 2.28
+ */
+#define G_SOURCE_REMOVE         FALSE
+
+/**
+ * G_SOURCE_CONTINUE:
+ *
+ * Use this macro as the return value of a #GSourceFunc to leave
+ * the #GSource in the main loop.
+ *
+ * Since: 2.28
+ */
+#define G_SOURCE_CONTINUE       TRUE
+
 /* GMainContext: */
 
 GMainContext *g_main_context_new       (void);