[network-manager-applet/aleksander/mobile-providers: 20/21] libnm-gtk: warn if the mobile providers database isn't initialized

[Aleksander Morgado <aleksm src gnome org>]

commit f865d8783171d30518047081304701c55fee3192
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Mon Dec 3 12:25:48 2012 +0100

    libnm-gtk: warn if the mobile providers database isn't initialized

 src/libnm-gtk/nm-mobile-providers.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/src/libnm-gtk/nm-mobile-providers.c b/src/libnm-gtk/nm-mobile-providers.c
index d2ff8b1..f895f23 100644
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -1140,6 +1140,9 @@ nma_mobile_providers_database_get_countries (NMAMobileProvidersDatabase *self)
 {
 	g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
 
+	/* Warn if the object hasn't been initialized */
+	g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
 	return self->priv->countries;
 }
 
@@ -1153,6 +1156,9 @@ nma_mobile_providers_database_dump (NMAMobileProvidersDatabase *self)
 {
 	g_return_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self));
 
+	/* Warn if the object hasn't been initialized */
+	g_return_if_fail (self->priv->countries != NULL);
+
 	g_hash_table_foreach (self->priv->countries, dump_country, NULL);
 }
 
@@ -1167,6 +1173,11 @@ NMACountryInfo *
 nma_mobile_providers_database_lookup_country (NMAMobileProvidersDatabase *self,
                                               const gchar *country_code)
 {
+	g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
+
+	/* Warn if the object hasn't been initialized */
+	g_return_val_if_fail (self->priv->countries != NULL, NULL);
+
 	return (NMACountryInfo *) g_hash_table_lookup (self->priv->countries, country_code);
 }
 
@@ -1189,6 +1200,8 @@ nma_mobile_providers_database_lookup_3gpp_mcc_mnc (NMAMobileProvidersDatabase *s
 
 	g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
 	g_return_val_if_fail (mccmnc != NULL, NULL);
+	/* Warn if the object hasn't been initialized */
+	g_return_val_if_fail (self->priv->countries != NULL, NULL);
 
 	/* Expect only 5 or 6 digit MCCMNC strings */
 	mccmnc_len = strlen (mccmnc);
@@ -1283,6 +1296,8 @@ nma_mobile_providers_database_lookup_cdma_sid (NMAMobileProvidersDatabase *self,
 
 	g_return_val_if_fail (NMA_IS_MOBILE_PROVIDERS_DATABASE (self), NULL);
 	g_return_val_if_fail (sid > 0, NULL);
+	/* Warn if the object hasn't been initialized */
+	g_return_val_if_fail (self->priv->countries != NULL, NULL);
 
 	g_hash_table_iter_init (&iter, self->priv->countries);
 	/* Search through each country */