From 274697623e2a6749a3b173c28f4832d9e88019e3 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. --- libgnomecanvas/gnome-canvas-rich-text.c | 4 ++-- libgnomecanvas/gnome-canvas.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libgnomecanvas') diff --git a/libgnomecanvas/gnome-canvas-rich-text.c b/libgnomecanvas/gnome-canvas-rich-text.c index a19738f484..a3ef6447ab 100644 --- a/libgnomecanvas/gnome-canvas-rich-text.c +++ b/libgnomecanvas/gnome-canvas-rich-text.c @@ -184,8 +184,8 @@ gnome_canvas_rich_text_finalize (GObject *object) g_free (text->_priv); text->_priv = NULL; - if (G_OBJECT_CLASS (parent_class)->finalize) - G_OBJECT_CLASS (parent_class)->finalize (object); + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); } static void diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index 86835c2aec..b313c84af8 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -1996,8 +1996,8 @@ gnome_canvas_dispose (GObject *object) shutdown_transients (canvas); - if (G_OBJECT_CLASS (canvas_parent_class)->dispose) - G_OBJECT_CLASS (canvas_parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (canvas_parent_class)->dispose (object); } /** -- cgit