[Commits] [SCM] claws branch, master, updated. 3.14.1-176-ge010e35

[ticho at claws-mail.org]

The branch, master has been updated
       via  e010e3551e99fc83d183612c00ed20cf1cec41ab (commit)
      from  38131c96c146e1693fe7c4b90b4ca88d125c7a11 (commit)

Summary of changes:
 src/plugins/vcalendar/vcal_manager.c |   16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)


- Log -----------------------------------------------------------------
commit e010e3551e99fc83d183612c00ed20cf1cec41ab
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Sat Feb 4 17:35:20 2017 +0100

    Unify display of event times in vCalendar's mimeviewer on Windows and Unix.
    
    We now use g_date_time_format() on both. Also, display
    timezone abbreviation (%Z) instead of offset (%z) in the
    strings.

diff --git a/src/plugins/vcalendar/vcal_manager.c b/src/plugins/vcalendar/vcal_manager.c
index c303b9b..a05ca36 100644
--- a/src/plugins/vcalendar/vcal_manager.c
+++ b/src/plugins/vcalendar/vcal_manager.c
@@ -790,28 +790,16 @@ VCalEvent * vcal_manager_new_event	(const gchar 	*uid,
 
 	if (dtend && *(dtend)) {
 		time_t tmp = icaltime_as_timet((icaltime_from_string(dtend)));
-#ifdef G_OS_WIN32
 		GDateTime *dt = g_date_time_new_from_unix_local(tmp);
-		event->end = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+		event->end = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %Z");
 		g_date_time_unref(dt);
-#else
-		gchar buft[512];
-		tzset();
-		event->end	= g_strdup(ctime_r(&tmp, buft));
-#endif
 	}
 	
 	if (dtstart && *(dtstart)) {
 		time_t tmp = icaltime_as_timet((icaltime_from_string(dtstart)));
-#ifdef G_OS_WIN32
 		GDateTime *dt = g_date_time_new_from_unix_local(tmp);
-		event->start = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %z");
+		event->start = g_date_time_format(dt, "%a, %e %b %Y %H:%M:%S %Z");
 		g_date_time_unref(dt);
-#else
-		gchar buft[512];
-		tzset();
-		event->start	= g_strdup(ctime_r(&tmp, buft));
-#endif
 	}
 	event->dtstart		= g_strdup(dtstart?dtstart:"");
 	event->dtend		= g_strdup(dtend?dtend:"");

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail