diff options
| author | Philip Langdale <philipl@overt.org> | 2013-01-03 20:57:30 -0800 |
|---|---|---|
| committer | Philip Langdale <philipl@overt.org> | 2013-01-11 20:31:57 -0800 |
| commit | 05b63ae0c6544559e74d088bf25682f0cfac1206 (patch) | |
| tree | d80d55f2a7061000ce6c733c6f7f8ab16e869456 /monitor | |
| parent | e7b8ce42c5ed6b7957f6287865f2c350e1dcecd2 (diff) | |
| download | gvfs-05b63ae0c6544559e74d088bf25682f0cfac1206.tar.gz | |
MTP: Review Feedback: Unconditional chain up finalize and dispose.
Diffstat (limited to 'monitor')
| -rw-r--r-- | monitor/mtp/gmtpvolume.c | 3 | ||||
| -rw-r--r-- | monitor/mtp/gmtpvolumemonitor.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/monitor/mtp/gmtpvolume.c b/monitor/mtp/gmtpvolume.c index bfb453ae..37045571 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 c83233bf..2dccba8c 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 * |