GNOME.org
 

[evolution-data-server] Remove NULL checks for GObject methods.

commit 5d287d9349816fe1ec91e3e01c43efeb4a2428e2
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Feb 12 10:54:39 2011 -0500

    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.

 addressbook/backends/ldap/e-book-backend-ldap.c    |    4 ++--
 addressbook/libebook/e-book.c                      |    8 ++++----
 addressbook/libebook/e-destination.c               |    8 ++++----
 addressbook/libebook/e-vcard.c                     |    4 ++--
 addressbook/libedata-book/e-book-backend-sexp.c    |    4 ++--
 addressbook/libedata-book/e-book-backend-summary.c |    4 ++--
 addressbook/libedata-book/e-data-book-factory.c    |    4 ++--
 calendar/backends/caldav/e-cal-backend-caldav.c    |    8 ++++----
 .../backends/contacts/e-cal-backend-contacts.c     |    4 ++--
 calendar/backends/file/e-cal-backend-file.c        |    8 ++++----
 .../backends/groupwise/e-cal-backend-groupwise.c   |    4 ++--
 calendar/backends/http/e-cal-backend-http.c        |    8 ++++----
 calendar/backends/weather/e-cal-backend-weather.c  |    4 ++--
 calendar/libecal/e-cal-component.c                 |    4 ++--
 calendar/libecal/e-cal-view.c                      |    4 ++--
 calendar/libedata-cal/e-cal-backend-sexp.c         |    4 ++--
 calendar/libedata-cal/e-data-cal-factory.c         |    4 ++--
 calendar/libedata-cal/e-data-cal.c                 |    4 ++--
 libebackend/e-data-server-module.c                 |    4 ++--
 libedataserver/e-list-iterator.c                   |    4 ++--
 libedataserverui/e-category-completion.c           |    4 ++--
 21 files changed, 52 insertions(+), 52 deletions(-)
---
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index ec82feb..8ad5a20 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -5363,8 +5363,8 @@ e_book_backend_ldap_dispose (GObject *object)
 		bl->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_book_backend_ldap_parent_class)->dispose)
-		G_OBJECT_CLASS (e_book_backend_ldap_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_book_backend_ldap_parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index c0d741e..e63cce8 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -174,8 +174,8 @@ e_book_dispose (GObject *object)
 		book->priv->source = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_book_parent_class)->dispose)
-		G_OBJECT_CLASS (e_book_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_book_parent_class)->dispose (object);
 }
 
 static void
@@ -189,8 +189,8 @@ e_book_finalize (GObject *object)
 	if (book->priv->cap)
 		g_free (book->priv->cap);
 
-	if (G_OBJECT_CLASS (e_book_parent_class)->finalize)
-		G_OBJECT_CLASS (e_book_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_book_parent_class)->finalize (object);
 
 	LOCK_FACTORY ();
 	active_books--;
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 9c322e5..e5aebca 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -116,9 +116,9 @@ utf8_casefold_collate (const gchar *str1, const gchar *str2)
 }
 
 static void
-e_destination_dispose (GObject *obj)
+e_destination_dispose (GObject *object)
 {
-	EDestination *dest = E_DESTINATION (obj);
+	EDestination *dest = E_DESTINATION (object);
 
 	if (dest->priv) {
 		e_destination_clear (dest);
@@ -127,8 +127,8 @@ e_destination_dispose (GObject *obj)
 		dest->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (obj);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index 30fdb47..e05a952 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -80,8 +80,8 @@ e_vcard_dispose (GObject *object)
 		evc->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/libedata-book/e-book-backend-sexp.c b/addressbook/libedata-book/e-book-backend-sexp.c
index 9b4cb4d..7867f4e 100644
--- a/addressbook/libedata-book/e-book-backend-sexp.c
+++ b/addressbook/libedata-book/e-book-backend-sexp.c
@@ -907,8 +907,8 @@ e_book_backend_sexp_dispose (GObject *object)
 		sexp->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index 545e433..a2201cd 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -198,8 +198,8 @@ e_book_backend_summary_dispose (GObject *object)
 		summary->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 918257c..c5c6998 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -465,8 +465,8 @@ e_data_book_factory_finalize (GObject *object)
 	g_mutex_free (factory->priv->books_lock);
 	g_mutex_free (factory->priv->connections_lock);
 
-	if (G_OBJECT_CLASS (e_data_book_factory_parent_class)->finalize)
-		G_OBJECT_CLASS (e_data_book_factory_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_data_book_factory_parent_class)->finalize (object);
 }
 
 static void
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 469997b..1280228 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -4604,8 +4604,8 @@ e_cal_backend_caldav_dispose (GObject *object)
 	priv->disposed = TRUE;
 	g_mutex_unlock (priv->busy_lock);
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
@@ -4626,8 +4626,8 @@ e_cal_backend_caldav_finalize (GObject *object)
 	}
 	priv->default_zone = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 static void
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 5f23037..e8cf1cb 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1236,8 +1236,8 @@ e_cal_backend_contacts_finalize (GObject *object)
 	g_free (priv);
 	cbc->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /* Object initialization function for the contacts backend */
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 492c565..7aff3f6 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -331,8 +331,8 @@ e_cal_backend_file_dispose (GObject *object)
 	if (source)
 		g_signal_handlers_disconnect_matched (source, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, cbfile);
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 /* Finalize handler for the file backend */
@@ -383,8 +383,8 @@ e_cal_backend_file_finalize (GObject *object)
 	g_free (priv);
 	cbfile->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index e3e2c25..60fce4a 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -1219,8 +1219,8 @@ e_cal_backend_groupwise_finalize (GObject *object)
 	g_free (priv);
 	cbgw->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /* Calendar backend methods */
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index e47f41c..dfcc56a 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -113,8 +113,8 @@ e_cal_backend_http_dispose (GObject *object)
 		priv->source_changed_id = 0;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 /* Finalize handler for the file backend */
