| -rw-r--r-- | kmicromail/libmailwrapper/abstractmail.cpp | 11 | ||||
| -rw-r--r-- | kmicromail/libmailwrapper/genericwrapper.cpp | 16 |
2 files changed, 16 insertions, 11 deletions
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp index 374d606..44878e0 100644 --- a/kmicromail/libmailwrapper/abstractmail.cpp +++ b/kmicromail/libmailwrapper/abstractmail.cpp @@ -164,3 +164,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe { - qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1()); + //qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1()); // get local folder @@ -186,3 +186,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe targetMail->listMessages(lfName,e,acc->getMaxMailSize() ); - qDebug("target has mails %d ", e.count()); + //qDebug("target has mails %d ", e.count()); QValueList<RecMailP> n; @@ -203,7 +203,2 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe } - if ( found ) - qDebug("found "); - else - qDebug("NOT found "); - if ( !found ) { @@ -218,3 +213,3 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer()); - + Global::statusMessage(tr("Downloaded %1 messages").arg(n.count())); 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 @@ -48,6 +48,15 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date ) } - 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 ) @@ -58,2 +67,3 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date ) ret += "h"; +#endif #if 0 |