luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-17 18:04:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858)

Browse Source 
Sat Jun 30 16:03:16 2001  Owen Taylor  <otaylor@redhat.com>

	* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
	Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
	(#56858)
This commit is contained in:
Owen Taylor 2001-06-30 20:06:16 +00:00 committed by Owen Taylor
parent 8951f96c50
commit b37e7bbb53
12 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-12
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com>
* glib/giowin32.c glib/giounix.c glib/gmain.[ch]:
Rename GSourceFuncs::destroy to GSourceFuncs::finalize.
(#56858)
Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com> Sat Jun 30 15:49:10 2001 Owen Taylor <otaylor@redhat.com>
* glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

6
glib/giounix.c
View File

@ -93,13 +93,13 @@ static gboolean g_io_unix_check (GSource *source);
static gboolean g_io_unix_dispatch (GSource *source, static gboolean g_io_unix_dispatch (GSource *source,
GSourceFunc callback, GSourceFunc callback,
gpointer user_data); gpointer user_data);
static void g_io_unix_destroy (GSource *source); static void g_io_unix_finalize (GSource *source);
GSourceFuncs unix_watch_funcs = { GSourceFuncs unix_watch_funcs = {
g_io_unix_prepare, g_io_unix_prepare,
g_io_unix_check, g_io_unix_check,
g_io_unix_dispatch, g_io_unix_dispatch,
g_io_unix_destroy g_io_unix_finalize
}; };
GIOFuncs unix_channel_funcs = { GIOFuncs unix_channel_funcs = {
@ -163,7 +163,7 @@ g_io_unix_dispatch (GSource *source,
} }
static void static void
g_io_unix_destroy (GSource *source) g_io_unix_finalize (GSource *source)
{ {
GIOUnixWatch *watch = (GIOUnixWatch *)source; GIOUnixWatch *watch = (GIOUnixWatch *)source;

6
glib/giowin32.c
View File

@ -582,13 +582,13 @@ g_io_win32_dispatch (GSource *source,
} }
static void static void
g_io_win32_destroy (GSource *source) g_io_win32_finalize (GSource *source)
{ {
GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOWin32Watch *watch = (GIOWin32Watch *)source;
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel; GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
if (channel->debug) if (channel->debug)
g_print ("g_io_win32_destroy: channel with thread %#x\n", g_print ("g_io_win32_finalize: channel with thread %#x\n",
channel->thread_id); channel->thread_id);
channel->watches = g_slist_remove (channel->watches, watch); channel->watches = g_slist_remove (channel->watches, watch);
@ -601,7 +601,7 @@ static GSourceFuncs win32_watch_funcs = {
g_io_win32_prepare, g_io_win32_prepare,
g_io_win32_check, g_io_win32_check,
g_io_win32_dispatch, g_io_win32_dispatch,
g_io_win32_destroy g_io_win32_finalize
}; };
static GSource * static GSource *

4
glib/gmain.c
View File

@ -1268,8 +1268,8 @@ g_source_unref_internal (GSource *source,
else if (context) else if (context)
g_source_list_remove (source, context); g_source_list_remove (source, context);
if (source->source_funcs->destroy) if (source->source_funcs->finalize)
source->source_funcs->destroy (source); source->source_funcs->finalize (source);
g_slist_free (source->poll_fds); g_slist_free (source->poll_fds);
source->poll_fds = NULL; source->poll_fds = NULL;

2
glib/gmain.h
View File

@ -71,7 +71,7 @@ struct _GSourceFuncs
gboolean (*dispatch) (GSource *source, gboolean (*dispatch) (GSource *source,
GSourceFunc callback, GSourceFunc callback,
gpointer user_data); gpointer user_data);
void (*destroy) (GSource *source); /* Can be NULL */ void (*finalize) (GSource *source); /* Can be NULL */
}; };
/* Any definitions using GPollFD or GPollFunc are primarily /* Any definitions using GPollFD or GPollFunc are primarily