Merge clutter.git/threading branch

This commit is contained in:
Emmanuele Bassi
2007-08-08 10:20:14 +00:00
parent f5b4b96394
commit 4befcd0a64
16 changed files with 543 additions and 62 deletions

View File

@ -183,12 +183,16 @@ static gboolean
clutter_timeout_dispatch (GSource *source,
ClutterTimeout *timeout)
{
gboolean retval = FALSE;
if (G_UNLIKELY (!timeout->func))
{
g_warning ("Timeout dispatched without a callback.");
return FALSE;
}
clutter_threads_enter ();
if (timeout->func (timeout->data))
{
GTimeVal current_time;
@ -196,10 +200,12 @@ clutter_timeout_dispatch (GSource *source,
g_source_get_current_time (source, &current_time);
clutter_timeout_set_expiration (timeout, &current_time);
return TRUE;
retval = TRUE;
}
else
return FALSE;
clutter_threads_leave ();
return retval;
}
static ClutterTimeout *