From a4427bfff5d31499dc0b46fa3f734bc92f7d0dd5 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@imendio.com>
Date: Mon, 16 Jun 2008 09:54:04 +0000
Subject: [PATCH] chain up unconditionally in finalize() and dispose(). Also
 don't

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.


svn path=/trunk/; revision=7048
---
 gio/ChangeLog                |  6 ++++++
 gio/gbufferedinputstream.c   |  3 +--
 gio/gbufferedoutputstream.c  |  3 +--
 gio/gcancellable.c           |  5 ++---
 gio/gdummyfile.c             |  5 ++---
 gio/gfileenumerator.c        |  7 +++----
 gio/gfileicon.c              |  5 ++---
 gio/gfileinfo.c              |  5 ++---
 gio/gfilemonitor.c           | 10 ++++------
 gio/gfilenamecompleter.c     |  5 ++---
 gio/gfilterinputstream.c     |  3 +--
 gio/ginputstream.c           |  8 +++-----
 gio/glocaldirectorymonitor.c |  3 +--
 gio/glocalfile.c             |  5 ++---
 gio/glocalfileenumerator.c   |  5 ++---
 gio/glocalfileinputstream.c  |  5 ++---
 gio/glocalfilemonitor.c      |  3 +--
 gio/glocalfileoutputstream.c |  5 ++---
 gio/gmemoryinputstream.c     |  3 +--
 gio/gmemoryoutputstream.c    |  5 ++---
 gio/gmountoperation.c        |  5 ++---
 gio/gnativevolumemonitor.c   |  3 +--
 gio/goutputstream.c          | 10 ++++------
 gio/gpollfilemonitor.c       |  3 +--
 gio/gsimpleasyncresult.c     |  5 ++---
 gio/gthemedicon.c            |  5 ++---
 gio/gunionvolumemonitor.c    |  9 +++------
 gio/gunixinputstream.c       |  3 +--
 gio/gunixmount.c             |  5 ++---
 gio/gunixmounts.c            |  5 ++---
 gio/gunixoutputstream.c      |  3 +--
 gio/gunixvolume.c            |  3 +--
 gio/gunixvolumemonitor.c     |  5 ++---
 gio/gvolumemonitor.c         |  3 +--
 gio/gwin32appinfo.c          |  5 ++---
 35 files changed, 69 insertions(+), 102 deletions(-)

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 31cf6b6e..305f1310 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
 2008-06-16  Ross Burton  <ross@burtonini.com>
 
 	* gfileenumerator.c:
diff --git a/gio/gbufferedinputstream.c b/gio/gbufferedinputstream.c
index 43129f14..28860e08 100644
--- a/gio/gbufferedinputstream.c
+++ b/gio/gbufferedinputstream.c
@@ -298,8 +298,7 @@ g_buffered_input_stream_finalize (GObject *object)
 
   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
diff --git a/gio/gbufferedoutputstream.c b/gio/gbufferedoutputstream.c
index 4de538b3..41857601 100644
--- a/gio/gbufferedoutputstream.c
+++ b/gio/gbufferedoutputstream.c
@@ -335,8 +335,7 @@ g_buffered_output_stream_finalize (GObject *object)
 
   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
diff --git a/gio/gcancellable.c b/gio/gcancellable.c
index dba54759..9177e439 100644
--- a/gio/gcancellable.c
+++ b/gio/gcancellable.c
@@ -78,9 +78,8 @@ g_cancellable_finalize (GObject *object)
   
   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
diff --git a/gio/gdummyfile.c b/gio/gdummyfile.c
index 1fa0aeda..2c7edcf9 100644
--- a/gio/gdummyfile.c
+++ b/gio/gdummyfile.c
@@ -87,9 +87,8 @@ g_dummy_file_finalize (GObject *object)
     _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
diff --git a/gio/gfileenumerator.c b/gio/gfileenumerator.c
index 8011a127..4dc51e63 100644
--- a/gio/gfileenumerator.c
+++ b/gio/gfileenumerator.c
@@ -117,8 +117,8 @@ g_file_enumerator_dispose (GObject *object)
     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 @@ g_file_enumerator_finalize (GObject *object)
   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
diff --git a/gio/gfileicon.c b/gio/gfileicon.c
index 5d5cc1b9..893b3a3b 100644
--- a/gio/gfileicon.c
+++ b/gio/gfileicon.c
@@ -73,9 +73,8 @@ g_file_icon_finalize (GObject *object)
   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
