pics/mail is the picture folder for the new mailer

3 files changed, 18 insertions, 18 deletions

diff --git a/noncore/net/mail/defines.h b/noncore/net/mail/defines.h
index c849f1a..9036658 100644
--- a/noncore/net/mail/defines.h
+++ b/noncore/net/mail/defines.h
@@ -3,18 +3,18 @@
 
 #include <qpe/resource.h>
 
-#define USER_AGENT          "OpieMail v0.0.1-alpha"
+#define USER_AGENT          "OpieMail v0.1"
 
-#define PIC_COMPOSEMAIL     "opiemail/composemail"
-#define PIC_SENDQUEUED      "opiemail/sendqueued"
-#define PIC_SHOWFOLDERS     "opiemail/showfolders"
-#define PIC_SEARCHMAILS     "opiemail/searchmails"
-#define PIC_EDITSETTINGS    "opiemail/editsettings"
-#define PIC_EDITACCOUNTS    "opiemail/editaccounts"
-#define PIC_SYNC            "opiemail/sync"
-#define PIC_IMAPFOLDER      "opiemail/imapfolder"
-#define PIC_POP3FOLDER      "opiemail/pop3folder"
-#define PIC_INBOXFOLDER     "opiemail/inbox"
+#define PIC_COMPOSEMAIL     "mail/composemail"
+#define PIC_SENDQUEUED      "mail/sendqueued"
+#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"
+#define PIC_IMAPFOLDER      "mail/imapfolder"
+#define PIC_POP3FOLDER      "mail/pop3folder"
+#define PIC_INBOXFOLDER     "mail/inbox"
 
 #define ICON_COMPOSEMAIL    QIconSet( Resource::loadPixmap( PIC_COMPOSEMAIL ) ) 
 #define ICON_SENDQUEUED     QIconSet( Resource::loadPixmap( PIC_SENDQUEUED ) ) 
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 8e2132e..89530ab 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -176,7 +176,7 @@ void MainWindow::displayMail(QListViewItem*item)
     if (  readMail.deleted ) {
          folderView->refreshCurrent();
     } else {
-        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+        ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
     }
 }
 
@@ -200,11 +200,11 @@ MailListViewItem::MailListViewItem(QListView * parent, MailListViewItem * item )
 void MailListViewItem::showEntry()
 {
     if ( mail_data.getFlags().testBit( FLAG_ANSWERED ) == true) {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgreplied") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgreplied") );
     } else if ( mail_data.getFlags().testBit( FLAG_SEEN ) == true )  {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgunseen") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgunseen") );
     } else  {
-        setPixmap( 0, Resource::loadPixmap( "opiemail/kmmsgnew") );
+        setPixmap( 0, Resource::loadPixmap( "mail/kmmsgnew") );
     }
     setText(1,mail_data.getSubject());
     setText(2,mail_data.getFrom());
diff --git a/noncore/net/mail/opie-mail.control b/noncore/net/mail/opie-mail.control
index 2ea860e..c1a4312 100644
--- a/noncore/net/mail/opie-mail.control
+++ b/noncore/net/mail/opie-mail.control
@@ -1,10 +1,10 @@
 Package: opie-mail
-Files: bin/opiemail apps/1Pim/mail.desktop pics/opiemail/*.png plugins/application/libopiemail.so*
+Files: bin/opiemail apps/1Pim/mail.desktop pics/mail/*.png plugins/application/libopiemail.so*
 Priority: optional
 Section: opie/applications
-Maintainer: Juergen Graf <jgf@handhelds.org>
+Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org>
 Architecture: arm
-Version: 0.0.1-$SUB_VERSION
+Version: 0.1-$SUB_VERSION
 Depends: task-opie-minimal, libopie1
 Description: Opie's mail and news client (POP3, IMAP and NNTP)
 License: LGPL