@@ -161,8 +161,8 @@ e_cal_backend_http_finalize (GObject *object)
 	g_free (priv);
 	cbhttp->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 
diff --git a/calendar/backends/weather/e-cal-backend-weather.c b/calendar/backends/weather/e-cal-backend-weather.c
index cba40a8..6e62126 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -948,8 +948,8 @@ e_cal_backend_weather_finalize (GObject *object)
 	g_free (priv);
 	cbw->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 /* Object initialization function for the weather backend */
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index 9287a5f..92f8f35 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -388,8 +388,8 @@ e_cal_component_finalize (GObject *object)
 	g_free (priv);
 	comp->priv = NULL;
 
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
 
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index b623105..b3fce4d 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -263,8 +263,8 @@ e_cal_view_finalize (GObject *object)
 
 	g_object_unref (priv->client);
 
-	if (G_OBJECT_CLASS (e_cal_view_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_cal_view_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_cal_view_parent_class)->finalize (object);
 }
 
 /* Class initialization function for the calendar view */
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index e1bc7ce..42805ec 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -1440,8 +1440,8 @@ e_cal_backend_sexp_dispose (GObject *object)
 		sexp->priv = NULL;
 	}
 
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		G_OBJECT_CLASS (parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static void
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index c542a8c..a242c85 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -590,8 +590,8 @@ e_data_cal_factory_finalize (GObject *object)
 
 	g_mutex_free (factory->priv->backends_mutex);
 
-	if (G_OBJECT_CLASS (e_data_cal_factory_parent_class)->finalize)
-		G_OBJECT_CLASS (e_data_cal_factory_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_data_cal_factory_parent_class)->finalize (object);
 }
 
 /* Class initialization function for the calendar factory */
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 16a6741..0a80e0b 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -1253,8 +1253,8 @@ e_data_cal_finalize (GObject *object)
 
 	g_object_unref (cal->priv->gdbus_object);
 
-	if (G_OBJECT_CLASS (e_data_cal_parent_class)->finalize)
-		G_OBJECT_CLASS (e_data_cal_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_data_cal_parent_class)->finalize (object);
 }
 
 /* Class init */
diff --git a/libebackend/e-data-server-module.c b/libebackend/e-data-server-module.c
index a2fd24a..fe5a10f 100644
--- a/libebackend/e-data-server-module.c
+++ b/libebackend/e-data-server-module.c
@@ -127,8 +127,8 @@ e_data_server_module_finalize (GObject *object)
 
 	g_free (module->path);
 
-	if (G_OBJECT_CLASS (e_data_server_module_parent_class)->finalize)
-		(*G_OBJECT_CLASS (e_data_server_module_parent_class)->finalize) (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_data_server_module_parent_class)->finalize (object);
 }
 
 static void
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 1261ded..0ff4350 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -87,8 +87,8 @@ e_list_iterator_dispose (GObject *object)
 	e_list_remove_iterator (iterator->list, E_ITERATOR (iterator));
 	g_object_unref (iterator->list);
 
-	if (G_OBJECT_CLASS (e_list_iterator_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_list_iterator_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_list_iterator_parent_class)->dispose (object);
 }
 
 static gconstpointer
diff --git a/libedataserverui/e-category-completion.c b/libedataserverui/e-category-completion.c
index 911abdb..f0afe4b 100644
--- a/libedataserverui/e-category-completion.c
+++ b/libedataserverui/e-category-completion.c
@@ -365,8 +365,8 @@ category_completion_constructed (GObject *object)
 	GtkCellRenderer *renderer;
 	GtkEntryCompletion *completion;
 
-	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);
 
 	completion = GTK_ENTRY_COMPLETION (object);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]