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

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 31cf6b6e4531b2dafe942d557850ce69c84a4342..305f131025110fa75be33ce71df4005f31486842 100644 (file)
--- 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 43129f14d8a87f7301f1ab1091b8077c2ffb05e2..28860e081520fe2ca286ea97d432502e4a2790d2 100644 (file)
--- 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 4de538b3ee5970aa997feae8b0979e1ff9ead686..41857601d96a3e50ec8b34a4094bd07a928d09e5 100644 (file)
--- 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 dba54759ee00a15fcf0cd44452ee71451e3890b3..9177e4392256e0dd970982a66462ae4feed946c9 100644 (file)
--- 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 1fa0aeda95252258793d62f6da8cfe30d303360f..2c7edcf9a1e73ec601e342d1de9014921cb64753 100644 (file)
--- 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 8011a1270c47dee18621e2a364aab51328ea46b1..4dc51e635c02d69f3c409c0fbb9adb09f15a8bb4 100644 (file)
--- 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 5d5cc1b9bc7a65f2066ac9b2042c83f748e8dc7c..893b3a3bac07eacb7efb26d78659d8469eeaa8ed 100644 (file)
--- 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 33f7ca3ced95cc9b8b7ec3562362c1d631c7e18a..7e00e4dc0c68acf1c92b53fd1386e86eb7bb3118 100644 (file)
--- 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 1e653527ea620bbaf574d2d6bd53912e36f01be2..bf520ff99b1611e82eaf1ee07e17b7b57eb50873 100644 (file)
--- 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 cccc7229f93f82cdeb48b6cbaadd479fb30439f6..05fc06943067e3b024776de6dd5b8c8bf70e75e4 100644 (file)
--- 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 9d3581e100d01c4b7a1500d4590d6071ec14d4e2..ba0892efcd9ed172436b44a7dfb604646f17fc78 100644 (file)
--- 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 385a59cf375118ebcef126ff197c5bd223dce425..9a4518f99fd337f5e15adb9723e421682a254e7e 100644 (file)
--- 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 2d0cb599dcdfa6545b41dc2b10f887984c597ace..35c9c1f73e87e489a5697fd8ca8219b01a745c1d 100644 (file)
--- 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 166a964e2b04c4d34e22aa7683577a85d05f1250..dac0cc788305fa441e6d594ea2e88a48630e8ee7 100644 (file)
--- 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 2f78ed209136a6d243065814eca53ae0d0ded280..48d8990855c7a64ab730def6eb796c6fb8899a56 100644 (file)
--- 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 294ad07989f7c22ca191d228a38b009b42ab5734..75e6aae9f46d47206c5e2453fcff35234177567d 100644 (file)
--- 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 d9517bca67eac08ec471f3513f7ff15fe6d62e27..9e1d841c7b87c4e4a486db563eefed8bb5699804 100644 (file)
--- 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 cc2b1200ea353b085ba9973425078541fd504684..0cc7d264c16d9f115ee0183f6d7bb41396d45b4c 100644 (file)
--- 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 5dde34ad7b2a021e53ac47ff20b7809976ee38e8..3121db6153e7c88fe55c539ae03be1ad9cad57ea 100644 (file)
--- 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 f4979784b98af8cf484bcb5eb00610948fd0118a..ca3d186a52eac4333e67f895f3e3d4df8a41bfb1 100644 (file)
--- 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 ef8ca21397efc73893b9116b3d84c886e3939143..3d906ce205c33f1274fd3743b7d7da81131764fa 100644 (file)
--- 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 c4d1b9f53da4e2d4300e24fb20e670e0de2248b9..ddaa115dee32c01615788f29e5d25d12bfb2c4bc 100644 (file)
--- 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 f4d31026aac7c7c3905d8c4f2d605469c73b92aa..051c0e8438d95e4dbed74c62b465dda02b89f266 100644 (file)
--- 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 7f9e1b840483eb9e79bc278a7421e57ab3a85a12..4c106e922bee03a3cfa879b96c3054a818b63414 100644 (file)
--- 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 29666f16092502c898f3d4e4b0e10f1c2b8a926f..d7d16fe548ffb66feae875c5ac5ea3a607bbc910 100644 (file)
--- 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 096a9004eb43e045f263a03e0528daacc0a61211..a2995a97a4d02c41954766c81864007d6660e5f3 100644 (file)
--- 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 afb487e0fbabfc1270bd8bb0370991cbff0c4e5e..0d57cd25989d705843e6c738851ab0a4fb5377bb 100644 (file)
--- 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 12ff5a577e747dc201786bbb3f45e1e0b222ab9a..4e7fbdc4f1aad7b8c06eba9ab9a74d271e2c027b 100644 (file)
--- 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 60511640e64a5993e44d075f884c7ad5fa6fa3f8..0b13e7d4c128b019cab43df5fdd572b0e05178c5 100644 (file)
--- 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 1713df30667f718bb91879e18f711137c8cc4449..f78f24448712795d2e1cd226a12d3c54e225de45 100644 (file)
--- 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 38842b66f6b9a73fab6bfb6c8fa36d0172db7d38..1bca1ed524bfe6d3da790b58794b28e9c073ef5f 100644 (file)
--- 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 7f8cbc14b5cc7714010f8e8c9a1a545283a2feaa..766e1b23e314c018af30a0a0e91e5c7e7b470afe 100644 (file)
--- 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 fcd90fb79f989e94267bd5df08e14a8da6fb8818..a7c4460bdf6efc876ca53527400c0bbe4986fbf1 100644 (file)
--- 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 1ea4aaf10f6aee2c4bb46fa61bbb42ed29032886..8e0223a3fb8475cd18a08510ac05691b72ab86e8 100644 (file)
--- 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 d9ec4048f49402375053d4417f15825d97fcf5c1..a01022f12a07e89599d46a7c572d22f1f87f6a7c 100644 (file)
--- 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