Diffstat (limited to 'kmicromail/libmailwrapper/genericwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/genericwrapper.cpp b/kmicromail/libmailwrapper/genericwrapper.cpp index 2b04847..ed591fc 100644 --- a/kmicromail/libmailwrapper/genericwrapper.cpp +++ b/kmicromail/libmailwrapper/genericwrapper.cpp | |||
@@ -47,8 +47,17 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date ) | |||
47 | 47 | ||
48 | } | 48 | } |
49 | QDateTime dt (QDate(date->dt_year,date->dt_month, date->dt_day ),QTime(date->dt_hour, date->dt_min, date->dt_sec ) ); | 49 | QDate da (date->dt_year,date->dt_month, date->dt_day ); |
50 | QTime ti ( date->dt_hour, date->dt_min, date->dt_sec ); | ||
51 | QDateTime dt ( da ,ti ); | ||
50 | int off = KGlobal::locale()->localTimeOffset( dt ); | 52 | int off = KGlobal::locale()->localTimeOffset( dt ); |
51 | dt = dt.addSecs( off*60 ); | 53 | //dt = dt.addSecs( off*60 ); |
52 | QString ret = KGlobal::locale()->formatDateTime( dt,true,true); | 54 | QString ret; |
55 | if ( da == QDate::currentDate () ) | ||
56 | ret = KGlobal::locale()->formatTime( ti,true); | ||
57 | |||
58 | else { | ||
59 | ret = KGlobal::locale()->formatDateTime( dt,true,true); | ||
60 | } | ||
61 | #if 0 | ||
53 | if ( off < 0 ) | 62 | if ( off < 0 ) |
54 | ret += " -"; | 63 | ret += " -"; |
@@ -57,4 +66,5 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date ) | |||
57 | ret += QString::number( off / 60 ); | 66 | ret += QString::number( off / 60 ); |
58 | ret += "h"; | 67 | ret += "h"; |
68 | #endif | ||
59 | #if 0 | 69 | #if 0 |
60 | char tmp[23]; | 70 | char tmp[23]; |