fix of bug number 0001210

the libmail is now called libcoremail (fix inside the .pro files)
mail application got a appName for quicklauncher.

4 files changed, 4 insertions, 3 deletions

diff --git a/noncore/unsupported/mail2/bend/bend.pro b/noncore/unsupported/mail2/bend/bend.pro
index 61eea5f..ad96063 100644
--- a/noncore/unsupported/mail2/bend/bend.pro
+++ b/noncore/unsupported/mail2/bend/bend.pro
@@ -1,32 +1,32 @@
 TEMPLATE	=	lib
 CONFIG		+=	qt plugin warn_on release
 HEADERS		+=	bend.h \
 			bendimpl.h
 SOURCES		+=	bend.cpp \
 			bendimpl.cpp
 INCLUDEPATH	+=	$(OPIEDIR)/include ../libmail
-LIBS		+=	-lmail -lqpe
+LIBS		+=	-lcoremail -lqpe
 TARGET		=	bend
 DESTDIR		+=	$(OPIEDIR)/plugins/applets/
 
 TRANSLATIONS = ../../../i18n/de/libbend.ts \
 	 ../../../i18n/nl/libbend.ts \
 	 ../../../i18n/da/libbend.ts \
 	 ../../../i18n/xx/libbend.ts \
 	 ../../../i18n/en/libbend.ts \
 	 ../../../i18n/es/libbend.ts \
 	 ../../../i18n/fr/libbend.ts \
 	 ../../../i18n/hu/libbend.ts \
 	 ../../../i18n/ja/libbend.ts \
 	 ../../../i18n/ko/libbend.ts \
 	 ../../../i18n/no/libbend.ts \
 	 ../../../i18n/pl/libbend.ts \
 	 ../../../i18n/pt/libbend.ts \
 	 ../../../i18n/pt_BR/libbend.ts \
 	 ../../../i18n/sl/libbend.ts \
 	 ../../../i18n/zh_CN/libbend.ts \
 	 ../../../i18n/zh_TW/libbend.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/libmail/libmail.pro b/noncore/unsupported/mail2/libmail/libmail.pro
index 81ccdec..3bd6ab0 100644
--- a/noncore/unsupported/mail2/libmail/libmail.pro
+++ b/noncore/unsupported/mail2/libmail/libmail.pro
@@ -1,46 +1,46 @@
 TEMPLATE	=	lib
 CONFIG		+=	qt warn_on debug
 #CONFIG		+=	qt warn_on release
 HEADERS		=	configfile.h \
 			defines.h \
 			imapbase.h \
 			imaphandler.h \
 			imapresponse.h \
 			mailfactory.h \
 			md5.h \
 			miscfunctions.h \
 			smtphandler.h
 SOURCES		=	configfile.cpp \
 			imapbase.cpp \
 			imaphandler.cpp \
 			imapresponse.cpp \
 			mailfactory.cpp \
 			md5.cpp \
 			miscfunctions.cpp \
 			smtphandler.cpp
 INCLUDEPATH	+=	$(OPIEDIR)/include
 LIBS		+=	-L$(OPIEDIR)/lib -lqpe
-TARGET		=	mail
+TARGET		=	coremail
 DESTDIR      = $(OPIEDIR)/lib
 
 TRANSLATIONS = ../../../i18n/de/libmail.ts \
 	 ../../../i18n/nl/libmail.ts \
 	 ../../../i18n/da/libmail.ts \
 	 ../../../i18n/xx/libmail.ts \
 	 ../../../i18n/en/libmail.ts \
 	 ../../../i18n/es/libmail.ts \
 	 ../../../i18n/fr/libmail.ts \
 	 ../../../i18n/hu/libmail.ts \
 	 ../../../i18n/ja/libmail.ts \
 	 ../../../i18n/ko/libmail.ts \
 	 ../../../i18n/no/libmail.ts \
 	 ../../../i18n/pl/libmail.ts \
 	 ../../../i18n/pt/libmail.ts \
 	 ../../../i18n/pt_BR/libmail.ts \
 	 ../../../i18n/sl/libmail.ts \
 	 ../../../i18n/zh_CN/libmail.ts \
 	 ../../../i18n/zh_TW/libmail.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/mail.pro b/noncore/unsupported/mail2/mail.pro
