aboutsummaryrefslogtreecommitdiffstats
path: root/e-util
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 /e-util
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 'e-util')
-rw-r--r--e-util/e-alert-dialog.c4
-rw-r--r--e-util/e-alert.c4
-rw-r--r--e-util/e-bit-array.c4
-rw-r--r--e-util/e-extension.c12
4 files changed, 6 insertions, 18 deletions
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index df5ec1dbcb..1d1571cdb0 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -215,8 +215,8 @@ alert_dialog_constructed (GObject *object)
pango_attr_list_unref (list);
- if (G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed)
- G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_alert_dialog_parent_class)->constructed (object);
}
static void
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 4845ce61a3..cccc3225e5 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -564,8 +564,8 @@ alert_constructed (GObject *object)
button = button->next;
}
- if (G_OBJECT_CLASS (e_alert_parent_class)->constructed)
- G_OBJECT_CLASS (e_alert_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_alert_parent_class)->constructed (object);
}
static void
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index d8aa620c8d..acf318c939 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -157,8 +157,8 @@ eba_dispose (GObject *object)
g_free (eba->data);
eba->data = NULL;
- if (G_OBJECT_CLASS (e_bit_array_parent_class)->dispose)
- (* G_OBJECT_CLASS (e_bit_array_parent_class)->dispose) (object);
+ /* Chain up to parent's dispose() method. */
+ G_OBJECT_CLASS (e_bit_array_parent_class)->dispose (object);
}
/**
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
index 1bcef90d76..d7d95c9496 100644
--- a/e-util/e-extension.c
+++ b/e-util/e-extension.c
@@ -122,17 +122,6 @@ extension_get_property (GObject *object,
}
static void
-extension_constructed (GObject *object)
-{
- /* This allows subclasses to chain up safely since GObject
- * does not implement this method, and we might want to do
- * something here in the future. */
-
- if (G_OBJECT_CLASS (e_extension_parent_class)->constructed)
- G_OBJECT_CLASS (e_extension_parent_class)->constructed (object);
-}
-
-static void
extension_dispose (GObject *object)
{
EExtensionPrivate *priv;
@@ -159,7 +148,6 @@ e_extension_class_init (EExtensionClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->set_property = extension_set_property;
object_class->get_property = extension_get_property;
- object_class->constructed = extension_constructed;
object_class->dispose = extension_dispose;
g_object_class_install_property (