Mail config added

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
@@ -12,2 +12,3 @@
 #include "accountitem.h"
+#include "koprefsdialog.h"
 
@@ -86,7 +87,5 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
     } 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() ) ); 
     }
@@ -95,2 +94,6 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
 }
+void OpieMail::slotExtAppHandler()
+{
+    ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData );
+}
 void OpieMail::slotwriteMail2(const QString& namemail )
@@ -209,2 +212,3 @@ void OpieMail::slotEditSettings()
 {
+#if 0
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
@@ -212,2 +216,6 @@ void OpieMail::slotEditSettings()
     settingsDialog.exec();
+#endif
+    KOPrefsDialog settingsDialog( this,  "koprefs", true );
+    settingsDialog.showMaximized();
+    settingsDialog.exec();
 }
@@ -216,3 +224,3 @@ void OpieMail::slotEditAccounts()
 {
-    EditAccounts eaDialog( settings, this, 0, true,  WStyle_ContextHelp );
+    EditAccounts eaDialog( settings, this, 0, true );
     eaDialog.slotAdjustColumns();
@@ -232,3 +240,3 @@ void OpieMail::displayMail()
     RecBodyP body = folderView->fetchBody(mail);
-    ViewMail readMail( this,"", Qt::WType_Modal | WStyle_ContextHelp  );
+    ViewMail readMail( this,"", Qt::WType_Modal   );
     readMail.setBody( body );