From 89a803beb4da986d68ffc2d3bfccf8a624e260f6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 2 Jun 2006 02:50:38 +0000 Subject: [PATCH] More additions --- ChangeLog | 10 +++++----- ChangeLog.pre-2-12 | 10 +++++----- glib/gmain.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1580606fc..00d589f80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,11 @@ 2006-06-01 Matthias Clasen - * 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 diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1580606fc..00d589f80 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,11 +1,11 @@ 2006-06-01 Matthias Clasen - * 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 diff --git a/glib/gmain.c b/glib/gmain.c index de9cc222f..d08ebc691 100644 --- 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 */ * }