glib r7048 - trunk/gio

[mitch svn gnome org]

Author: mitch
Date: Mon Jun 16 09:54:04 2008
New Revision: 7048
URL: http://svn.gnome.org/viewvc/glib?rev=7048&view=rev

Log:
2008-06-16  Michael Natterer  <mitch imendio com>

	* *.c: chain up unconditionally in finalize() and dispose(). Also
	don't dereference these function pointers when calling them since
	that has no meaning at all.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/gbufferedinputstream.c
   trunk/gio/gbufferedoutputstream.c
   trunk/gio/gcancellable.c
   trunk/gio/gdummyfile.c
   trunk/gio/gfileenumerator.c
   trunk/gio/gfileicon.c
   trunk/gio/gfileinfo.c
   trunk/gio/gfilemonitor.c
   trunk/gio/gfilenamecompleter.c
   trunk/gio/gfilterinputstream.c
   trunk/gio/ginputstream.c
   trunk/gio/glocaldirectorymonitor.c
   trunk/gio/glocalfile.c
   trunk/gio/glocalfileenumerator.c
   trunk/gio/glocalfileinputstream.c
   trunk/gio/glocalfilemonitor.c
   trunk/gio/glocalfileoutputstream.c
   trunk/gio/gmemoryinputstream.c
   trunk/gio/gmemoryoutputstream.c
   trunk/gio/gmountoperation.c
   trunk/gio/gnativevolumemonitor.c
   trunk/gio/goutputstream.c
   trunk/gio/gpollfilemonitor.c
   trunk/gio/gsimpleasyncresult.c
   trunk/gio/gthemedicon.c
   trunk/gio/gunionvolumemonitor.c
   trunk/gio/gunixinputstream.c
   trunk/gio/gunixmount.c
   trunk/gio/gunixmounts.c
   trunk/gio/gunixoutputstream.c
   trunk/gio/gunixvolume.c
   trunk/gio/gunixvolumemonitor.c
   trunk/gio/gvolumemonitor.c
   trunk/gio/gwin32appinfo.c

Modified: trunk/gio/gbufferedinputstream.c
==============================================================================
--- trunk/gio/gbufferedinputstream.c	(original)
+++ trunk/gio/gbufferedinputstream.c	Mon Jun 16 09:54:04 2008
@@ -298,8 +298,7 @@
 
   g_free (priv->buffer);
 
