summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/mail/defines.h5
-rw-r--r--noncore/net/mail/libmailwrapper/pop3wrapper.cpp17
-rw-r--r--noncore/net/mail/mainwindow.cpp8
-rw-r--r--noncore/net/mail/taskbarapplet/mailapplet.cpp1
-rw-r--r--noncore/net/mail/viewmailbase.cpp2
-rw-r--r--pics/mail/abort.pngbin702 -> 0 bytes
-rw-r--r--pics/mail/configure.pngbin697 -> 0 bytes
-rw-r--r--pics/mail/delete.pngbin626 -> 0 bytes
-rw-r--r--pics/mail/deletemail.pngbin679 -> 0 bytes
-rw-r--r--pics/mail/editsettings.pngbin697 -> 0 bytes
-rw-r--r--pics/mail/find.pngbin809 -> 0 bytes
-rw-r--r--pics/mail/folder.pngbin767 -> 0 bytes
-rw-r--r--pics/mail/mailchecker.pngbin832 -> 0 bytes
-rw-r--r--pics/mail/reload.pngbin699 -> 0 bytes
-rw-r--r--pics/mail/savemail.pngbin757 -> 0 bytes
-rw-r--r--pics/mail/searchmails.pngbin820 -> 0 bytes
16 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 @@
5 5
6#define USER_AGENT "OpieMail v0.1" 6#define USER_AGENT "OpieMail v0.3"
7 7
@@ -10,5 +10,2 @@
10#define PIC_SHOWFOLDERS "mail/showfolders" 10#define PIC_SHOWFOLDERS "mail/showfolders"
11#define PIC_SEARCHMAILS "mail/searchmails"
12#define PIC_EDITSETTINGS "mail/editsettings"
13#define PIC_EDITACCOUNTS "mail/editaccounts"
14#define PIC_SYNC "mail/sync" 11#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 )
41 size_t length = 0; 41 size_t length = 0;
42 42
43 login(); 43 login();
@@ -53,3 +53,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
53 } 53 }
54 54
55 QFile msg_cache(msgTempName); 55 QFile msg_cache(msgTempName);
@@ -57,3 +57,3 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
57 cleanMimeCache(); 57 cleanMimeCache();
58 58
59 if (mail.getNumber()!=last_msg_id) { 59 if (mail.getNumber()!=last_msg_id) {
@@ -90,7 +90,7 @@ RecBody POP3wrapper::fetchBody( const RecMail &mail )
90 body = parseMail(mailmsg); 90 body = parseMail(mailmsg);
91 91
92 /* clean up */ 92 /* clean up */
93 if (mailmsg) mailmessage_free(mailmsg); 93 if (mailmsg) mailmessage_free(mailmsg);
94 if (message) free(message); 94 if (message) free(message);
95 95
96 return body; 96 return body;
@@ -155,2 +155,3 @@ void POP3wrapper::login()
155 if (err != MAIL_NO_ERROR) { 155 if (err != MAIL_NO_ERROR) {
156 qDebug( QString( "FEHLERNUMMER %1" ).arg( err ) );
156 Global::statusMessage(tr("Error initializing folder")); 157 Global::statusMessage(tr("Error initializing folder"));
@@ -216,3 +217,3 @@ int POP3wrapper::deleteAllMail(const Folder*)
216 break; 217 break;
217 } 218 }
218 return res; 219 return res;
@@ -239,3 +240,3 @@ encodedString* POP3wrapper::fetchRawBody(const RecMail&mail)
239 err = mailmessage_fetch(mailmsg,&target,&length); 240 err = mailmessage_fetch(mailmsg,&target,&length);
240 if (mailmsg) mailmessage_free(mailmsg); 241 if (mailmsg) mailmessage_free(mailmsg);
241 if (target) { 242 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 )
66 /* 66 /*
67 searchMails = new QAction( tr( "Search mails" ), ICON_SEARCHMAILS, 67 searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ),
68 0, 0, this ); 68 0, 0, this );
@@ -72,3 +72,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
72 72
73 deleteMails = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); 73 deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this);
74 deleteMails->addTo( toolBar ); 74 deleteMails->addTo( toolBar );
@@ -78,3 +78,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
78 78
79 editSettings = new QAction( tr( "Edit settings" ), ICON_EDITSETTINGS, 79 editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) ,
80 0, 0, this ); 80 0, 0, this );
@@ -83,3 +83,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
83 SLOT( slotEditSettings() ) ); 83 SLOT( slotEditSettings() ) );
84 editAccounts = new QAction( tr( "Configure accounts" ), ICON_EDITACCOUNTS, 84 editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) ,
85 0, 0, this ); 85 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* ) {
51 p.setFont( f ); 51 p.setFont( f );
52 p.setPen( Qt::blue );
52 p.drawText( AppLnk::smallIconSize()/3, AppLnk::smallIconSize() - 2, QString::number( m_newMails ) ); 53 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)
50 50
51 deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this); 51 deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("trash")), 0, 0, this);
52 deleteMail->addTo(toolbar); 52 deleteMail->addTo(toolbar);
diff --git a/pics/mail/abort.png b/pics/mail/abort.png
deleted file mode 100644
index 13d0588..0000000
--- a/pics/mail/abort.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/configure.png b/pics/mail/configure.png
deleted file mode 100644
index 9bbde25..0000000
--- a/pics/mail/configure.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/delete.png b/pics/mail/delete.png
deleted file mode 100644
index 3d3daf2..0000000
--- a/pics/mail/delete.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/deletemail.png b/pics/mail/deletemail.png
deleted file mode 100644
index 78a5f62..0000000
--- a/pics/mail/deletemail.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/editsettings.png b/pics/mail/editsettings.png
deleted file mode 100644
index 9bbde25..0000000
--- a/pics/mail/editsettings.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/find.png b/pics/mail/find.png
deleted file mode 100644
index 0dbfa0b..0000000
--- a/pics/mail/find.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/folder.png b/pics/mail/folder.png
deleted file mode 100644
index 0c980dc..0000000
--- a/pics/mail/folder.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/mailchecker.png b/pics/mail/mailchecker.png
deleted file mode 100644
index 7fb36b1..0000000
--- a/pics/mail/mailchecker.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/reload.png b/pics/mail/reload.png
deleted file mode 100644
index 3bfff11..0000000
--- a/pics/mail/reload.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/savemail.png b/pics/mail/savemail.png
deleted file mode 100644
index a44dd1f..0000000
--- a/pics/mail/savemail.png
+++ b/dev/null
Binary files differ
diff --git a/pics/mail/searchmails.png b/pics/mail/searchmails.png
deleted file mode 100644
index 21dc83e..0000000
--- a/pics/mail/searchmails.png
+++ b/dev/null
Binary files differ