index f521178..1fa087a 100644
--- a/noncore/unsupported/mail2/mail.pro
+++ b/noncore/unsupported/mail2/mail.pro
@@ -19,48 +19,48 @@ HEADERS		= 	accounteditor.h \
 SOURCES		= 	accounteditor.cpp \
 		  	addresspicker.cpp \
 		  	composer.cpp \
 		  	composerbase.cpp \
 		  	configdiag.cpp \
 		  	folderwidget.cpp \
 		  	listviewplus.cpp \
 			mailstatusbar.cpp \
 		  	mailtable.cpp \
 		  	main.cpp \
 		  	mainwindow.cpp \
 		  	mainwindowbase.cpp \
 		  	opendiag.cpp \
 		  	rename.cpp \
 		  	searchdiag.cpp \
 		  	viewmail.cpp \
 		  	viewmailbase.cpp
 INTERFACES	= 	accounteditorbase.ui \
 		  	addresspickerbase.ui \
 		  	configdiagbase.ui \
 		  	opendiagbase.ui \
 		  	renamebase.ui \
 		  	searchdiagbase.ui
 INCLUDEPATH    += 	$(OPIEDIR)/include libmail
-LIBS           += 	-lmail -lqpe -lopie
+LIBS           += 	-lcoremail -lqpe -lopie
 TARGET		= 	mail 
 
 TRANSLATIONS = ../../i18n/de/mail.ts \
 	 ../../i18n/nl/mail.ts \
 	 ../../i18n/da/mail.ts \
 	 ../../i18n/xx/mail.ts \
 	 ../../i18n/en/mail.ts \
 	 ../../i18n/es/mail.ts \
 	 ../../i18n/fr/mail.ts \
 	 ../../i18n/hu/mail.ts \
 	 ../../i18n/ja/mail.ts \
 	 ../../i18n/ko/mail.ts \
 	 ../../i18n/no/mail.ts \
 	 ../../i18n/pl/mail.ts \
 	 ../../i18n/pt/mail.ts \
 	 ../../i18n/pt_BR/mail.ts \
 	 ../../i18n/sl/mail.ts \
 	 ../../i18n/zh_CN/mail.ts \
 	 ../../i18n/zh_TW/mail.ts
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mail2/viewmail.h b/noncore/unsupported/mail2/viewmail.h
index efc2300..de36f7a 100644
--- a/noncore/unsupported/mail2/viewmail.h
+++ b/noncore/unsupported/mail2/viewmail.h
@@ -26,45 +26,46 @@ private:
 
 class AttachItem : public QListViewItem
 {
 public:
 	AttachItem(QListView *parent, AttachItemStore &attachment);
 	AttachItem(QListViewItem *parent, AttachItemStore &attachment);
 
 	AttachItemStore attachItemStore() { return _attachItemStore; }
 
 private:
 	AttachItemStore _attachItemStore;
 
 };
 
 class ViewMail : public ViewMailBase
 {
 	Q_OBJECT
 
 public:
 	ViewMail(IMAPResponseFETCH &mail, IMAPHandler *handler, QWidget *parent = 0, const char *name = 0, WFlags fl = Qt::WType_Modal);
 	~ViewMail();
 
 	void hide();
 	void exec();
+    static QString appName() { return QString::fromLatin1("mail"); }
 
 protected:
 //	void fillList(IMAPResponseBODYSTRUCTURE &structure);
 	QString deHtml(const QString &string);
 
 protected slots:
 	void slotReply();
 	void slotForward();
 
 	void slotIMAPUid(IMAPResponse &response);
 
 private:
 	bool _inLoop;
 	IMAPResponseFETCH _mail;
 	IMAPHandler *_handler;
 	QString _mailHtml;
 	bool _gotBody;
 
 };
 
 #endif