diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-02-13 00:37:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-02-13 01:54:08 +0800 |
| commit | 7a1677520d439aee68c5ab0268a951d0b411e3a0 (patch) | |
| tree | 5b045d6a6ad24f1e3c53847bb116610208d089a8 /libgnomecanvas | |
| parent | 1f68d0a2ec941a7f1b47aeb06cf5502b06b49156 (diff) | |
| download | gsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.tar.gz gsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.tar.zst gsoc2013-evolution-7a1677520d439aee68c5ab0268a951d0b411e3a0.zip | |
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.
Diffstat (limited to 'libgnomecanvas')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-rich-text.c | 4 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas.c | 4 |
2 files changed, 4 insertions, 4 deletions
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); } /** |