luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-16 20:38:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

renamed GMainDispatch.dispatching_sources to be more descriptive and

Browse Source 
2008-05-02 13:24:13  Tim Janik  <timj@imendio.com>

        * glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more
        descriptive and distinguishable within the source file.


svn path=/trunk/; revision=6874
This commit is contained in:
13:24:13 Tim Janik 2008-05-02 11:22:10 +00:00 committed by Tim Janik
parent 27dba4c28b
commit 02e2b95393
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-05-02 13:24:13 Tim Janik <timj@imendio.com>
* glib/gmain.c: renamed GMainDispatch.dispatching_sources to be more
descriptive and distinguishable within the source file.
2008-04-21 Tor Lillqvist <tml@novell.com> 2008-04-21 Tor Lillqvist <tml@novell.com>
Bug 528752 - Win32 build and SSL not working Bug 528752 - Win32 build and SSL not working

12
glib/gmain.c
View File

@ -108,7 +108,7 @@ typedef struct _GMainDispatch GMainDispatch;
struct _GMainDispatch struct _GMainDispatch
{ {
gint depth; gint depth;
GSList *source; /* stack of current sources */ GSList *dispatching_sources; /* stack of current sources */
}; };
struct _GMainContext struct _GMainContext
@ -1829,7 +1829,7 @@ GSource *
g_main_current_source (void) g_main_current_source (void)
{ {
GMainDispatch *dispatch = get_dispatch (); 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()! * This is a performance hack - do not revert to g_slist_prepend()!
*/ */
current_source_link.data = source; current_source_link.data = source;
current_source_link.next = current->source; current_source_link.next = current->dispatching_sources;
current->source = &current_source_link; current->dispatching_sources = &current_source_link;
need_destroy = ! dispatch (source, need_destroy = ! dispatch (source,
callback, callback,
user_data); user_data);
g_assert (current->source == &current_source_link); g_assert (current->dispatching_sources == &current_source_link);
current->source = current_source_link.next; current->dispatching_sources = current_source_link.next;
current->depth--; current->depth--;
if (cb_funcs) if (cb_funcs)