From 185c1de57776dc6cc2c5447692d68acd58d8a941 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 10 May 2004 19:21:28 +0000 Subject: [PATCH] Merge from 2.4: 2004-05-10 Matthias Clasen Merge from 2.4: * glib/gmain.c (block_source, unblock_source): Make these static. (#142230, Morten Welinder) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ glib/gmain.c | 4 ++-- 6 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d6a3b2f..f82906cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-05-10 Matthias Clasen + + Merge from 2.4: + + * glib/gmain.c (block_source, unblock_source): Make these + static. (#142230, Morten Welinder) + 2004-05-10 Tor Lillqvist * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9d6a3b2f..f82906cd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-05-10 Matthias Clasen + + Merge from 2.4: + + * glib/gmain.c (block_source, unblock_source): Make these + static. (#142230, Morten Welinder) + 2004-05-10 Tor Lillqvist * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9d6a3b2f..f82906cd 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,10 @@ +2004-05-10 Matthias Clasen + + Merge from 2.4: + + * glib/gmain.c (block_source, unblock_source): Make these + static. (#142230, Morten Welinder) + 2004-05-10 Tor Lillqvist * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9d6a3b2f..f82906cd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-05-10 Matthias Clasen + + Merge from 2.4: + + * glib/gmain.c (block_source, unblock_source): Make these + static. (#142230, Morten Welinder) + 2004-05-10 Tor Lillqvist * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9d6a3b2f..f82906cd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-05-10 Matthias Clasen + + Merge from 2.4: + + * glib/gmain.c (block_source, unblock_source): Make these + static. (#142230, Morten Welinder) + 2004-05-10 Tor Lillqvist * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated diff --git a/glib/gmain.c b/glib/gmain.c index 3427f950..e33067f6 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1859,7 +1859,7 @@ g_main_depth (void) * we don't continually spin in the poll() */ /* HOLDS: source->context's lock */ -void +static void block_source (GSource *source) { GSList *tmp_list; @@ -1875,7 +1875,7 @@ block_source (GSource *source) } /* HOLDS: source->context's lock */ -void +static void unblock_source (GSource *source) { GSList *tmp_list; -- 2.34.1