aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-02-13 00:37:05 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:34 +0800
commit274697623e2a6749a3b173c28f4832d9e88019e3 (patch)
tree5edbcc1f1cff8b9b00c49bbdea505647570bd3ed /shell
parent2952f3482a58a6c325a80a7fbd7ef6c5f727507d (diff)
downloadgsoc2013-evolution-274697623e2a6749a3b173c28f4832d9e88019e3.tar.gz
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 'shell')
-rw-r--r--shell/e-shell-content.c4
-rw-r--r--shell/e-shell-searchbar.c4
-rw-r--r--shell/e-shell-sidebar.c4
-rw-r--r--shell/e-shell-taskbar.c4
-rw-r--r--shell/e-shell-view.c4
-rw-r--r--shell/e-shell-window.c4
-rw-r--r--shell/e-shell.c4
-rw-r--r--shell/test/e-test-shell-backend.c4
8 files changed, 16 insertions, 16 deletions
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index ccd121fa48..5b53fb5334 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -208,8 +208,8 @@ shell_content_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- if (G_OBJECT_CLASS (e_shell_content_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_content_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_content_parent_class)->constructed (object);
}
static void
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 9244d792a7..4b7dc88ae2 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -735,8 +735,8 @@ shell_searchbar_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- if (G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_searchbar_parent_class)->constructed (object);
}
static void
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index b8ee23b6d0..ed5567e406 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -215,8 +215,8 @@ shell_sidebar_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- if (G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_sidebar_parent_class)->constructed (object);
}
static void
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 41863b6750..8b8cc1d4a7 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -273,8 +273,8 @@ shell_taskbar_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- if (G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_taskbar_parent_class)->constructed (object);
}
static void
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index cb682b7814..e513eea681 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -607,8 +607,8 @@ shell_view_constructed (GObject *object)
e_extensible_load_extensions (E_EXTENSIBLE (object));
- 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 GtkWidget *
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 0ca0a5a541..25986f07a7 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -344,8 +344,8 @@ shell_window_constructed (GObject *object)
e_shell_get_small_screen_mode (shell_window->priv->shell))
gtk_window_set_decorated (GTK_WINDOW (object), FALSE);
- if (G_OBJECT_CLASS (e_shell_window_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_window_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_window_parent_class)->constructed (object);
}
static GtkWidget *
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 123a9751e7..82ccf6df9e 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -713,8 +713,8 @@ shell_constructed (GObject *object)
if (!unique_app_is_running (UNIQUE_APP (object)))
e_file_lock_create ();
- if (G_OBJECT_CLASS (e_shell_parent_class)->constructed)
- G_OBJECT_CLASS (e_shell_parent_class)->constructed (object);
+ /* Chain up to parent's constructed() method. */
+ G_OBJECT_CLASS (e_shell_parent_class)->constructed (object);
}
static UniqueResponse
diff --git a/shell/test/e-test-shell-backend.c b/shell/test/e-test-shell-backend.c
index 2891f53b64..983b40e8d9 100644
--- a/shell/test/e-test-shell-backend.c
+++ b/shell/test/e-test-shell-backend.c
@@ -152,8 +152,8 @@ test_shell_backend_constructed (GObject *object)
G_CALLBACK (test_shell_backend_window_destroyed_cb),
shell_backend);
- 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