Merge lp:~ted/indicator-datetime/bug714763 into lp:indicator-datetime/0.3

[Ted Gould]

Handle the case where we can't get a client. Deserves a messy message, but we can continue.

[Mikkel Kamstrup Erlandsen (kamstrup)]

If this happens because geoclue-master crashes then I think it deserves a more sensible error message. It's not a programming error but a runtime error.

[lp:~ted/indicator-datetime/bug714763]

40. By Ted Gould on 2011-02-08

Changing warning.

[Ted Gould (ted)]

On Tue, 2011-02-08 at 09:49 +0000, Mikkel Kamstrup Erlandsen wrote:
> If this happens because geoclue-master crashes then I think it deserves
> a more sensible error message. It's not a programming error but a
> runtime error.

I think it's a programming error in GeoClue ;)

Yeah, I put a more user friendly message in so that people could see
what the impact is.

[lp:~ted/indicator-datetime/bug714763]

41. By Ted Gould on 2011-02-08

Made translatable as it's a user focused message.

=== modified file 'configure.ac'
--- configure.ac	2011-01-27 22:34:24 +0000
+++ configure.ac	2011-02-08 19:49:13 +0000
@@ -1,11 +1,11 @@
 
-AC_INIT(indicator-datetime, 0.1.91, [e-mail])
+AC_INIT(indicator-datetime, 0.1.92, [e-mail])
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-datetime, 0.1.91)
+AM_INIT_AUTOMAKE(indicator-datetime, 0.1.92)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'src/datetime-service.c'
--- src/datetime-service.c	2011-02-01 15:52:10 +0000
+++ src/datetime-service.c	2011-02-08 19:49:13 +0000
@@ -512,6 +512,12 @@
 	g_debug("Created Geoclue client at: %s", path);
 
 	geo_master = client;
+
+	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));
 
 	/* New client, make sure we don't have an address hanging on */