gnome-keyring r1002 - in trunk: . common

[nnielsen svn gnome org]

Author: nnielsen
Date: Fri Jan 11 15:55:28 2008
New Revision: 1002
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1002&view=rev

Log:
	* common/gkr-async.c: Drain the wakeup FD properly, so that we 
	don't hang in strange ways. Fixes part of bug #502603, see 
	backtrace in comment #21


Modified:
   trunk/ChangeLog
   trunk/common/gkr-async.c

Modified: trunk/common/gkr-async.c
==============================================================================
--- trunk/common/gkr-async.c	(original)
+++ trunk/common/gkr-async.c	Fri Jan 11 15:55:28 2008
@@ -121,6 +121,7 @@
 async_source_dispatch(GSource* source, GSourceFunc callback, gpointer user_data)
 {
 	/* Let a worker run */
+	gkr_wakeup_drain ();
 	DO_UNLOCK (async_mutex);
 	g_thread_yield ();
 	DO_LOCK (async_mutex);