-rw-r--r-- | noncore/net/mail/opiemail.cpp | 14 | ||||
-rw-r--r-- | noncore/net/mail/opiemail.h | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp index 5399c3c..2f87e44 100644 --- a/noncore/net/mail/opiemail.cpp +++ b/noncore/net/mail/opiemail.cpp | |||
@@ -1,59 +1,73 @@ | |||
1 | 1 | ||
2 | #include "settingsdialog.h" | 2 | #include "settingsdialog.h" |
3 | #include "opiemail.h" | 3 | #include "opiemail.h" |
4 | #include "editaccounts.h" | 4 | #include "editaccounts.h" |
5 | #include "composemail.h" | 5 | #include "composemail.h" |
6 | #include "mailistviewitem.h" | 6 | #include "mailistviewitem.h" |
7 | #include "viewmail.h" | 7 | #include "viewmail.h" |
8 | #include "selectstore.h" | 8 | #include "selectstore.h" |
9 | #include "selectsmtp.h" | 9 | #include "selectsmtp.h" |
10 | 10 | ||
11 | #include <libmailwrapper/smtpwrapper.h> | 11 | #include <libmailwrapper/smtpwrapper.h> |
12 | #include <libmailwrapper/mailtypes.h> | 12 | #include <libmailwrapper/mailtypes.h> |
13 | #include <libmailwrapper/abstractmail.h> | 13 | #include <libmailwrapper/abstractmail.h> |
14 | /* OPIE */ | 14 | /* OPIE */ |
15 | #include <opie2/odebug.h> | 15 | #include <opie2/odebug.h> |
16 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
17 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
18 | 18 | ||
19 | /* QT */ | 19 | /* QT */ |
20 | 20 | ||
21 | /* UNIX */ | ||
22 | #include <signal.h> | ||
23 | |||
21 | using namespace Opie::Core; | 24 | using namespace Opie::Core; |
22 | 25 | ||
23 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) | 26 | OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags ) |
24 | : MainWindow( parent, name, WStyle_ContextHelp ) | 27 | : MainWindow( parent, name, WStyle_ContextHelp ) |
25 | { | 28 | { |
29 | setup_signalblocking(); | ||
26 | settings = new Settings(); | 30 | settings = new Settings(); |
27 | 31 | ||
28 | folderView->populate( settings->getAccounts() ); | 32 | folderView->populate( settings->getAccounts() ); |
29 | } | 33 | } |
30 | 34 | ||
31 | OpieMail::~OpieMail() | 35 | OpieMail::~OpieMail() |
32 | { | 36 | { |
33 | if (settings) delete settings; | 37 | if (settings) delete settings; |
34 | } | 38 | } |
35 | 39 | ||
40 | void OpieMail::setup_signalblocking() | ||
41 | { | ||
42 | /* for networking we must block SIGPIPE and Co. */ | ||
43 | struct sigaction blocking_action,temp_action; | ||
44 | blocking_action.sa_handler = SIG_IGN; | ||
45 | sigemptyset(&(blocking_action.sa_mask)); | ||
46 | blocking_action.sa_flags = 0; | ||
47 | sigaction(SIGPIPE,&blocking_action,&temp_action); | ||
48 | } | ||
49 | |||
36 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | 50 | void OpieMail::appMessage(const QCString &msg, const QByteArray &data) |
37 | { | 51 | { |
38 | // copied from old mail2 | 52 | // copied from old mail2 |
39 | if (msg == "writeMail(QString,QString)") | 53 | if (msg == "writeMail(QString,QString)") |
40 | { | 54 | { |
41 | QDataStream stream(data,IO_ReadOnly); | 55 | QDataStream stream(data,IO_ReadOnly); |
42 | QString name, email; | 56 | QString name, email; |
43 | stream >> name >> email; | 57 | stream >> name >> email; |
44 | // removing the whitespaces at beginning and end is needed! | 58 | // removing the whitespaces at beginning and end is needed! |
45 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 59 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); |
46 | } | 60 | } |
47 | else if (msg == "newMail()") | 61 | else if (msg == "newMail()") |
48 | { | 62 | { |
49 | slotComposeMail(); | 63 | slotComposeMail(); |
50 | } | 64 | } |
51 | } | 65 | } |
52 | 66 | ||
53 | void OpieMail::slotwriteMail(const QString&name,const QString&email) | 67 | void OpieMail::slotwriteMail(const QString&name,const QString&email) |
54 | { | 68 | { |
55 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); | 69 | ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp ); |
56 | if (!email.isEmpty()) | 70 | if (!email.isEmpty()) |
57 | { | 71 | { |
58 | if (!name.isEmpty()) | 72 | if (!name.isEmpty()) |
59 | { | 73 | { |
diff --git a/noncore/net/mail/opiemail.h b/noncore/net/mail/opiemail.h index b93bd60..3d25b3d 100644 --- a/noncore/net/mail/opiemail.h +++ b/noncore/net/mail/opiemail.h | |||
@@ -13,30 +13,33 @@ class OpieMail : public MainWindow | |||
13 | 13 | ||
14 | public: | 14 | public: |
15 | OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 15 | OpieMail( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
16 | virtual ~OpieMail(); | 16 | virtual ~OpieMail(); |
17 | static QString appName() { return QString::fromLatin1("opiemail"); } | 17 | static QString appName() { return QString::fromLatin1("opiemail"); } |
18 | 18 | ||
19 | public slots: | 19 | public slots: |
20 | virtual void slotwriteMail(const QString&name,const QString&email); | 20 | virtual void slotwriteMail(const QString&name,const QString&email); |
21 | virtual void slotComposeMail(); | 21 | virtual void slotComposeMail(); |
22 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 22 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
23 | protected slots: | 23 | protected slots: |
24 | virtual void slotSendQueued(); | 24 | virtual void slotSendQueued(); |
25 | virtual void slotSearchMails(); | 25 | virtual void slotSearchMails(); |
26 | virtual void slotEditSettings(); | 26 | virtual void slotEditSettings(); |
27 | virtual void slotEditAccounts(); | 27 | virtual void slotEditAccounts(); |
28 | virtual void displayMail(); | 28 | virtual void displayMail(); |
29 | virtual void slotDeleteMail(); | 29 | virtual void slotDeleteMail(); |
30 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 30 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
31 | virtual void slotShowFolders( bool show ); | 31 | virtual void slotShowFolders( bool show ); |
32 | virtual void refreshMailView(const QValueList<RecMailP>&); | 32 | virtual void refreshMailView(const QValueList<RecMailP>&); |
33 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); | 33 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); |
34 | virtual void slotMoveCopyMail(); | 34 | virtual void slotMoveCopyMail(); |
35 | virtual void reEditMail(); | 35 | virtual void reEditMail(); |
36 | 36 | ||
37 | protected: | ||
38 | void setup_signalblocking(); | ||
39 | |||
37 | private: | 40 | private: |
38 | Settings *settings; | 41 | Settings *settings; |
39 | 42 | ||
40 | }; | 43 | }; |
41 | 44 | ||
42 | #endif | 45 | #endif |