summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/abstractmail.cpp11
-rw-r--r--kmicromail/libmailwrapper/genericwrapper.cpp16
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
@@ -162,7 +162,7 @@ void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targetMail )
{
- qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1());
+ //qDebug("AbstractMail::downloadNewMails %s ", fromFolder->getName().latin1());
// get local folder
Account * acc = getAccount();
if ( !acc ) return;
@@ -184,7 +184,7 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
}
QValueList<RecMailP> e;
targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
- qDebug("target has mails %d ", e.count());
+ //qDebug("target has mails %d ", e.count());
QValueList<RecMailP> n;
int iii = 0;
int count = t.count();
@@ -201,11 +201,6 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
}
++jjj;
}
- if ( found )
- qDebug("found ");
- else
- qDebug("NOT found ");
-
if ( !found ) {
n.append( r );
}
@@ -216,7 +211,7 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
return;
}
mvcpMailList( n,lfName,targetMail,!acc->getLeaveOnServer());
-
+ Global::statusMessage(tr("Downloaded %1 messages").arg(n.count()));
#if 0
QValueList<RecMailP> t;
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
@@ -46,16 +46,26 @@ QString Genericwrapper::parseDateTime( mailimf_date_time *date )
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];