More additions

diff --git a/ChangeLog b/ChangeLog
index 1580606fcd6d0bd843c2648a4f2b7d4c9cb02da5..00d589f80b75f31d998ddf725dce845f222e23b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,11 @@
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 
-       * glib/glib.symbols:
        * glib/gmain.h: 
-       * glib/gmain.c: Add two new functions, 
-       g_source_set_funcs and g_source_is_destroyed,
-       that will be necessary to solve thread-safety
-       issues with idles in GTK+.  (#321886, Chris Wilson)
+       * glib/gmain.c: Add three new functions, 
+       g_main_current_source, g_source_set_funcs and 
+       g_source_is_destroyed, that will be necessary to 
+       solve thread-safety issues with idles in GTK+.  
+       (#321886, Chris Wilson)
 
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1580606fcd6d0bd843c2648a4f2b7d4c9cb02da5..00d589f80b75f31d998ddf725dce845f222e23b1 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,11 +1,11 @@
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 
-       * glib/glib.symbols:
        * glib/gmain.h: 
-       * glib/gmain.c: Add two new functions, 
-       g_source_set_funcs and g_source_is_destroyed,
-       that will be necessary to solve thread-safety
-       issues with idles in GTK+.  (#321886, Chris Wilson)
+       * glib/gmain.c: Add three new functions, 
+       g_main_current_source, g_source_set_funcs and 
+       g_source_is_destroyed, that will be necessary to 
+       solve thread-safety issues with idles in GTK+.  
+       (#321886, Chris Wilson)
 
 2006-06-01  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/glib/gmain.c b/glib/gmain.c
index de9cc222faa546ec57ba95232a740d14b91a6960..d08ebc691c7093bc84034b5de3c4b14bde1bd8c8 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1925,7 +1925,7 @@ g_main_current_source (void)
  *   SomeWidget *self = data;
  *   
  *   GDK_THREADS_ENTER ();
- *   if (!g_source_is_destroyed (g_main_get_current_source ()))
+ *   if (!g_source_is_destroyed (g_main_current_source ()))
  *     {
  *       /<!-- -->* do stuff with self *<!-- -->/
  *     }