From: Owen Taylor <otaylor@redhat.com>
Date: Sat, 1 Nov 2003 13:57:48 +0000 (+0000)
Subject: Set the return value from the result of g_main_context_check() (after we
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3f1a49ea41a20dacbabea33d4dbcbd62c8c4bb2b;p=dana%2Fcg-glib.git

Set the return value from the result of g_main_context_check() (after we

Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>

        * glib/gmain.c (g_main_context_iterate): Set the
        return value from the result of g_main_context_check()
        (after we poll) rather than g_main_context_prepare.
        (#121675, Padraig O'Briain)
---

diff --git a/ChangeLog b/ChangeLog
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2d69f7e2..16811ebd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Nov  1 08:45:38 2003  Owen Taylor  <otaylor@redhat.com>
+
+	* glib/gmain.c (g_main_context_iterate): Set the
+	return value from the result of g_main_context_check()
+	(after we poll) rather than g_main_context_prepare.
+	(#121675, Padraig O'Briain)
+
 Fri Oct 31 00:13:53 2003  Matthias Clasen  <maclas@gmx.de>
 
 	* configure.in: Remove the semicolon from the definition of
diff --git a/glib/gmain.c b/glib/gmain.c
index c838274d..603eec07 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -2358,7 +2358,7 @@ g_main_context_iterate (GMainContext *context,
   
   UNLOCK_CONTEXT (context);
 
-  some_ready = g_main_context_prepare (context, &max_priority); 
+  g_main_context_prepare (context, &max_priority); 
   
   while ((nfds = g_main_context_query (context, max_priority, &timeout, fds, 
 				       allocated_nfds)) > allocated_nfds)
@@ -2375,7 +2375,7 @@ g_main_context_iterate (GMainContext *context,
   
   g_main_context_poll (context, timeout, max_priority, fds, nfds);
   
-  g_main_context_check (context, max_priority, fds, nfds);
+  some_ready = g_main_context_check (context, max_priority, fds, nfds);
   
   if (dispatch)
     g_main_context_dispatch (context);