From 21d4207e212d99af143f75b6544e3eb907bfde48 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Mon, 7 Feb 2011 14:37:31 -0600 Subject: Check to make sure we can allocate a client. --- src/datetime-service.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/datetime-service.c b/src/datetime-service.c index 9f795d1..7d35a38 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -512,6 +512,9 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * g_debug("Created Geoclue client at: %s", path); geo_master = client; + + g_return_if_fail(geo_master != NULL); + g_object_ref(G_OBJECT(geo_master)); /* New client, make sure we don't have an address hanging on */ -- cgit v1.2.3 From a0328a7ca5a8aad4a8713ee53ff3b790fa958c86 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Feb 2011 13:40:26 -0600 Subject: Changing warning. --- src/datetime-service.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index 7d35a38..e7b20fb 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -513,7 +513,10 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * geo_master = client; - g_return_if_fail(geo_master != NULL); + if (geo_master != NULL) { + g_warning("Unable to get a GeoClue client! Geolocation based timezone support will not be available."); + return; + } g_object_ref(G_OBJECT(geo_master)); -- cgit v1.2.3 From c721c1d4d5d63e5765898aab2b8906b3187b3e93 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 8 Feb 2011 13:46:45 -0600 Subject: Made translatable as it's a user focused message. --- src/datetime-service.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/datetime-service.c b/src/datetime-service.c index e7b20fb..7484144 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -514,7 +514,7 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * geo_master = client; if (geo_master != NULL) { - g_warning("Unable to get a GeoClue client! Geolocation based timezone support will not be available."); + g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available.")); return; } -- cgit v1.2.3