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

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)

diff --git a/ChangeLog b/ChangeLog
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a4ee2cfc0bff6cd92f0a688d854edfd001915cd..8aa4ca6e4ac739cdd1cd5def266e95b1ae4c23bc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * glib/gmain.[ch]: (Mostly patch from Sebastian Wilhemi)

diff --git a/glib/giounix.c b/glib/giounix.c
index 0bafcbbee16ccabb19481e044c04e15eb8028cd7..eb2e4cfda94a749b33720cd12c2960f2018c63a8 100644 (file)
--- 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 d9e63320e710d8da75b76e863f8c2c9cc291c4c5..af184ce6f12dbb3ee5b288de24c763520e1b5fdc 100644 (file)
--- 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 c44090b68ccd3d293c25ae4ad493c00ec196cd44..7c3add6f026c2705aa1b8a5445dd82e61848d9dc 100644 (file)
--- 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 db4d7cb88477ff515e789d5e383779b96158c06e..5853c10da12767ede2cc770fe1d28046249af5e5 100644 (file)
--- 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