From b37e7bbb53afd0f8d3386065aff0d74195737fd1 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 30 Jun 2001 20:06:16 +0000 Subject: [PATCH] Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858) Sat Jun 30 16:03:16 2001 Owen Taylor * glib/giowin32.c glib/giounix.c glib/gmain.[ch]: Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/giounix.c | 6 +++--- glib/giowin32.c | 6 +++--- glib/gmain.c | 4 ++-- glib/gmain.h | 2 +- 12 files changed, 57 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0a4ee2c..8aa4ca6 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Jun 30 16:03:16 2001 Owen Taylor + + * 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 * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi) diff --git a/glib/giounix.c b/glib/giounix.c index 0bafcbb..eb2e4cf 100644 --- a/glib/giounix.c +++ b/glib/giounix.c @@ -93,13 +93,13 @@ static gboolean g_io_unix_check (GSource *source); static gboolean g_io_unix_dispatch (GSource *source, GSourceFunc callback, gpointer user_data); -static void g_io_unix_destroy (GSource *source); +static void g_io_unix_finalize (GSource *source); GSourceFuncs unix_watch_funcs = { g_io_unix_prepare, g_io_unix_check, g_io_unix_dispatch, - g_io_unix_destroy + g_io_unix_finalize }; GIOFuncs unix_channel_funcs = { @@ -163,7 +163,7 @@ g_io_unix_dispatch (GSource *source, } static void -g_io_unix_destroy (GSource *source) +g_io_unix_finalize (GSource *source) { GIOUnixWatch *watch = (GIOUnixWatch *)source; diff --git a/glib/giowin32.c b/glib/giowin32.c index d9e6332..af184ce 100644 --- a/glib/giowin32.c +++ b/glib/giowin32.c @@ -582,13 +582,13 @@ g_io_win32_dispatch (GSource *source, } static void -g_io_win32_destroy (GSource *source) +g_io_win32_finalize (GSource *source) { GIOWin32Watch *watch = (GIOWin32Watch *)source; GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel; 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->watches = g_slist_remove (channel->watches, watch); @@ -601,7 +601,7 @@ static GSourceFuncs win32_watch_funcs = { g_io_win32_prepare, g_io_win32_check, g_io_win32_dispatch, - g_io_win32_destroy + g_io_win32_finalize }; static GSource * diff --git a/glib/gmain.c b/glib/gmain.c index c44090b..7c3add6 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -1268,8 +1268,8 @@ g_source_unref_internal (GSource *source, else if (context) g_source_list_remove (source, context); - if (source->source_funcs->destroy) - source->source_funcs->destroy (source); + if (source->source_funcs->finalize) + source->source_funcs->finalize (source); g_slist_free (source->poll_fds); source->poll_fds = NULL; diff --git a/glib/gmain.h b/glib/gmain.h index db4d7cb..5853c10 100644 --- a/glib/gmain.h +++ b/glib/gmain.h @@ -71,7 +71,7 @@ struct _GSourceFuncs gboolean (*dispatch) (GSource *source, GSourceFunc callback, 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 -- 2.7.4