3 files changed, 48 insertions, 4 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index ed8a2ee..3231b45 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -57,4 +57,5 @@ ComposeMail::ComposeMail( Settings *sett, QWidget *parent, const char *name, boo
     mEncoding = KOPrefs::instance()->mCurrentCodeName;
-    connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
-          this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
+    //managed from opiemail now
+    //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 = sett;
@@ -262,2 +263,9 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
 
+    QString UID = uid;
+    if ( uid.left( 18 ) == (this->name() +QString("pick2")) ) {
+        mPickLineEdit = toLine;
+        UID = this->name();
+        subjectLine->setText( uid.mid( 18 ) );
+    }
+    //qDebug("ccc %s %s ", uid.latin1(), this->name());
     if ( mPickLineEdit == 0 ) { //whoami received
@@ -283,3 +291,3 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
     QLineEdit *line = mPickLineEdit;
-    if (uid == this->name())
+    if (UID == this->name())
         {
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index f56711d..e159b73 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -48,2 +48,3 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
 {
+    mCurrentComposer = 0;
     settings = new Settings();
@@ -52,3 +53,4 @@ OpieMail::OpieMail( QWidget *parent, const char *name )
     folderView->populate( settings->getAccounts() );
-  
+   connect(ExternalAppHandler::instance(), SIGNAL(receivedNameEmailUidListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)),
+       this, SLOT(insertAttendees(const QString&, const QStringList&, const QStringList&, const QStringList&)));
 }
@@ -140,3 +142,5 @@ void OpieMail::slotwriteMail2(const QString& namemail )
 #endif
+    mCurrentComposer = &compose;
     compose.exec();
+    mCurrentComposer = 0;
     raise();
@@ -163,3 +167,6 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
 #endif
+
+    mCurrentComposer = &compose;
     compose.exec();
+    mCurrentComposer = 0;
     raise();
@@ -302,2 +309,4 @@ void OpieMail::replyMail()
     composer.setCharset( body->getCharset() );
+
+    mCurrentComposer = &composer;
     if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
@@ -306,2 +315,3 @@ void OpieMail::replyMail()
     }
+    mCurrentComposer = 0;
     delete settings;
@@ -639,3 +649,24 @@ void OpieMail::reEditMail()
 #endif
+    mCurrentComposer = &compose;
+    compose.exec();
+    mCurrentComposer = 0;
+}
+
+void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList)
+{
+    
+    if ( mCurrentComposer ) {
+        mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList);
+    } else {
+        ComposeMail compose( settings, this, 0, true );
+        compose.slotAdjustColumns();
+#ifndef DESKTOP_VERSION
+        compose.showMaximized();
+#endif
+        mCurrentComposer = &compose;
+        mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList);
     compose.exec();
+        mCurrentComposer = 0;
+        raise();
+    }
 }
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index b8a527f..4f75b3f 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -10,2 +10,5 @@
 #include <viewmail.h>
+#include <qstringlist.h>
+
+class ComposeMail;
 
@@ -27,2 +30,3 @@ public slots:
     virtual void message(const QCString &msg, const QByteArray &data);
+    void insertAttendees(const QString&, const QStringList& namelist, const QStringList& emaillist, const QStringList& uidlist);
 protected slots:
@@ -50,2 +54,3 @@ protected slots:
 private:
+    ComposeMail* mCurrentComposer; 
     void closeViewMail(ViewMail * vm);