gmain: simplify g_main_context_find_source_by_id()

Since we now keep a hashtable of sources, we can implement this function
without iteration.

https://bugzilla.gnome.org/show_bug.cgi?id=724839
This commit is contained in:
Ryan Lortie 2014-02-08 12:23:46 +00:00
parent 9e81709012
commit 393503ba5b

View File

@ -2049,7 +2049,6 @@ GSource *
g_main_context_find_source_by_id (GMainContext *context,
guint source_id)
{
GSourceIter iter;
GSource *source;
g_return_val_if_fail (source_id > 0, NULL);
@ -2058,18 +2057,12 @@ g_main_context_find_source_by_id (GMainContext *context,
context = g_main_context_default ();
LOCK_CONTEXT (context);
g_source_iter_init (&iter, context, FALSE);
while (g_source_iter_next (&iter, &source))
{
if (!SOURCE_DESTROYED (source) &&
source->source_id == source_id)
break;
}
g_source_iter_clear (&iter);
source = g_hash_table_lookup (context->sources, GUINT_TO_POINTER (source_id));
UNLOCK_CONTEXT (context);
if (source && SOURCE_DESTROYED (source))
source = NULL;
return source;
}