Fixed QCOP call problem of kopiemail

4 files changed, 49 insertions, 30 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d1d385c..74e5cf7 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2061,9 +2061,9 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
         if (  !adrr.isEmpty() ) {
             foundUid = uid;
         }
             if ( email == "sendbacklist" ) {
-                qDebug("ssssssssssssssssssssssend ");
+                //qDebug("ssssssssssssssssssssssend ");
                 QStringList nameList;
                 QStringList emailList;
                 QStringList uidList;
                 nameList.append(adrr.realName());
@@ -2074,9 +2074,9 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses
             }
         
     }
   
-  if ( email == "sendback" ) 
+  if ( email == "sendbacklist" ) 
       return;
   if (foundUid.isEmpty())
   {
     //find the uid of the person first
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 01dd406..9efa932 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -40,24 +40,27 @@
 //using namespace Opie::Ui;
 ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )
     : ComposeMailUI( parent, name, modal )
 {
-   
+  
     mPickLineEdit = 0;
     connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
           this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
     settings = s;
     m_replyid = ""; 
     KConfig config( locateLocal("config", "kabcrc") );
     config.setGroup( "General" );
     QString whoami_uid =  config.readEntry( "WhoAmI" );
+
     if ( whoami_uid.isEmpty() ) {
         QMessageBox::information( 0, tr( "Hint" ),
                                   tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
                                   tr( "Ok" ) );
         
     } else
-        bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid);
+         ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid);
+
+ 
 #ifdef DESKTOP_VERSION
     KABC::Addressee con =  KABC::StdAddressBook::self()->whoAmI( );
     QStringList mails = con.emails();
     QString defmail = con.preferredEmail();
@@ -81,9 +84,8 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m
     checkBoxLater->setChecked( cfg.readBoolEntry( "sendLater", false ) );
 
     attList->addColumn( tr( "Name" ) );
     attList->addColumn( tr( "Size" ) );
-
     QList<Account> accounts = settings->getAccounts();
 
     Account *it;
     for ( it = accounts.first(); it; it = accounts.next() ) {
@@ -196,13 +198,12 @@ void ComposeMail::pickAddress( )
 }
 //the map includes name/email pairs, that comes from Ka/Pi
 void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList)
 {
-    qDebug("ComposeMail::insertAttendees ");
+    //qDebug("ComposeMail::insertAttendees ");
     raise();
 
     if ( mPickLineEdit == 0 ) { //whoami received
-        qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn ");
         QString defmail = uidList[0];
         if (  emailList.count() == 0 )
             QMessageBox::information( 0, tr( "Hint" ),
                                       tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 0c581c0..b2119e6 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -10,8 +10,9 @@
 #include "selectstore.h"
 #include "selectsmtp.h"
 
 #include <qmessagebox.h>
+#include <qtimer.h>
 #include <libkdepim/externalapphandler.h>
 
 #include <qpe/qpeapplication.h>
 #include <libmailwrapper/smtpwrapper.h>
@@ -47,48 +48,55 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     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() ) ); 
     }
     else if (msg == "newMail()")
     {
-        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();
     }
     else if (msg == "newMail(QString)")
     {
+        //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
-         ExternalAppHandler::instance()->appMessage ( msg, 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);
+    }
+
+    //qDebug("END OpieMail::message ");
 }
 void OpieMail::slotwriteMail2(const QString& namemail )
 {
-    // qDebug("OpieMail::slotwriteMail2 ");
-    qApp->processEvents();
+    //qDebug("OpieMail::slotwriteMail2 ");
+    //qApp->processEvents();
      ComposeMail compose( settings, this, 0, true );
     if ( !namemail.isEmpty() ) {
         QString to = namemail;
         if ( namemail.find( " <") > 1 ) {
@@ -127,13 +135,21 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
     }
     compose.slotAdjustColumns();
     compose.showMaximized();
     compose.exec();
+    raise();
 }
 
 void OpieMail::slotComposeMail()
 {
-    slotwriteMail2( QString () );
+    if ( mPendingEmail == QString::null && mPendingName == QString::null)
+        slotwriteMail2( QString () );
+    else {
+        if ( mPendingEmail == QString::null )
+            slotwriteMail2( mPendingName );
+        else
+            slotwriteMail( mPendingName, mPendingEmail );   
+    }
     //slotwriteMail(0l,0l);
 }
 
 void OpieMail::slotSendQueued()
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 7434e59..1de5f6b 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -40,8 +40,10 @@ protected slots:
     virtual void reEditMail();
     void clearSelection();
 
 private:
+    QString mPendingEmail;
+    QString mPendingName;
     Settings *settings;
 
 };