Merge from 2.4:

2004-05-10  Matthias Clasen  <mclasen@redhat.com>

	Merge from 2.4:

	* glib/gmain.c (block_source, unblock_source): Make these
	static.  (#142230, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 9d6a3b2f3ee0ac6f3072a577f02b8a712a666058..f82906cd9d5e06ab943b530f2843d98663793b5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Merge from 2.4:
+       
+       * glib/gmain.c (block_source, unblock_source): Make these 
+       static.  (#142230, Morten Welinder)
+
 2004-05-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9d6a3b2f3ee0ac6f3072a577f02b8a712a666058..f82906cd9d5e06ab943b530f2843d98663793b5a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-05-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Merge from 2.4:
+       
+       * glib/gmain.c (block_source, unblock_source): Make these 
+       static.  (#142230, Morten Welinder)
+
 2004-05-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 9d6a3b2f3ee0ac6f3072a577f02b8a712a666058..f82906cd9d5e06ab943b530f2843d98663793b5a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+2004-05-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Merge from 2.4:
+       
+       * glib/gmain.c (block_source, unblock_source): Make these 
+       static.  (#142230, Morten Welinder)
+
 2004-05-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9d6a3b2f3ee0ac6f3072a577f02b8a712a666058..f82906cd9d5e06ab943b530f2843d98663793b5a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-05-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Merge from 2.4:
+       
+       * glib/gmain.c (block_source, unblock_source): Make these 
+       static.  (#142230, Morten Welinder)
+
 2004-05-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9d6a3b2f3ee0ac6f3072a577f02b8a712a666058..f82906cd9d5e06ab943b530f2843d98663793b5a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-05-10  Matthias Clasen  <mclasen@redhat.com>
+
+       Merge from 2.4:
+       
+       * glib/gmain.c (block_source, unblock_source): Make these 
+       static.  (#142230, Morten Welinder)
+
 2004-05-10  Tor Lillqvist  <tml@iki.fi>
 
        * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

diff --git a/glib/gmain.c b/glib/gmain.c
index 3427f9507e0ab78b19ef728b8f90ae258fa2c6ae..e33067f6256829e7ee6a874a4d3b9cd760ea97dc 100644 (file)
--- 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;