| -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 @@ #include "selectsmtp.h" #include "accountitem.h" +#include "koprefsdialog.h" #include <qmessagebox.h> @@ -85,13 +86,15 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); } else { - if ( ii == 1 ) { - qDebug("Kopiemail::Error:: Initial QCOP call for ExternalAppHandler not supported "); - return; - } - ExternalAppHandler::instance()->appMessage ( msg, data); + mPendingData = data; + mPendingMessage = msg; + QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); } //qDebug("END OpieMail::message "); } +void OpieMail::slotExtAppHandler() +{ + ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData ); +} void OpieMail::slotwriteMail2(const QString& namemail ) { @@ -208,12 +211,17 @@ void OpieMail::slotSearchMails() void OpieMail::slotEditSettings() { +#if 0 SettingsDialog settingsDialog( this, 0, true, WStyle_ContextHelp ); settingsDialog.showMaximized(); settingsDialog.exec(); +#endif + KOPrefsDialog settingsDialog( this, "koprefs", true ); + settingsDialog.showMaximized(); + settingsDialog.exec(); } void OpieMail::slotEditAccounts() { - EditAccounts eaDialog( settings, this, 0, true, WStyle_ContextHelp ); + EditAccounts eaDialog( settings, this, 0, true ); eaDialog.slotAdjustColumns(); eaDialog.showMaximized(); @@ -231,5 +239,5 @@ void OpieMail::displayMail() RecMailP mail = ((MailListViewItem*)item)->data(); RecBodyP body = folderView->fetchBody(mail); - ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp ); + ViewMail readMail( this,"", Qt::WType_Modal ); readMail.setBody( body ); readMail.setMail( mail ); |