Merge lp:~jjardon/indicator-datetime/fix-775113 into lp:indicator-datetime/0.3

[Javier Jardón]

[lp:~jjardon/indicator-datetime/fix-775113]

129. By Javier Jardón on 2011-09-05

configure.ac: Bump glib required version

This version of Glib supports all the strftime format specifiers
Fixes https://bugs.launchpad.net/indicator-datetime/+bug/775113

[Ted Gould (ted)]

No currently a new enough version of GLib in Oneiric to test. Need to circle back when that gets updated.

[Javier Jardón (jjardon)]

Only note that the needed version is currently available in oneiric

=== modified file 'configure.ac'
--- configure.ac	2011-08-18 15:57:14 +0000
+++ configure.ac	2011-09-05 12:10:42 +0000
@@ -66,7 +66,7 @@
 ICAL_REQUIRED_VERSION=0.44
 CAIRO_REQUIRED_VERSION=1.10
 GDK_REQUIRED_VERSION=2.22
-GLIB_REQUIRED_VERSION=2.26
+GLIB_REQUIRED_VERSION=2.29.19
 GTK3_REQUIRED_VERSION=3.1.4
 GCONF_REQUIRED_VERSION=2.31
 

=== modified file 'src/indicator-datetime.c'
--- src/indicator-datetime.c	2011-08-25 14:46:51 +0000
+++ src/indicator-datetime.c	2011-09-05 12:10:42 +0000
@@ -215,7 +215,7 @@
 	                                 PROP_TIME_FORMAT,
 	                                 g_param_spec_int(PROP_TIME_FORMAT_S,
 	                                                  "A choice of which format should be used on the panel",
-	                                                  "Chooses between letting the locale choose the time, 12-hour time, 24-time or using the custom string passed to strftime().",
+	                                                  "Chooses between letting the locale choose the time, 12-hour time, 24-time or using the custom string passed to g_date_time_format().",
 	                                                  SETTINGS_TIME_LOCALE, /* min */
 	                                                  SETTINGS_TIME_CUSTOM, /* max */
 	                                                  SETTINGS_TIME_LOCALE, /* default */
@@ -245,7 +245,7 @@
 	                                 PROP_CUSTOM_TIME_FORMAT,
 	                                 g_param_spec_string(PROP_CUSTOM_TIME_FORMAT_S,
 	                                                     "The format that is used to show the time on the panel.",
-	                                                     "A format string in the form used to pass to strftime to make a string for displaying on the panel.",
+	                                                     "A format string in the form used to pass to g_date_time_format() to make a string for displaying on the panel.",
 	                                                     DEFAULT_TIME_FORMAT,
 	                                                     G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
@@ -775,6 +775,12 @@
 	}
 	else {
 		timestr = g_date_time_format(datetime_now, format);
+		if (timestr == NULL) {
+			g_warning ("The custom date format is not valid, check the
+			            g_date_time_format() documentation for the supported
+			            format specifiers ");
+			timestr = g_strdup ("Date format not supported");
+		}
 	}
 
 	gboolean use_markup = FALSE;