[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/kaffeine/src/dvb
From:       Christoph Pfister <christophpfister () gmail ! com>
Date:       2010-11-28 12:59:01
Message-ID: 20101128125901.AB5AAAC8A3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1201718 by pfister:

fix (possible) time zone problems


 M  +6 -3      dvbepg.cpp  


--- trunk/extragear/multimedia/kaffeine/src/dvb/dvbepg.cpp #1201717:1201718
@@ -131,6 +131,7 @@
 		DvbEpgEntry entry;
 		stream >> entry.channelName;
 		stream >> entry.begin;
+		entry.begin = entry.begin.toUTC();
 		stream >> entry.duration;
 		stream >> entry.title;
 		stream >> entry.subheading;
@@ -767,10 +768,12 @@
 		text += i18n("<font color=#808000>%1</font><br>", entry->subheading);
 	}
 
+	QDateTime begin = entry->begin.toLocalTime();
+	QTime end = entry->begin.addSecs(QTime().secsTo(entry->duration)).toLocalTime().time();
+
 	text += i18n("<font color=#800000>%1 - %2</font><br><br>",
-		KGlobal::locale()->formatDateTime(entry->begin.toLocalTime(), KLocale::LongDate),
-		KGlobal::locale()->formatTime(
-			entry->begin.addSecs(QTime().secsTo(entry->duration)).time()));
+		KGlobal::locale()->formatDateTime(begin, KLocale::LongDate),
+		KGlobal::locale()->formatTime(end));
 
 	text += entry->details;
 	contentLabel->setText(text);
[prev in list] [next in list] [prev in thread] [next in thread]