Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/glib/ChangeLog,v
retrieving revision 1.1425
diff -u -p -r1.1425 ChangeLog
--- ChangeLog	30 Oct 2003 23:17:56 -0000	1.1425
+++ ChangeLog	1 Nov 2003 13:49:17 -0000
@@ -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
Index: glib/gmain.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gmain.c,v
retrieving revision 1.100
diff -u -p -r1.100 gmain.c
--- glib/gmain.c	25 Aug 2003 16:20:41 -0000	1.100
+++ glib/gmain.c	1 Nov 2003 13:49:18 -0000
@@ -2358,7 +2358,7 @@ g_main_context_iterate (GMainContext *co
   
   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 *co
   
   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);
