From d11179c33da9742bbed43e5f714c403f20a84b53 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Tue, 1 Nov 2011 10:48:28 +0100 Subject: [PATCH] Migrated to GDateTime (closes #33). --- src/rptreport.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/rptreport.c b/src/rptreport.c index bc97fa3..1e19845 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -3164,8 +3164,9 @@ gchar else if (strncmp (real_special, "@Date", 5) == 0) { gchar *format; - time_t now = time (NULL); - struct tm *tm = localtime (&now); + GDateTime *now; + + now = g_date_time_new_now_local (); if (strlen (real_special) > 5 && real_special[5] == '{' @@ -3179,14 +3180,17 @@ gchar format = g_strdup ("%Y-%m-%d"); } - ret = g_strdup_printf ("%s", rpt_report_get_str_from_tm (tm, format)); + ret = g_date_time_format (now, format); + g_free (format); + g_date_time_unref (now); } else if (strncmp (real_special, "@Time", 5) == 0) { gchar *format; - time_t now = time (NULL); - struct tm *tm = localtime (&now); + GDateTime *now; + + now = g_date_time_new_now_local (); if (strlen (real_special) > 5 && real_special[5] == '{' @@ -3200,8 +3204,9 @@ gchar format = g_strdup ("%H:%M:%S"); } - ret = g_strdup_printf ("%s", rpt_report_get_str_from_tm (tm, format)); + ret = g_date_time_format (now, format); g_free (format); + g_date_time_unref (now); } return ret; -- 2.49.0