-  if (G_OBJECT_CLASS (g_buffered_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_buffered_input_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_buffered_input_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gbufferedoutputstream.c
==============================================================================
--- trunk/gio/gbufferedoutputstream.c	(original)
+++ trunk/gio/gbufferedoutputstream.c	Mon Jun 16 09:54:04 2008
@@ -335,8 +335,7 @@
 
   g_free (priv->buffer);
 
-  if (G_OBJECT_CLASS (g_buffered_output_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_buffered_output_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_buffered_output_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gcancellable.c
==============================================================================
--- trunk/gio/gcancellable.c	(original)
+++ trunk/gio/gcancellable.c	Mon Jun 16 09:54:04 2008
@@ -78,9 +78,8 @@
   
   if (cancellable->cancel_pipe[1] != -1)
     close (cancellable->cancel_pipe[1]);
-  
-  if (G_OBJECT_CLASS (g_cancellable_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_cancellable_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_cancellable_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gdummyfile.c
==============================================================================
--- trunk/gio/gdummyfile.c	(original)
+++ trunk/gio/gdummyfile.c	Mon Jun 16 09:54:04 2008
@@ -87,9 +87,8 @@
     _g_decoded_uri_free (dummy->decoded_uri);
   
   g_free (dummy->text_uri);
-  
-  if (G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_dummy_file_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gfileenumerator.c
==============================================================================
--- trunk/gio/gfileenumerator.c	(original)
+++ trunk/gio/gfileenumerator.c	Mon Jun 16 09:54:04 2008
@@ -117,8 +117,8 @@
     g_object_unref (enumerator->priv->container);
     enumerator->priv->container = NULL;
   }
-  
-  (*G_OBJECT_CLASS (g_file_enumerator_parent_class)->dispose) (object);
+
+  G_OBJECT_CLASS (g_file_enumerator_parent_class)->dispose (object);
 }
 
 static void
@@ -131,8 +131,7 @@
   if (!enumerator->priv->closed)
     g_file_enumerator_close (enumerator, NULL, NULL);
 
-  if (G_OBJECT_CLASS (g_file_enumerator_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_file_enumerator_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_file_enumerator_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gfileicon.c
==============================================================================
--- trunk/gio/gfileicon.c	(original)
+++ trunk/gio/gfileicon.c	Mon Jun 16 09:54:04 2008
@@ -73,9 +73,8 @@
   icon = G_FILE_ICON (object);
 
   g_object_unref (icon->file);
-  
-  if (G_OBJECT_CLASS (g_file_icon_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_file_icon_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_file_icon_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gfileinfo.c
==============================================================================
--- trunk/gio/gfileinfo.c	(original)
+++ trunk/gio/gfileinfo.c	Mon Jun 16 09:54:04 2008
@@ -234,9 +234,8 @@
 
   if (info->mask != NO_ATTRIBUTE_MASK)
     g_file_attribute_matcher_unref (info->mask);
-  
-  if (G_OBJECT_CLASS (g_file_info_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_file_info_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_file_info_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gfilemonitor.c
==============================================================================
--- trunk/gio/gfilemonitor.c	(original)
+++ trunk/gio/gfilemonitor.c	Mon Jun 16 09:54:04 2008
@@ -156,9 +156,8 @@
     }
 
   g_hash_table_destroy (monitor->priv->rate_limiter);
-  
-  if (G_OBJECT_CLASS (g_file_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_file_monitor_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_file_monitor_parent_class)->finalize (object);
 }
 
 static void
@@ -170,9 +169,8 @@
 
   /* Make sure we cancel on last unref */
   g_file_monitor_cancel (monitor);
-  
-  if (G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose)
-    (*G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose) (object);
+
+  G_OBJECT_CLASS (g_file_monitor_parent_class)->dispose (object);
 }
 
 static void

Modified: trunk/gio/gfilenamecompleter.c
==============================================================================
--- trunk/gio/gfilenamecompleter.c	(original)
+++ trunk/gio/gfilenamecompleter.c	Mon Jun 16 09:54:04 2008
@@ -85,9 +85,8 @@
 
   g_list_foreach (completer->basenames, (GFunc)g_free, NULL);
   g_list_free (completer->basenames);
-  
-  if (G_OBJECT_CLASS (g_filename_completer_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_filename_completer_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_filename_completer_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gfilterinputstream.c
==============================================================================
--- trunk/gio/gfilterinputstream.c	(original)
+++ trunk/gio/gfilterinputstream.c	Mon Jun 16 09:54:04 2008
@@ -185,8 +185,7 @@
 
   g_object_unref (stream->base_stream);
 
-  if (G_OBJECT_CLASS (g_filter_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_filter_input_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_filter_input_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/ginputstream.c
==============================================================================
--- trunk/gio/ginputstream.c	(original)
+++ trunk/gio/ginputstream.c	Mon Jun 16 09:54:04 2008
@@ -89,8 +89,7 @@
   if (!stream->priv->closed)
     g_input_stream_close (stream, NULL, NULL);
 
-  if (G_OBJECT_CLASS (g_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_input_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_input_stream_parent_class)->finalize (object);
 }
 
 static void
@@ -102,9 +101,8 @@
   
   if (!stream->priv->closed)
     g_input_stream_close (stream, NULL, NULL);
-  
-  if (G_OBJECT_CLASS (g_input_stream_parent_class)->dispose)
-    (*G_OBJECT_CLASS (g_input_stream_parent_class)->dispose) (object);
+
+  G_OBJECT_CLASS (g_input_stream_parent_class)->dispose (object);
 }
 
 

Modified: trunk/gio/glocaldirectorymonitor.c
==============================================================================
--- trunk/gio/glocaldirectorymonitor.c	(original)
+++ trunk/gio/glocaldirectorymonitor.c	Mon Jun 16 09:54:04 2008
@@ -58,8 +58,7 @@
       local_monitor->mount_monitor = NULL;
     }
 
-  if (G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_local_directory_monitor_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Mon Jun 16 09:54:04 2008
@@ -130,9 +130,8 @@
   local = G_LOCAL_FILE (object);
 
   g_free (local->filename);
-  
-  if (G_OBJECT_CLASS (g_local_file_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_file_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_local_file_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/glocalfileenumerator.c
==============================================================================
--- trunk/gio/glocalfileenumerator.c	(original)
+++ trunk/gio/glocalfileenumerator.c	Mon Jun 16 09:54:04 2008
@@ -128,9 +128,8 @@
     }
 
   free_entries (local);
-  
-  if (G_OBJECT_CLASS (g_local_file_enumerator_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_file_enumerator_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_local_file_enumerator_parent_class)->finalize (object);
 }
 
 

Modified: trunk/gio/glocalfileinputstream.c
==============================================================================
--- trunk/gio/glocalfileinputstream.c	(original)
+++ trunk/gio/glocalfileinputstream.c	Mon Jun 16 09:54:04 2008
@@ -80,9 +80,8 @@
   GLocalFileInputStream *file;
   
   file = G_LOCAL_FILE_INPUT_STREAM (object);
-  
-  if (G_OBJECT_CLASS (g_local_file_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_file_input_stream_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_local_file_input_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/glocalfilemonitor.c
==============================================================================
--- trunk/gio/glocalfilemonitor.c	(original)
+++ trunk/gio/glocalfilemonitor.c	Mon Jun 16 09:54:04 2008
@@ -106,8 +106,7 @@
       local_monitor->filename = NULL;
     }
 
-  if (G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_local_file_monitor_parent_class)->finalize (object);
 }
 
 static void g_local_file_monitor_class_init (GLocalFileMonitorClass *klass)

Modified: trunk/gio/glocalfileoutputstream.c
==============================================================================
--- trunk/gio/glocalfileoutputstream.c	(original)
+++ trunk/gio/glocalfileoutputstream.c	Mon Jun 16 09:54:04 2008
@@ -108,9 +108,8 @@
   g_free (file->priv->original_filename);
   g_free (file->priv->backup_filename);
   g_free (file->priv->etag);
-  
-  if (G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_local_file_output_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gmemoryinputstream.c
==============================================================================
--- trunk/gio/gmemoryinputstream.c	(original)
+++ trunk/gio/gmemoryinputstream.c	Mon Jun 16 09:54:04 2008
@@ -163,8 +163,7 @@
   g_slist_foreach (priv->chunks, free_chunk, NULL);
   g_slist_free (priv->chunks);
 
-  if (G_OBJECT_CLASS (g_memory_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_memory_input_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_memory_input_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gmemoryoutputstream.c
==============================================================================
--- trunk/gio/gmemoryoutputstream.c	(original)
+++ trunk/gio/gmemoryoutputstream.c	Mon Jun 16 09:54:04 2008
@@ -136,9 +136,8 @@
   
   if (priv->destroy)
     priv->destroy (priv->data);
-    
-  if (G_OBJECT_CLASS (g_memory_output_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_memory_output_stream_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_memory_output_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gmountoperation.c
==============================================================================
--- trunk/gio/gmountoperation.c	(original)
+++ trunk/gio/gmountoperation.c	Mon Jun 16 09:54:04 2008
@@ -188,9 +188,8 @@
   g_free (priv->password);
   g_free (priv->user);
   g_free (priv->domain);
-  
-  if (G_OBJECT_CLASS (g_mount_operation_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_mount_operation_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_mount_operation_parent_class)->finalize (object);
 }
 
 static gboolean

Modified: trunk/gio/gnativevolumemonitor.c
==============================================================================
--- trunk/gio/gnativevolumemonitor.c	(original)
+++ trunk/gio/gnativevolumemonitor.c	Mon Jun 16 09:54:04 2008
@@ -12,8 +12,7 @@
 static void
 g_native_volume_monitor_finalize (GObject *object)
 {
-  if (G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_native_volume_monitor_parent_class)->finalize (object);
 }
 
 

Modified: trunk/gio/goutputstream.c
==============================================================================
--- trunk/gio/goutputstream.c	(original)
+++ trunk/gio/goutputstream.c	Mon Jun 16 09:54:04 2008
@@ -92,9 +92,8 @@
   GOutputStream *stream;
 
   stream = G_OUTPUT_STREAM (object);
-  
-  if (G_OBJECT_CLASS (g_output_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_output_stream_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_output_stream_parent_class)->finalize (object);
 }
 
 static void
@@ -106,9 +105,8 @@
   
   if (!stream->priv->closed)
     g_output_stream_close (stream, NULL, NULL);
-  
-  if (G_OBJECT_CLASS (g_output_stream_parent_class)->dispose)
-    (*G_OBJECT_CLASS (g_output_stream_parent_class)->dispose) (object);
+
+  G_OBJECT_CLASS (g_output_stream_parent_class)->dispose (object);
 }
 
 static void

Modified: trunk/gio/gpollfilemonitor.c
==============================================================================
--- trunk/gio/gpollfilemonitor.c	(original)
+++ trunk/gio/gpollfilemonitor.c	Mon Jun 16 09:54:04 2008
@@ -53,8 +53,7 @@
 
   g_object_unref (poll_monitor->file);
 
-  if (G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_poll_file_monitor_parent_class)->finalize (object);
 }
 
 

Modified: trunk/gio/gsimpleasyncresult.c
==============================================================================
--- trunk/gio/gsimpleasyncresult.c	(original)
+++ trunk/gio/gsimpleasyncresult.c	Mon Jun 16 09:54:04 2008
@@ -155,9 +155,8 @@
 
   if (simple->error)
     g_error_free (simple->error);
-  
-  if (G_OBJECT_CLASS (g_simple_async_result_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_simple_async_result_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_simple_async_result_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gthemedicon.c
==============================================================================
--- trunk/gio/gthemedicon.c	(original)
+++ trunk/gio/gthemedicon.c	Mon Jun 16 09:54:04 2008
@@ -181,9 +181,8 @@
   themed = G_THEMED_ICON (object);
 
   g_strfreev (themed->names);
-  
-  if (G_OBJECT_CLASS (g_themed_icon_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_themed_icon_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_themed_icon_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gunionvolumemonitor.c
==============================================================================
--- trunk/gio/gunionvolumemonitor.c	(original)
+++ trunk/gio/gunionvolumemonitor.c	Mon Jun 16 09:54:04 2008
@@ -73,9 +73,7 @@
       g_object_unref (child_monitor);
     }
 
-  
-  if (G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->finalize (object);
 }
 
 static void
@@ -88,9 +86,8 @@
   g_static_rec_mutex_lock (&the_volume_monitor_mutex);
   the_volume_monitor = NULL;
   g_static_rec_mutex_unlock (&the_volume_monitor_mutex);
-  
-  if (G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->dispose)
-    (*G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->dispose) (object);
+
+  G_OBJECT_CLASS (g_union_volume_monitor_parent_class)->dispose (object);
 }
 
 static GList *

Modified: trunk/gio/gunixinputstream.c
==============================================================================
--- trunk/gio/gunixinputstream.c	(original)
+++ trunk/gio/gunixinputstream.c	Mon Jun 16 09:54:04 2008
@@ -103,8 +103,7 @@
   
   stream = G_UNIX_INPUT_STREAM (object);
 
-  if (G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_unix_input_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gunixmount.c
==============================================================================
--- trunk/gio/gunixmount.c	(original)
+++ trunk/gio/gunixmount.c	Mon Jun 16 09:54:04 2008
@@ -82,9 +82,8 @@
   g_free (mount->name);
   g_free (mount->device_path);
   g_free (mount->mount_path);
-  
-  if (G_OBJECT_CLASS (g_unix_mount_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_mount_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_unix_mount_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gunixmounts.c
==============================================================================
--- trunk/gio/gunixmounts.c	(original)
+++ trunk/gio/gunixmounts.c	Mon Jun 16 09:54:04 2008
@@ -1131,9 +1131,8 @@
     }
 
   the_mount_monitor = NULL;
-  
-  if (G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
 }
 
 

Modified: trunk/gio/gunixoutputstream.c
==============================================================================
--- trunk/gio/gunixoutputstream.c	(original)
+++ trunk/gio/gunixoutputstream.c	Mon Jun 16 09:54:04 2008
@@ -95,8 +95,7 @@
   
   stream = G_UNIX_OUTPUT_STREAM (object);
 
-  if (G_OBJECT_CLASS (g_unix_output_stream_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_output_stream_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_unix_output_stream_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gunixvolume.c
==============================================================================
--- trunk/gio/gunixvolume.c	(original)
+++ trunk/gio/gunixvolume.c	Mon Jun 16 09:54:04 2008
@@ -83,8 +83,7 @@
   g_free (volume->identifier);
   g_free (volume->identifier_type);
 
-  if (G_OBJECT_CLASS (g_unix_volume_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_volume_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_unix_volume_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gunixvolumemonitor.c
==============================================================================
--- trunk/gio/gunixvolumemonitor.c	(original)
+++ trunk/gio/gunixvolumemonitor.c	Mon Jun 16 09:54:04 2008
@@ -84,9 +84,8 @@
   g_list_free (monitor->volumes);
   g_list_foreach (monitor->mounts, (GFunc)g_object_unref, NULL);
   g_list_free (monitor->mounts);
-  
-  if (G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_unix_volume_monitor_parent_class)->finalize (object);
 }
 
 static GList *

Modified: trunk/gio/gvolumemonitor.c
==============================================================================
--- trunk/gio/gvolumemonitor.c	(original)
+++ trunk/gio/gvolumemonitor.c	Mon Jun 16 09:54:04 2008
@@ -66,8 +66,7 @@
 
   monitor = G_VOLUME_MONITOR (object);
 
-  if (G_OBJECT_CLASS (g_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_volume_monitor_parent_class)->finalize) (object);
+  G_OBJECT_CLASS (g_volume_monitor_parent_class)->finalize (object);
 }
 
 static void

Modified: trunk/gio/gwin32appinfo.c
==============================================================================
--- trunk/gio/gwin32appinfo.c	(original)
+++ trunk/gio/gwin32appinfo.c	Mon Jun 16 09:54:04 2008
@@ -79,9 +79,8 @@
   g_free (info->id_utf8);
   g_free (info->name);
   g_free (info->executable);
-  
-  if (G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize) (object);
+
+  G_OBJECT_CLASS (g_win32_app_info_parent_class)->finalize (object);
 }
 
 static void