From ce5a9ce7588e132c0c059344c7645994c536d091 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Fri, 12 Dec 2008 16:27:46 +0000 Subject: [PATCH] Some fixes in datetime formatter pmo-trunk-r6814 --- src/modest-datetime-formatter.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/modest-datetime-formatter.c b/src/modest-datetime-formatter.c index 2a4e73b..dd3ee9c 100644 --- a/src/modest-datetime-formatter.c +++ b/src/modest-datetime-formatter.c @@ -124,7 +124,7 @@ static void update_format (ModestDatetimeFormatter *obj) { GConfClient *gconf; - GError *error = NULL; + GError *err = NULL; gboolean gconf_value; ModestDatetimeFormatterPrivate *priv; @@ -132,11 +132,11 @@ update_format (ModestDatetimeFormatter *obj) gconf = gconf_client_get_default (); gconf_value = gconf_client_get_bool (gconf, HILDON2_GCONF_FORMAT_KEY, - &error); + &err); - if (error != NULL) { - g_warning ("Error reading time format in gconf %s", error->message); - g_error_free (error); + if (err != NULL) { + g_warning ("Error reading time format in gconf %s", err->message); + g_error_free (err); } else { priv->current_format = gconf_value?DATETIME_FORMAT_24H:DATETIME_FORMAT_12H; } @@ -166,16 +166,16 @@ init_format (ModestDatetimeFormatter *obj) #ifdef MODEST_TOOLKIT_HILDON2 GConfClient *gconf; - GError *error = NULL; + GError *err = NULL; gconf = gconf_client_get_default (); priv->gconf_handler = gconf_client_notify_add (gconf, HILDON2_GCONF_FORMAT_KEY, clock_format_changed, (gpointer) obj, - NULL, &error); + NULL, &err); - if (error != NULL) { - g_warning ("Error listening to time format in gconf %s", error->message); - g_error_free (error); + if (err != NULL) { + g_warning ("Error listening to time format in gconf %s", err->message); + g_error_free (err); } update_format (obj); #endif -- 1.7.9.5