luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge from 2.4:

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2004-05-10 19:21:28 +00:00 committed by Matthias Clasen
parent b5456a91d7
commit 185c1de577
6 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

7
ChangeLog.pre-2-10
View File

@ -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> 2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

7
ChangeLog.pre-2-12
View File

@ -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> 2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

7
ChangeLog.pre-2-6
View File

@ -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> 2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

7
ChangeLog.pre-2-8
View File

@ -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> 2004-05-10 Tor Lillqvist <tml@iki.fi>
* glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated * glib/giowin32.c (g_win32_print_gioflags): Remove two duplicated

4
glib/gmain.c
View File

@ -1859,7 +1859,7 @@ g_main_depth (void)
* we don't continually spin in the poll() * we don't continually spin in the poll()
*/ */
/* HOLDS: source->context's lock */ /* HOLDS: source->context's lock */
void static void
block_source (GSource *source) block_source (GSource *source)
{ {
GSList *tmp_list; GSList *tmp_list;
@ -1875,7 +1875,7 @@ block_source (GSource *source)
} }
/* HOLDS: source->context's lock */ /* HOLDS: source->context's lock */
void static void
unblock_source (GSource *source) unblock_source (GSource *source)
{ {
GSList *tmp_list; GSList *tmp_list;