-rw-r--r-- | kmicromail/opiemail.cpp | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 19ffdb3..4e7c6be 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -11,4 +11,5 @@ | |||
11 | #include "selectsmtp.h" | 11 | #include "selectsmtp.h" |
12 | #include "accountitem.h" | 12 | #include "accountitem.h" |
13 | #include "koprefsdialog.h" | ||
13 | 14 | ||
14 | #include <qmessagebox.h> | 15 | #include <qmessagebox.h> |
@@ -85,13 +86,15 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
85 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | 86 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
86 | } else { | 87 | } else { |
87 | if ( ii == 1 ) { | 88 | mPendingData = data; |
88 | qDebug("Kopiemail::Error:: Initial QCOP call for ExternalAppHandler not supported "); | 89 | mPendingMessage = msg; |
89 | return; | 90 | QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); |
90 | } | ||
91 | ExternalAppHandler::instance()->appMessage ( msg, data); | ||
92 | } | 91 | } |
93 | 92 | ||
94 | //qDebug("END OpieMail::message "); | 93 | //qDebug("END OpieMail::message "); |
95 | } | 94 | } |
95 | void OpieMail::slotExtAppHandler() | ||
96 | { | ||
97 | ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); | ||
98 | } | ||
96 | void OpieMail::slotwriteMail2(const QString& namemail ) | 99 | void OpieMail::slotwriteMail2(const QString& namemail ) |
97 | { | 100 | { |
@@ -208,12 +211,17 @@ void OpieMail::slotSearchMails() | |||
208 | void OpieMail::slotEditSettings() | 211 | void OpieMail::slotEditSettings() |
209 | { | 212 | { |
213 | #if 0 | ||
210 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); | 214 | SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); |
211 | settingsDialog.showMaximized(); | 215 | settingsDialog.showMaximized(); |
212 | settingsDialog.exec(); | 216 | settingsDialog.exec(); |
217 | #endif | ||
218 | KOPrefsDialog settingsDialog( this, "koprefs", true ); | ||
219 | settingsDialog.showMaximized(); | ||
220 | settingsDialog.exec(); | ||
213 | } | 221 | } |
214 | 222 | ||
215 | void OpieMail::slotEditAccounts() | 223 | void OpieMail::slotEditAccounts() |
216 | { | 224 | { |
217 | EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); | 225 | EditAccounts eaDialog( settings, this, 0, true ); |
218 | eaDialog.slotAdjustColumns(); | 226 | eaDialog.slotAdjustColumns(); |
219 | eaDialog.showMaximized(); | 227 | eaDialog.showMaximized(); |
@@ -231,5 +239,5 @@ void OpieMail::displayMail() | |||
231 | RecMailP mail = ((MailListViewItem*)item)->data(); | 239 | RecMailP mail = ((MailListViewItem*)item)->data(); |
232 | RecBodyP body = folderView->fetchBody(mail); | 240 | RecBodyP body = folderView->fetchBody(mail); |
233 | ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); | 241 | ViewMail readMail( this,"", Qt::WType_Modal ); |
234 | readMail.setBody( body ); | 242 | readMail.setBody( body ); |
235 | readMail.setMail( mail ); | 243 | readMail.setMail( mail ); |