diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-02-13 00:37:05 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-06-30 00:41:34 +0800 |
| commit | 274697623e2a6749a3b173c28f4832d9e88019e3 (patch) | |
| tree | 5edbcc1f1cff8b9b00c49bbdea505647570bd3ed /plugins/groupwise-features | |
| parent | 2952f3482a58a6c325a80a7fbd7ef6c5f727507d (diff) | |
| download | gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.gz gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.bz2 gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.lz gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.xz gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.zst gsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.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/groupwise-features')
| -rw-r--r-- | plugins/groupwise-features/junk-settings.c | 8 | ||||
| -rw-r--r-- | plugins/groupwise-features/share-folder.c | 16 |
2 files changed, 13 insertions, 11 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 |