From 7a1677520d439aee68c5ab0268a951d0b411e3a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 11:37:05 -0500 Subject: Remove NULL checks for GObject methods. As of GLib 2.28 all GObject virtual methods, including constructed(), are safe to chain up to unconditionally. Remove unnecessary checks. --- smime/lib/e-cert-db.c | 4 ++-- smime/lib/e-cert.c | 4 ++-- smime/lib/e-pkcs12.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'smime/lib') diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 6076bcd4b6..4b70b1118d 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -379,8 +379,8 @@ e_cert_db_dispose (GObject *object) g_free (ec->priv); ec->priv = NULL; - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); } #ifdef notyet diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c index 6a6fef462e..a7605a42ce 100644 --- a/smime/lib/e-cert.c +++ b/smime/lib/e-cert.c @@ -148,8 +148,8 @@ e_cert_dispose (GObject *object) g_free (ec->priv); ec->priv = NULL; - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); } static void diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c index d73b3c96af..6b7b7ae63c 100644 --- a/smime/lib/e-pkcs12.c +++ b/smime/lib/e-pkcs12.c @@ -98,8 +98,8 @@ e_pkcs12_dispose (GObject *object) g_free (pk->priv); pk->priv = NULL; - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); } static void -- cgit v1.2.3