From 274697623e2a6749a3b173c28f4832d9e88019e3 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. --- modules/addressbook/e-book-shell-backend.c | 4 ++-- modules/calendar/e-cal-config-calendar-item.c | 4 ++-- modules/calendar/e-cal-config-comp-editor.c | 4 ++-- modules/calendar/e-cal-config-date-edit.c | 4 ++-- modules/calendar/e-cal-config-meeting-store.c | 4 ++-- modules/calendar/e-cal-config-meeting-time-selector.c | 4 ++-- modules/calendar/e-cal-config-model.c | 4 ++-- modules/calendar/e-cal-config-view.c | 4 ++-- modules/calendar/e-cal-shell-backend.c | 4 ++-- modules/calendar/e-memo-shell-backend.c | 4 ++-- modules/calendar/e-task-shell-backend.c | 4 ++-- modules/connman/evolution-connman.c | 4 ++-- modules/mail/e-mail-config-format-html.c | 4 ++-- modules/mail/e-mail-config-reader.c | 4 ++-- modules/mail/e-mail-config-web-view.c | 4 ++-- modules/mailto-handler/evolution-mailto-handler.c | 4 ++-- modules/network-manager/evolution-network-manager.c | 4 ++-- modules/offline-alert/evolution-offline-alert.c | 4 ++-- modules/plugin-manager/evolution-plugin-manager.c | 4 ++-- modules/startup-wizard/evolution-startup-wizard.c | 4 ++-- modules/windows-sens/evolution-windows-sens.c | 4 ++-- 21 files changed, 42 insertions(+), 42 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c index 9f56409ee5..02d16d640b 100644 --- a/modules/addressbook/e-book-shell-backend.c +++ b/modules/addressbook/e-book-shell-backend.c @@ -511,8 +511,8 @@ book_shell_backend_constructed (GObject *object) * that all EPlugins and EPluginHooks are loaded first. */ g_idle_add ((GSourceFunc) book_shell_backend_init_preferences, shell); - 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/modules/calendar/e-cal-config-calendar-item.c b/modules/calendar/e-cal-config-calendar-item.c index f2116e63cf..fba37b3820 100644 --- a/modules/calendar/e-cal-config-calendar-item.c +++ b/modules/calendar/e-cal-config-calendar-item.c @@ -48,8 +48,8 @@ cal_config_calendar_item_constructed (GObject *object) extensible, "week-start-day", G_BINDING_SYNC_CREATE); - 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/modules/calendar/e-cal-config-comp-editor.c b/modules/calendar/e-cal-config-comp-editor.c index ae8753de74..ba23a051e5 100644 --- a/modules/calendar/e-cal-config-comp-editor.c +++ b/modules/calendar/e-cal-config-comp-editor.c @@ -68,8 +68,8 @@ cal_config_comp_editor_constructed (GObject *object) extensible, "work-day-start-minute", G_BINDING_SYNC_CREATE); - 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/modules/calendar/e-cal-config-date-edit.c b/modules/calendar/e-cal-config-date-edit.c index c26db3e2d6..05a2947d7e 100644 --- a/modules/calendar/e-cal-config-date-edit.c +++ b/modules/calendar/e-cal-config-date-edit.c @@ -48,8 +48,8 @@ cal_config_date_edit_constructed (GObject *object) extensible, "week-start-day", G_BINDING_SYNC_CREATE); - 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/modules/calendar/e-cal-config-meeting-store.c b/modules/calendar/e-cal-config-meeting-store.c index 1e4dc460b9..ba1a1077b3 100644 --- a/modules/calendar/e-cal-config-meeting-store.c +++ b/modules/calendar/e-cal-config-meeting-store.c @@ -63,8 +63,8 @@ cal_config_meeting_store_constructed (GObject *object) extensible, "week-start-day", G_BINDING_SYNC_CREATE); - 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/modules/calendar/e-cal-config-meeting-time-selector.c b/modules/calendar/e-cal-config-meeting-time-selector.c index 280645d4b9..fb03618cc8 100644 --- a/modules/calendar/e-cal-config-meeting-time-selector.c +++ b/modules/calendar/e-cal-config-meeting-time-selector.c @@ -53,8 +53,8 @@ cal_config_meeting_time_selector_constructed (GObject *object) extensible, "week-start-day", G_BINDING_SYNC_CREATE); - 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/modules/calendar/e-cal-config-model.c b/modules/calendar/e-cal-config-model.c index 5455123c4c..47a3ff6463 100644 --- a/modules/calendar/e-cal-config-model.c +++ b/modules/calendar/e-cal-config-model.c @@ -116,8 +116,8 @@ cal_config_model_constructed (GObject *object) G_BINDING_SYNC_CREATE); } - 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/modules/calendar/e-cal-config-view.c b/modules/calendar/e-cal-config-view.c index 898a1d2be2..60ee4a5690 100644 --- a/modules/calendar/e-cal-config-view.c +++ b/modules/calendar/e-cal-config-view.c @@ -90,8 +90,8 @@ cal_config_view_constructed (GObject *object) G_BINDING_SYNC_CREATE); } - 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/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 960b6c6132..6c80f71965 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -755,8 +755,8 @@ cal_shell_backend_constructed (GObject *object) e_calendar_preferences_new, 600); - 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/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 5ce48a60b3..d60421c49c 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -521,8 +521,8 @@ memo_shell_backend_constructed (GObject *object) G_CALLBACK (memo_shell_backend_window_created_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 diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 8bb3f47a66..a55bd75fcc 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -526,8 +526,8 @@ task_shell_backend_constructed (GObject *object) G_CALLBACK (task_shell_backend_window_created_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 diff --git a/modules/connman/evolution-connman.c b/modules/connman/evolution-connman.c index cf91198d90..30155c9ed3 100644 --- a/modules/connman/evolution-connman.c +++ b/modules/connman/evolution-connman.c @@ -180,8 +180,8 @@ network_manager_constructed (GObject *object) { network_manager_connect (E_CONNMAN (object)); - if (G_OBJECT_CLASS (e_connman_parent_class)->constructed) - G_OBJECT_CLASS (e_connman_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_connman_parent_class)->constructed (object); } static void diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c index fbf8c6d748..7aa93670c5 100644 --- a/modules/mail/e-mail-config-format-html.c +++ b/modules/mail/e-mail-config-format-html.c @@ -66,8 +66,8 @@ mail_config_format_html_constructed (GObject *object) extensible, "show-real-date", G_BINDING_SYNC_CREATE); - 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/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c index 6faad6a551..a13f0bf936 100644 --- a/modules/mail/e-mail-config-reader.c +++ b/modules/mail/e-mail-config-reader.c @@ -48,8 +48,8 @@ mail_config_reader_constructed (GObject *object) extensible, "reply-style", G_BINDING_SYNC_CREATE); - 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/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c index 9dda757bd5..41b17efbad 100644 --- a/modules/mail/e-mail-config-web-view.c +++ b/modules/mail/e-mail-config-web-view.c @@ -71,8 +71,8 @@ mail_config_web_view_constructed (GObject *object) extensible, "realize", G_CALLBACK (mail_config_web_view_realize), NULL); - if (G_OBJECT_CLASS (parent_class)->constructed) - G_OBJECT_CLASS (parent_class)->constructed (object); + /* Chain up to parent's consturcted() method. */ + G_OBJECT_CLASS (parent_class)->constructed (object); } static void diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c index afba8af0c9..3649309d3c 100644 --- a/modules/mailto-handler/evolution-mailto-handler.c +++ b/modules/mailto-handler/evolution-mailto-handler.c @@ -244,8 +244,8 @@ mailto_handler_constructed (GObject *object) shell, "event::ready-to-start", G_CALLBACK (mailto_handler_check), extension); - if (G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed) - G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_mailto_handler_parent_class)->constructed (object); } static void diff --git a/modules/network-manager/evolution-network-manager.c b/modules/network-manager/evolution-network-manager.c index 68212edbcf..7546ece205 100644 --- a/modules/network-manager/evolution-network-manager.c +++ b/modules/network-manager/evolution-network-manager.c @@ -203,8 +203,8 @@ network_manager_constructed (GObject *object) { network_manager_connect (E_NETWORK_MANAGER (object)); - if (G_OBJECT_CLASS (e_network_manager_parent_class)->constructed) - G_OBJECT_CLASS (e_network_manager_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_network_manager_parent_class)->constructed (object); } static void diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c index ad6cd3607c..fa2a4efcc7 100644 --- a/modules/offline-alert/evolution-offline-alert.c +++ b/modules/offline-alert/evolution-offline-alert.c @@ -173,8 +173,8 @@ offline_alert_constructed (GObject *object) shell, "window-created", G_CALLBACK (offline_alert_window_created_cb), extension); - if (G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed) - G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_offline_alert_parent_class)->constructed (object); } static void diff --git a/modules/plugin-manager/evolution-plugin-manager.c b/modules/plugin-manager/evolution-plugin-manager.c index de1df62a5d..a7f7580c86 100644 --- a/modules/plugin-manager/evolution-plugin-manager.c +++ b/modules/plugin-manager/evolution-plugin-manager.c @@ -501,8 +501,8 @@ plugin_manager_constructed (GObject *object) g_object_unref (action); - if (G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed) - G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_plugin_manager_parent_class)->constructed (object); } static void diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index 2bbaa5675e..8f1b118a53 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -597,8 +597,8 @@ startup_wizard_constructed (GObject *object) shell, "event::ready-to-start", G_CALLBACK (startup_wizard_run), extension); - if (G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed) - G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_startup_wizard_parent_class)->constructed (object); } static void diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c index cc61db63b9..96f0a18701 100644 --- a/modules/windows-sens/evolution-windows-sens.c +++ b/modules/windows-sens/evolution-windows-sens.c @@ -586,8 +586,8 @@ cleanup: g_free (buf); } - if (G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed) - G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed (object); + /* Chain up to parent's constructed() method. */ + G_OBJECT_CLASS (e_windows_sens_parent_class)->constructed (object); } static void -- cgit v1.2.3