GMain: simplify logic for g_wakeup_acknowledge()

Instead of messing around with context->poll_waiting, just look at the
GPollFD to see if the GWakeup needs to be acknowledged.
This commit is contained in:
Ryan Lortie 2011-08-31 22:07:02 -04:00
parent 87880dfa57
commit 7eae486179

View File

@ -2839,12 +2839,11 @@ g_main_context_check (GMainContext *context,
UNLOCK_CONTEXT (context);
return FALSE;
}
if (!context->poll_waiting)
if (context->wake_up_rec.events)
g_wakeup_acknowledge (context->wakeup);
else
context->poll_waiting = FALSE;
context->poll_waiting = FALSE;
/* If the set of poll file descriptors changed, bail out
* and let the main loop rerun