diff --git a/gio/gfileinfo.c b/gio/gfileinfo.c
index 33f7ca3c..7e00e4dc 100644
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -234,9 +234,8 @@ g_file_info_finalize (GObject *object)
 
   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
diff --git a/gio/gfilemonitor.c b/gio/gfilemonitor.c
index 1e653527..bf520ff9 100644
--- a/gio/gfilemonitor.c
+++ b/gio/gfilemonitor.c
@@ -156,9 +156,8 @@ g_file_monitor_finalize (GObject *object)
     }
 
   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 @@ g_file_monitor_dispose (GObject *object)
 
   /* 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
diff --git a/gio/gfilenamecompleter.c b/gio/gfilenamecompleter.c
index cccc7229..05fc0694 100644
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.c
@@ -85,9 +85,8 @@ g_filename_completer_finalize (GObject *object)
 
   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
diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c
index 9d3581e1..ba0892ef 100644
--- a/gio/gfilterinputstream.c
+++ b/gio/gfilterinputstream.c
@@ -185,8 +185,7 @@ g_filter_input_stream_finalize (GObject *object)
 
   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
diff --git a/gio/ginputstream.c b/gio/ginputstream.c
index 385a59cf..9a4518f9 100644
--- a/gio/ginputstream.c
+++ b/gio/ginputstream.c
@@ -89,8 +89,7 @@ g_input_stream_finalize (GObject *object)
   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 @@ g_input_stream_dispose (GObject *object)
   
   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);
 }
 
 
diff --git a/gio/glocaldirectorymonitor.c b/gio/glocaldirectorymonitor.c
index 2d0cb599..35c9c1f7 100644
--- a/gio/glocaldirectorymonitor.c
+++ b/gio/glocaldirectorymonitor.c
@@ -58,8 +58,7 @@ g_local_directory_monitor_finalize (GObject *object)
       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
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 166a964e..dac0cc78 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -130,9 +130,8 @@ g_local_file_finalize (GObject *object)
   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
diff --git a/gio/glocalfileenumerator.c b/gio/glocalfileenumerator.c
index 2f78ed20..48d89908 100644
--- a/gio/glocalfileenumerator.c
+++ b/gio/glocalfileenumerator.c
@@ -128,9 +128,8 @@ g_local_file_enumerator_finalize (GObject *object)
     }
 
   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);
 }
 
 
diff --git a/gio/glocalfileinputstream.c b/gio/glocalfileinputstream.c
index 294ad079..75e6aae9 100644
--- a/gio/glocalfileinputstream.c
+++ b/gio/glocalfileinputstream.c
@@ -80,9 +80,8 @@ g_local_file_input_stream_finalize (GObject *object)
   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
diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
index d9517bca..9e1d841c 100644
--- a/gio/glocalfilemonitor.c
+++ b/gio/glocalfilemonitor.c
@@ -106,8 +106,7 @@ g_local_file_monitor_finalize (GObject *object)
       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)
diff --git a/gio/glocalfileoutputstream.c b/gio/glocalfileoutputstream.c
index cc2b1200..0cc7d264 100644
--- a/gio/glocalfileoutputstream.c
+++ b/gio/glocalfileoutputstream.c
@@ -108,9 +108,8 @@ g_local_file_output_stream_finalize (GObject *object)
   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
diff --git a/gio/gmemoryinputstream.c b/gio/gmemoryinputstream.c
index 5dde34ad..3121db61 100644
--- a/gio/gmemoryinputstream.c
+++ b/gio/gmemoryinputstream.c
@@ -163,8 +163,7 @@ g_memory_input_stream_finalize (GObject *object)
   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
diff --git a/gio/gmemoryoutputstream.c b/gio/gmemoryoutputstream.c
index f4979784..ca3d186a 100644
--- a/gio/gmemoryoutputstream.c
+++ b/gio/gmemoryoutputstream.c
@@ -136,9 +136,8 @@ g_memory_output_stream_finalize (GObject *object)
   
   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
diff --git a/gio/gmountoperation.c b/gio/gmountoperation.c
index ef8ca213..3d906ce2 100644
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -188,9 +188,8 @@ g_mount_operation_finalize (GObject *object)
   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
diff --git a/gio/gnativevolumemonitor.c b/gio/gnativevolumemonitor.c
index c4d1b9f5..ddaa115d 100644
--- a/gio/gnativevolumemonitor.c
+++ b/gio/gnativevolumemonitor.c
@@ -12,8 +12,7 @@ G_DEFINE_ABSTRACT_TYPE (GNativeVolumeMonitor, g_native_volume_monitor, G_TYPE_VO
 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);
 }
 
 
diff --git a/gio/goutputstream.c b/gio/goutputstream.c
index f4d31026..051c0e84 100644
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -92,9 +92,8 @@ g_output_stream_finalize (GObject *object)
   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 @@ g_output_stream_dispose (GObject *object)
   
   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
diff --git a/gio/gpollfilemonitor.c b/gio/gpollfilemonitor.c
index 7f9e1b84..4c106e92 100644
--- a/gio/gpollfilemonitor.c
+++ b/gio/gpollfilemonitor.c
@@ -53,8 +53,7 @@ g_poll_file_monitor_finalize (GObject* object)
 
   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);
 }
 
 
diff --git a/gio/gsimpleasyncresult.c b/gio/gsimpleasyncresult.c
index 29666f16..d7d16fe5 100644
--- a/gio/gsimpleasyncresult.c
+++ b/gio/gsimpleasyncresult.c
@@ -155,9 +155,8 @@ g_simple_async_result_finalize (GObject *object)
 
   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
diff --git a/gio/gthemedicon.c b/gio/gthemedicon.c
index 096a9004..a2995a97 100644
--- a/gio/gthemedicon.c
+++ b/gio/gthemedicon.c
@@ -181,9 +181,8 @@ g_themed_icon_finalize (GObject *object)
   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
diff --git a/gio/gunionvolumemonitor.c b/gio/gunionvolumemonitor.c
index afb487e0..0d57cd25 100644
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.c
@@ -73,9 +73,7 @@ g_union_volume_monitor_finalize (GObject *object)
       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_union_volume_monitor_dispose (GObject *object)
   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 *
diff --git a/gio/gunixinputstream.c b/gio/gunixinputstream.c
index 12ff5a57..4e7fbdc4 100644
--- a/gio/gunixinputstream.c
+++ b/gio/gunixinputstream.c
@@ -103,8 +103,7 @@ g_unix_input_stream_finalize (GObject *object)
   
   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
diff --git a/gio/gunixmount.c b/gio/gunixmount.c
index 60511640..0b13e7d4 100644
--- a/gio/gunixmount.c
+++ b/gio/gunixmount.c
@@ -82,9 +82,8 @@ g_unix_mount_finalize (GObject *object)
   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
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index 1713df30..f78f2444 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -1131,9 +1131,8 @@ g_unix_mount_monitor_finalize (GObject *object)
     }
 
   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);
 }
 
 
diff --git a/gio/gunixoutputstream.c b/gio/gunixoutputstream.c
index 38842b66..1bca1ed5 100644
--- a/gio/gunixoutputstream.c
+++ b/gio/gunixoutputstream.c
@@ -95,8 +95,7 @@ g_unix_output_stream_finalize (GObject *object)
   
   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
diff --git a/gio/gunixvolume.c b/gio/gunixvolume.c
index 7f8cbc14..766e1b23 100644
--- a/gio/gunixvolume.c
+++ b/gio/gunixvolume.c
@@ -83,8 +83,7 @@ g_unix_volume_finalize (GObject *object)
   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
diff --git a/gio/gunixvolumemonitor.c b/gio/gunixvolumemonitor.c
index fcd90fb7..a7c4460b 100644
--- a/gio/gunixvolumemonitor.c
+++ b/gio/gunixvolumemonitor.c
@@ -84,9 +84,8 @@ g_unix_volume_monitor_finalize (GObject *object)
   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 *
diff --git a/gio/gvolumemonitor.c b/gio/gvolumemonitor.c
index 1ea4aaf1..8e0223a3 100644
--- a/gio/gvolumemonitor.c
+++ b/gio/gvolumemonitor.c
@@ -66,8 +66,7 @@ g_volume_monitor_finalize (GObject *object)
 
   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
diff --git a/gio/gwin32appinfo.c b/gio/gwin32appinfo.c
index d9ec4048..a01022f1 100644
--- a/gio/gwin32appinfo.c
+++ b/gio/gwin32appinfo.c
@@ -79,9 +79,8 @@ g_win32_app_info_finalize (GObject *object)
   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
-- 
2.34.1