| -rw-r--r-- | noncore/net/mail/defines.h | 5 | ||||
| -rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 17 | ||||
| -rw-r--r-- | noncore/net/mail/mainwindow.cpp | 8 | ||||
| -rw-r--r-- | noncore/net/mail/taskbarapplet/mailapplet.cpp | 1 | ||||
| -rw-r--r-- | noncore/net/mail/viewmailbase.cpp | 2 |
5 files changed, 16 insertions, 17 deletions
diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h index 36c85c7..ebe8e08 100644 --- a/noncore/net/mail/defines.h +++ b/noncore/net/mail/defines.h @@ -5,3 +5,3 @@ -#define USER_AGENT "OpieMail v0.1" +#define USER_AGENT "OpieMail v0.3" @@ -10,5 +10,2 @@ #define PIC_SHOWFOLDERS "mail/showfolders" -#define PIC_SEARCHMAILS "mail/searchmails" -#define PIC_EDITSETTINGS "mail/editsettings" -#define PIC_EDITACCOUNTS "mail/editaccounts" #define PIC_SYNC "mail/sync" diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index ec4dcd2..cceb22e 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp @@ -41,3 +41,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) size_t length = 0; - + login(); @@ -53,3 +53,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) } - + QFile msg_cache(msgTempName); @@ -57,3 +57,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) cleanMimeCache(); - + if (mail.getNumber()!=last_msg_id) { @@ -90,7 +90,7 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail ) body = parseMail(mailmsg); - + /* clean up */ - if (mailmsg) mailmessage_free(mailmsg); + if (mailmsg) mailmessage_free(mailmsg); if (message) free(message); - + return body; @@ -155,2 +155,3 @@ void POP3wrapper::login() if (err != MAIL_NO_ERROR) { + qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) ); Global::statusMessage(tr("Error initializing folder")); @@ -216,3 +217,3 @@ int POP3wrapper::deleteAllMail(const Folder*) break; - } + } return res; @@ -239,3 +240,3 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail) err = mailmessage_fetch(mailmsg,&target,&length); - if (mailmsg) mailmessage_free(mailmsg); + if (mailmsg) mailmessage_free(mailmsg); if (target) { diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index 43d02e7..3c659e4 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp @@ -66,3 +66,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) /* - searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS, + searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ), 0, 0, this ); @@ -72,3 +72,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) - deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); + deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this); deleteMails->addTo( toolBar ); @@ -78,3 +78,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) - editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS, + editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) , 0, 0, this ); @@ -83,3 +83,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) SLOT( slotEditSettings() ) ); - editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, + editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , 0, 0, this ); diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp index a261d14..991b5fb 100644 --- a/noncore/net/mail/taskbarapplet/mailapplet.cpp +++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp @@ -51,2 +51,3 @@ void MailApplet::paintEvent( QPaintEvent* ) { p.setFont( f ); + p.setPen( Qt::blue ); p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) ); diff --git a/noncore/net/mail/viewmailbase.cpp b/noncore/net/mail/viewmailbase.cpp index 0e994d4..153ba9d 100644 --- a/noncore/net/mail/viewmailbase.cpp +++ b/noncore/net/mail/viewmailbase.cpp @@ -50,3 +50,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) - deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); + deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this); deleteMail->addTo(toolbar); |