summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2012-04-11 10:22:45 -0400
committerDan Winship <danw@gnome.org>2012-06-26 08:40:31 -0400
commit532f463eaf48d6a560977fd64479cfa05433162e (patch)
tree4e5d87ebea85aae56e73dc3d13a8bee063967278
parentd981d79a4291f76373f7f0e3abec762977133e27 (diff)
downloadglib-532f463eaf48d6a560977fd64479cfa05433162e.tar.gz
gmain: child sources must always have same priority as parent
A child source does not have a priority of its own; it must have the same priority as its parent. Enforce this in g_source_set_priority_unlocked(). https://bugzilla.gnome.org/show_bug.cgi?id=619329
-rw-r--r--glib/gmain.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/glib/gmain.c b/glib/gmain.c
index 2417680e4..60554f5df 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1367,6 +1367,9 @@ g_source_set_priority_unlocked (GSource *source,
{
GSList *tmp_list;
+ g_return_if_fail (source->priv->parent_source == NULL ||
+ source->priv->parent_source->priority == priority);
+
source->priority = priority;
if (context)