| -rw-r--r-- | kmicromail/opiemail.cpp | 56 |
1 files changed, 36 insertions, 20 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 0c581c0..b2119e6 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -13,2 +13,3 @@ #include <qmessagebox.h> +#include <qtimer.h> #include <libkdepim/externalapphandler.h> @@ -50,20 +51,17 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) static int ii = 0; - qDebug("call ############################# %d ", ii); - // block second call - if ( ii < 2 ) { - //++ii; - if ( ii > 1 ) { - qDebug("qcop call blocked "); - //return; - } - } + //qDebug("QCOP CALL ############################# %d ", ii); + //QString mess ( msg ); + //qDebug("Message = %s ",mess.latin1()); ++ii; //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); + + mPendingEmail = QString::null; + mPendingName = QString::null; if (msg == "writeMail(QString,QString)") { + //qDebug("writeMail(QString,QString) "); QDataStream stream(data,IO_ReadOnly); - QString name, email; - stream >> name >> email; + stream >> mPendingName >> mPendingEmail; // removing the whitespaces at beginning and end is needed! - slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); + QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); } @@ -71,3 +69,8 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) { - slotComposeMail(); + //qDebug("slotComposeMail() "); + // we cannot call slotComposeMail(); directly, because may be executing a QCOP call + // and a QCOP call does not like a processevents in his execution + // with the Qtimer we call slotComposeMail() after we reached the main event loop + QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); + // slotComposeMail(); } @@ -75,13 +78,18 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) { + //qDebug(" newMail(QString)"); QDataStream stream(data,IO_ReadOnly); - QString nameemail; - stream >> nameemail; + stream >> mPendingName; // the format is // NAME <EMAIL>:SUBJECT - //qDebug("message %s ", nameemail.latin1()); - - slotwriteMail2( nameemail ); - } else + 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); } + + //qDebug("END OpieMail::message "); +} void OpieMail::slotwriteMail2(const QString& namemail ) @@ -89,3 +97,3 @@ void OpieMail::slotwriteMail2(const QString& namemail ) // qDebug("OpieMail::slotwriteMail2 "); - qApp->processEvents(); + //qApp->processEvents(); ComposeMail compose( settings, this, 0, true ); @@ -130,2 +138,3 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) compose.exec(); + raise(); } @@ -134,3 +143,10 @@ void OpieMail::slotComposeMail() { + if ( mPendingEmail == QString::null && mPendingName == QString::null) slotwriteMail2( QString () ); + else { + if ( mPendingEmail == QString::null ) + slotwriteMail2( mPendingName ); + else + slotwriteMail( mPendingName, mPendingEmail ); + } //slotwriteMail(0l,0l); |