From 7a1677520d439aee68c5ab0268a951d0b411e3a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 12 Feb 2011 11:37:05 -0500 Subject: 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. --- shell/e-shell-content.c | 4 ++-- shell/e-shell-searchbar.c | 4 ++-- shell/e-shell-sidebar.c | 4 ++-- shell/e-shell-taskbar.c | 4 ++-- shell/e-shell-view.c | 4 ++-- shell/e-shell-window.c | 4 ++-- shell/e-shell.c | 4 ++-- shell/test/e-test-shell-backend.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'shell') 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 -- cgit v1.2.3