aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-13 00:37:05 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-02-13 01:54:08 +0800
commit7a1677520d439aee68c5ab0268a951d0b411e3a0 (patch)
tree5b045d6a6ad24f1e3c53847bb116610208d089a8 /mail
parent1f68d0a2ec941a7f1b47aeb06cf5502b06b49156 (diff)
downloadgsoc2013-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 'mail')
-rw-r--r--mail/e-mail-attachment-bar.c4
-rw-r--r--mail/e-mail-backend.c8
-rw-r--r--mail/e-mail-browser.c3
-rw-r--r--mail/e-mail-label-dialog.c4
-rw-r--r--mail/e-mail-label-list-store.c4
-rw-r--r--mail/e-mail-notebook-view.c4
-rw-r--r--mail/e-mail-paned-view.c4
-rw-r--r--mail/em-folder-selector.c3
8 files changed, 16 insertions, 18 deletions
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 954a3e056f..88cf81a51a 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -318,8 +318,8 @@ mail_attachment_bar_constructed (GObject *object)
key = "/apps/evolution/shell/attachment_view";
gconf_bridge_bind_property (bridge, key, object, "active-view");
- if (G_OBJECT_CLASS (parent_class)->constructed)
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (parent_class)->constructed (object);
}
static EAttachmentViewPrivate *
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index e598c9388d..804000367c 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -432,8 +432,8 @@ mail_backend_dispose (GObject *object)
static void
mail_backend_finalize (GObject *object)
{
- if (G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize)
- G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object);
+ /* Chain up to parent's finalize() method. */
+ G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object);
camel_shutdown ();
}
@@ -510,8 +510,8 @@ mail_backend_constructed (GObject *object)
mail_config_init (priv->session);
mail_msg_init ();
- if (G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed)
- G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_mail_backend_parent_class)->constructed (object);
}
static void
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index d46217e706..750e84afd8 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -552,8 +552,7 @@ mail_browser_constructed (GObject *object)
guint merge_id;
/* Chain up to parent's constructed() method. */
- if (G_OBJECT_CLASS (parent_class)->constructed)
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ G_OBJECT_CLASS (parent_class)->constructed (object);
priv = E_MAIL_BROWSER_GET_PRIVATE (object);
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index 34a148c7a9..1170854ea8 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -139,8 +139,8 @@ mail_label_dialog_constructed (GObject *object)
gtk_container_set_border_width (GTK_CONTAINER (action_area), 0);
gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
- if (G_OBJECT_CLASS (parent_class)->constructed)
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (parent_class)->constructed (object);
}
static void
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 5a22f72512..e6f4a6a6ea 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -181,8 +181,8 @@ mail_label_list_store_constructed (GObject *object)
mail_label_list_store_ensure_defaults (store);
- if (G_OBJECT_CLASS (parent_class)->constructed)
- G_OBJECT_CLASS (parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (parent_class)->constructed (object);
}
static void
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index e4d3c1ec32..cf957c3fe0 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -568,8 +568,8 @@ mail_notebook_view_constructed (GObject *object)
priv->book, "switch-page",
G_CALLBACK (mnv_page_changed), object);
- if (G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed)
- G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_mail_notebook_view_parent_class)->constructed (object);
}
static void
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 97b988eb55..c6f13d03b5 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -683,8 +683,8 @@ mail_paned_view_constructed (GObject *object)
* set_preview_visible() method relies on it. */
e_mail_view_set_preview_visible (view, TRUE);
- if (G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed)
- G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_mail_paned_view_parent_class)->constructed (object);
}
static void
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 621c54217e..b05ba3549d 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -60,8 +60,7 @@ folder_selector_dispose (GObject *object)
}
/* Chain up to parent's dispose() method. */
- if (G_OBJECT_CLASS (parent_class)->dispose)
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (parent_class)->dispose (object);
}
static void