[gvfs/mtp-backend: 59/64] MTP: Review Feedback: Unconditional chain up finalize and dispose.



commit 05b63ae0c6544559e74d088bf25682f0cfac1206
Author: Philip Langdale <philipl overt org>
Date:   Thu Jan 3 20:57:30 2013 -0800

    MTP: Review Feedback: Unconditional chain up finalize and dispose.

 daemon/gvfsbackendmtp.c         |    3 +--
 monitor/mtp/gmtpvolume.c        |    3 +--
 monitor/mtp/gmtpvolumemonitor.c |    6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/daemon/gvfsbackendmtp.c b/daemon/gvfsbackendmtp.c
index fb30590..0cfd15c 100644
--- a/daemon/gvfsbackendmtp.c
+++ b/daemon/gvfsbackendmtp.c
@@ -142,8 +142,7 @@ g_vfs_backend_mtp_finalize (GObject *object)
   g_hash_table_unref (backend->monitors);
   g_mutex_clear (&backend->mutex);
 
-  if (G_OBJECT_CLASS (g_vfs_backend_mtp_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_vfs_backend_mtp_parent_class)->finalize) (object);
+  (*G_OBJECT_CLASS (g_vfs_backend_mtp_parent_class)->finalize) (object);
 
   DEBUG ("(I) g_vfs_backend_mtp_finalize done.");
 }
diff --git a/monitor/mtp/gmtpvolume.c b/monitor/mtp/gmtpvolume.c
index bfb453a..3704557 100644
--- a/monitor/mtp/gmtpvolume.c
+++ b/monitor/mtp/gmtpvolume.c
@@ -74,8 +74,7 @@ g_mtp_volume_finalize (GObject *object)
   g_free (volume->name);
   g_free (volume->icon);
 
-  if (G_OBJECT_CLASS (g_mtp_volume_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_mtp_volume_parent_class)->finalize) (object);
+  (*G_OBJECT_CLASS (g_mtp_volume_parent_class)->finalize) (object);
 }
 
 static void
diff --git a/monitor/mtp/gmtpvolumemonitor.c b/monitor/mtp/gmtpvolumemonitor.c
index c83233b..2dccba8 100644
--- a/monitor/mtp/gmtpvolumemonitor.c
+++ b/monitor/mtp/gmtpvolumemonitor.c
@@ -73,8 +73,7 @@ g_mtp_volume_monitor_dispose (GObject *object)
   the_volume_monitor = NULL;
   G_UNLOCK (vm_lock);
 
-  if (G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->dispose)
-    (*G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->dispose) (object);
+  (*G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->dispose) (object);
 }
 
 static void
@@ -91,8 +90,7 @@ g_mtp_volume_monitor_finalize (GObject *object)
   list_free (monitor->last_devices);
   list_free (monitor->device_volumes);
 
-  if (G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->finalize)
-    (*G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->finalize) (object);
+  (*G_OBJECT_CLASS (g_mtp_volume_monitor_parent_class)->finalize) (object);
 }
 
 static GList *



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]