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 /plugins | |
| 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 'plugins')
| -rw-r--r-- | plugins/groupwise-features/junk-settings.c | 8 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder.c | 16 | ||||
| -rw-r--r-- | plugins/itip-formatter/itip-view.c | 4 |
3 files changed, 15 insertions, 13 deletions
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c index 4ec4159ab6..6b0233d2bc 100644 --- a/plugins/groupwise-features/junk-settings.c +++ b/plugins/groupwise-features/junk-settings.c @@ -93,13 +93,13 @@ junk_settings_finalise (GObject *obj) } static void -junk_settings_dispose (GObject *obj) +junk_settings_dispose (GObject *object) { - JunkSettings *js = (JunkSettings *) obj; + JunkSettings *js = (JunkSettings *) object; free_all (js); - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (obj); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); } static void diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c index 765232d915..ea42265b4f 100644 --- a/plugins/groupwise-features/share-folder.c +++ b/plugins/groupwise-features/share-folder.c @@ -95,23 +95,25 @@ share_folder_class_init (ShareFolderClass *klass) } static void -share_folder_finalise (GObject *obj) +share_folder_finalise (GObject *object) { - ShareFolder *sf = (ShareFolder *) obj; + ShareFolder *sf = (ShareFolder *) object; g_object_unref (sf->builder); free_all (sf); - G_OBJECT_CLASS (parent_class)->finalize (obj); + + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); } static void -share_folder_dispose (GObject *obj) +share_folder_dispose (GObject *object) { - ShareFolder *sf = (ShareFolder *) obj; + ShareFolder *sf = (ShareFolder *) object; free_all (sf); - if (G_OBJECT_CLASS (parent_class)->dispose) - G_OBJECT_CLASS (parent_class)->dispose (obj); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (parent_class)->dispose (object); } static void diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index 4a2925196f..70ae97784e 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -915,8 +915,8 @@ itip_view_dispose (GObject *object) view->priv = NULL; } - if (G_OBJECT_CLASS (itip_view_parent_class)->dispose) - G_OBJECT_CLASS (itip_view_parent_class)->dispose (object); + /* Chain up to parent's dispose() method. */ + G_OBJECT_CLASS (itip_view_parent_class)->dispose (object); } static void |