glib r6874 - in trunk: . glib

[timj svn gnome org]

Author: timj
Date: Fri May  2 11:22:10 2008
New Revision: 6874
URL: http://svn.gnome.org/viewvc/glib?rev=6874&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/glib/gmain.c

Modified: trunk/glib/gmain.c
==============================================================================
--- trunk/glib/gmain.c	(original)
+++ trunk/glib/gmain.c	Fri May  2 11:22:10 2008
@@ -108,7 +108,7 @@
 struct _GMainDispatch
 {
   gint depth;
-  GSList *source; /* stack of current sources */
+  GSList *dispatching_sources; /* stack of current sources */
 };
 
 struct _GMainContext
@@ -1829,7 +1829,7 @@
 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 @@
 	   * 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 = &current_source_link;
+	  current_source_link.next = current->dispatching_sources;
+	  current->dispatching_sources = &current_source_link;
 	  need_destroy = ! dispatch (source,
 				     callback,
 				     user_data);
-	  g_assert (current->source == &current_source_link);
-	  current->source = current_source_link.next;
+	  g_assert (current->dispatching_sources == &current_source_link);
+	  current->dispatching_sources = current_source_link.next;
 	  current->depth--;
 	  
 	  if (cb_funcs)