From fcd93f5e890fffb5d5016b0ce8f228694e3afc32 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Thu, 17 Apr 2014 21:01:42 +0200 Subject: Add missing finalize call to LpfStop and consolidate the other calls. It's guaranteed to exist. --- libplanfahr/lpf-loc.c | 4 ++-- libplanfahr/lpf-stop.c | 2 ++ libplanfahr/lpf-trip-part.c | 3 +-- libplanfahr/lpf-trip.c | 3 +-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libplanfahr/lpf-loc.c b/libplanfahr/lpf-loc.c index 24a5013..c872e5c 100644 --- a/libplanfahr/lpf-loc.c +++ b/libplanfahr/lpf-loc.c @@ -135,8 +135,8 @@ lpf_loc_finalize (GObject *object) g_free (priv->name); g_free (priv->opaque); - if (parent_class->finalize != NULL) - parent_class->finalize (object); + + parent_class->finalize (object); } diff --git a/libplanfahr/lpf-stop.c b/libplanfahr/lpf-stop.c index b1e24d9..5295fb4 100644 --- a/libplanfahr/lpf-stop.c +++ b/libplanfahr/lpf-stop.c @@ -207,6 +207,8 @@ lpf_stop_finalize (GObject *object) g_date_time_unref (priv->rt_arr); if (parent_class->finalize != NULL) parent_class->finalize (object); + + parent_class->finalize (object); } diff --git a/libplanfahr/lpf-trip-part.c b/libplanfahr/lpf-trip-part.c index 15ef7f5..034865f 100644 --- a/libplanfahr/lpf-trip-part.c +++ b/libplanfahr/lpf-trip-part.c @@ -144,8 +144,7 @@ lpf_trip_part_finalize (GObject *object) g_free (priv->line); g_slist_free_full (priv->stops, g_object_unref); - if (parent_class->finalize != NULL) - parent_class->finalize (object); + parent_class->finalize (object); } diff --git a/libplanfahr/lpf-trip.c b/libplanfahr/lpf-trip.c index aa874db..8be284c 100644 --- a/libplanfahr/lpf-trip.c +++ b/libplanfahr/lpf-trip.c @@ -115,8 +115,7 @@ lpf_trip_finalize (GObject *object) g_slist_free_full (priv->parts, g_object_unref); - if (parent_class->finalize != NULL) - parent_class->finalize (object); + parent_class->finalize (object); } -- cgit v1.2.3