SVN commit 1022729 by jbrouault:
backport of r1013632
BUG:194302
BUG:203949
M +3 -1 microblog.cpp
--- branches/KDE/4.3/kdeplasma-addons/applets/microblog/microblog.cpp #1022728:1022729
@@ -548,9 +548,11 @@
}
QLocale english(QLocale::English, QLocale::UnitedStates);
+ QDateTime dt = english.toDateTime(tweetData.value( "Date" ).toString(), "ddd MMM dd HH:mm:ss +0000 yyyy");
+ dt.setTimeSpec(Qt::UTC);
QString html = "
";
html += QString("%1 | %3%4 |
").arg( user).arg(m_colorScheme->foreground(KColorScheme::InactiveText).color().name())
- .arg(timeDescription( english.toDateTime(tweetData.value( "Date" ).toString(), "ddd MMM dd HH:mm:ss +0000 yyyy") )).arg( sourceString);
+ .arg(timeDescription( dt )).arg( sourceString);
QString status = tweetData.value( "Status" ).toString();
status.replace(QRegExp("((http|https)://[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]])"), "\\1");