More mail enh.

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
@@ -41,26 +41,36 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date )
         KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ),
                                               kon.readNumEntry( "DaylightsavingStart", 90),
                                               kon.readNumEntry( "DaylightsavingEnd",304) );
         KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") );
    
         init = true;
 
     }
-    QDateTime dt (QDate(date->dt_year,date->dt_month, date->dt_day ),QTime(date->dt_hour, date->dt_min, date->dt_sec  ) );
+    QDate da (date->dt_year,date->dt_month, date->dt_day );
+    QTime ti ( date->dt_hour, date->dt_min, date->dt_sec );
+    QDateTime dt ( da ,ti );
     int off = KGlobal::locale()->localTimeOffset( dt );
-    dt = dt.addSecs( off*60 );
-    QString ret = KGlobal::locale()->formatDateTime( dt,true,true);
+    //dt = dt.addSecs( off*60 );
+    QString ret;
+    if ( da ==  QDate::currentDate () )
+        ret = KGlobal::locale()->formatTime( ti,true);
+
+    else {
+        ret = KGlobal::locale()->formatDateTime( dt,true,true);
+    }
+#if 0
     if (  off < 0 )
         ret += " -";
     else
         ret += " +";
     ret += QString::number( off / 60 );
     ret += "h";
+#endif
 #if 0
     char tmp[23];
    
     //   snprintf( tmp, 23,  "%02i.%02i.%04i %02i:%02i:%02i %+05i",
     //  date->dt_day, date->dt_month, date->dt_year, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );
      snprintf( tmp, 23,  "%04i-%02i-%02i %02i:%02i:%02i %+05i",
                date->dt_year,date->dt_month, date->dt_day, date->dt_hour, date->dt_min, date->dt_sec, date->dt_zone );