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. --- widgets/text/e-text-model.c | 4 ++-- widgets/text/e-text.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'widgets/text') diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c index b65ee7e6cc..8641bf1527 100644 --- a/widgets/text/e-text-model.c +++ b/widgets/text/e-text-model.c @@ -165,8 +165,8 @@ e_text_model_dispose (GObject *object) model->priv = NULL; } - if (G_OBJECT_CLASS (e_text_model_parent_class)->dispose) - G_OBJECT_CLASS (e_text_model_parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_text_model_parent_class)->dispose (object); } static gint diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index f6522672b2..9801132684 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -274,8 +274,8 @@ e_text_dispose (GObject *object) text->font_desc = NULL; } - if (G_OBJECT_CLASS (e_text_parent_class)->dispose) - (* G_OBJECT_CLASS (e_text_parent_class)->dispose) (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (e_text_parent_class)->dispose (object); } static void -- cgit v1.2.3