From 02e2b9539333062f0e2e0daf74b03e66cb177c89 Mon Sep 17 00:00:00 2001 From: "13:24:13 Tim Janik" Date: Fri, 2 May 2008 11:22:10 +0000 Subject: [PATCH] renamed GMainDispatch.dispatching_sources to be more descriptive and 2008-05-02 13:24:13 Tim Janik * glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more descriptive and distinguishable within the source file. svn path=/trunk/; revision=6874 --- ChangeLog | 5 +++++ glib/gmain.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4fa900fe1..eb0d7ee47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-02 13:24:13 Tim Janik + + * glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more + descriptive and distinguishable within the source file. + 2008-04-21 Tor Lillqvist Bug 528752 - Win32 build and SSL not working diff --git a/glib/gmain.c b/glib/gmain.c index b90bd8baf..7abd5b58d 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -108,7 +108,7 @@ typedef struct _GMainDispatch GMainDispatch; struct _GMainDispatch { gint depth; - GSList *source; /* stack of current sources */ + GSList *dispatching_sources; /* stack of current sources */ }; struct _GMainContext @@ -1829,7 +1829,7 @@ GSource * g_main_current_source (void) { GMainDispatch *dispatch = get_dispatch (); - return dispatch->source ? dispatch->source->data : NULL; + return dispatch->dispatching_sources ? dispatch->dispatching_sources->data : NULL; } /** @@ -2004,13 +2004,13 @@ g_main_dispatch (GMainContext *context) * This is a performance hack - do not revert to g_slist_prepend()! */ current_source_link.data = source; - current_source_link.next = current->source; - current->source = ¤t_source_link; + current_source_link.next = current->dispatching_sources; + current->dispatching_sources = ¤t_source_link; need_destroy = ! dispatch (source, callback, user_data); - g_assert (current->source == ¤t_source_link); - current->source = current_source_link.next; + g_assert (current->dispatching_sources == ¤t_source_link); + current->dispatching_sources = current_source_link.next; current->depth--; if (cb_funcs)