-rw-r--r-- | kaddressbook/kabcore.cpp | 4 | ||||
-rw-r--r-- | kmicromail/composemail.cpp | 9 | ||||
-rw-r--r-- | kmicromail/opiemail.cpp | 56 | ||||
-rw-r--r-- | kmicromail/opiemail.h | 2 |
4 files changed, 45 insertions, 26 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index d1d385c..74e5cf7 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -2064,3 +2064,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2064 | if ( email == "sendbacklist" ) { | 2064 | if ( email == "sendbacklist" ) { |
2065 | qDebug("ssssssssssssssssssssssend "); | 2065 | //qDebug("ssssssssssssssssssssssend "); |
2066 | QStringList nameList; | 2066 | QStringList nameList; |
@@ -2077,3 +2077,3 @@ void KABCore::requestForDetails(const QString& sourceChannel, const QString& ses | |||
2077 | 2077 | ||
2078 | if ( email == "sendback" ) | 2078 | if ( email == "sendbacklist" ) |
2079 | return; | 2079 | return; |
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index 01dd406..9efa932 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp | |||
@@ -52,2 +52,3 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
52 | QString whoami_uid = config.readEntry( "WhoAmI" ); | 52 | QString whoami_uid = config.readEntry( "WhoAmI" ); |
53 | |||
53 | if ( whoami_uid.isEmpty() ) { | 54 | if ( whoami_uid.isEmpty() ) { |
@@ -58,3 +59,5 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
58 | } else | 59 | } else |
59 | bool res = ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); | 60 | ExternalAppHandler::instance()->requestDetailsFromKAPI("", "sendbacklist", whoami_uid); |
61 | |||
62 | |||
60 | #ifdef DESKTOP_VERSION | 63 | #ifdef DESKTOP_VERSION |
@@ -84,3 +87,2 @@ ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool m | |||
84 | attList->addColumn( tr( "Size" ) ); | 87 | attList->addColumn( tr( "Size" ) ); |
85 | |||
86 | QList<Account> accounts = settings->getAccounts(); | 88 | QList<Account> accounts = settings->getAccounts(); |
@@ -199,3 +201,3 @@ void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis | |||
199 | { | 201 | { |
200 | qDebug("ComposeMail::insertAttendees "); | 202 | //qDebug("ComposeMail::insertAttendees "); |
201 | raise(); | 203 | raise(); |
@@ -203,3 +205,2 @@ void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis | |||
203 | if ( mPickLineEdit == 0 ) { //whoami received | 205 | if ( mPickLineEdit == 0 ) { //whoami received |
204 | qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn "); | ||
205 | QString defmail = uidList[0]; | 206 | QString defmail = uidList[0]; |
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 @@ | |||
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | #include <qtimer.h> | ||
14 | #include <libkdepim/externalapphandler.h> | 15 | #include <libkdepim/externalapphandler.h> |
@@ -50,20 +51,17 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
50 | static int ii = 0; | 51 | static int ii = 0; |
51 | qDebug("call ############################# %d ", ii); | 52 | //qDebug("QCOP CALL ############################# %d ", ii); |
52 | // block second call | 53 | //QString mess ( msg ); |
53 | if ( ii < 2 ) { | 54 | //qDebug("Message = %s ",mess.latin1()); |
54 | //++ii; | ||
55 | if ( ii > 1 ) { | ||
56 | qDebug("qcop call blocked "); | ||
57 | //return; | ||
58 | } | ||
59 | } | ||
60 | ++ii; | 55 | ++ii; |
61 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 56 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
57 | |||
58 | mPendingEmail = QString::null; | ||
59 | mPendingName = QString::null; | ||
62 | if (msg == "writeMail(QString,QString)") | 60 | if (msg == "writeMail(QString,QString)") |
63 | { | 61 | { |
62 | //qDebug("writeMail(QString,QString) "); | ||
64 | QDataStream stream(data,IO_ReadOnly); | 63 | QDataStream stream(data,IO_ReadOnly); |
65 | QString name, email; | 64 | stream >> mPendingName >> mPendingEmail; |
66 | stream >> name >> email; | ||
67 | // removing the whitespaces at beginning and end is needed! | 65 | // removing the whitespaces at beginning and end is needed! |
68 | slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace()); | 66 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
69 | } | 67 | } |
@@ -71,3 +69,8 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
71 | { | 69 | { |
72 | slotComposeMail(); | 70 | //qDebug("slotComposeMail() "); |
71 | // we cannot call slotComposeMail(); directly, because may be executing a QCOP call | ||
72 | // and a QCOP call does not like a processevents in his execution | ||
73 | // with the Qtimer we call slotComposeMail() after we reached the main event loop | ||
74 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); | ||
75 | // slotComposeMail(); | ||
73 | } | 76 | } |
@@ -75,13 +78,18 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
75 | { | 78 | { |
79 | //qDebug(" newMail(QString)"); | ||
76 | QDataStream stream(data,IO_ReadOnly); | 80 | QDataStream stream(data,IO_ReadOnly); |
77 | QString nameemail; | 81 | stream >> mPendingName; |
78 | stream >> nameemail; | ||
79 | // the format is | 82 | // the format is |
80 | // NAME <EMAIL>:SUBJECT | 83 | // NAME <EMAIL>:SUBJECT |
81 | //qDebug("message %s ", nameemail.latin1()); | 84 | QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); |
82 | 85 | } else { | |
83 | slotwriteMail2( nameemail ); | 86 | if ( ii == 1 ) { |
84 | } else | 87 | qDebug("Kopiemail::Error:: Initial QCOP call for ExternalAppHandler not supported "); |
88 | return; | ||
89 | } | ||
85 | ExternalAppHandler::instance()->appMessage ( msg, data); | 90 | ExternalAppHandler::instance()->appMessage ( msg, data); |
86 | } | 91 | } |
92 | |||
93 | //qDebug("END OpieMail::message "); | ||
94 | } | ||
87 | void OpieMail::slotwriteMail2(const QString& namemail ) | 95 | void OpieMail::slotwriteMail2(const QString& namemail ) |
@@ -89,3 +97,3 @@ void OpieMail::slotwriteMail2(const QString& namemail ) | |||
89 | // qDebug("OpieMail::slotwriteMail2 "); | 97 | // qDebug("OpieMail::slotwriteMail2 "); |
90 | qApp->processEvents(); | 98 | //qApp->processEvents(); |
91 | ComposeMail compose( settings, this, 0, true ); | 99 | ComposeMail compose( settings, this, 0, true ); |
@@ -130,2 +138,3 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email) | |||
130 | compose.exec(); | 138 | compose.exec(); |
139 | raise(); | ||
131 | } | 140 | } |
@@ -134,3 +143,10 @@ void OpieMail::slotComposeMail() | |||
134 | { | 143 | { |
144 | if ( mPendingEmail == QString::null && mPendingName == QString::null) | ||
135 | slotwriteMail2( QString () ); | 145 | slotwriteMail2( QString () ); |
146 | else { | ||
147 | if ( mPendingEmail == QString::null ) | ||
148 | slotwriteMail2( mPendingName ); | ||
149 | else | ||
150 | slotwriteMail( mPendingName, mPendingEmail ); | ||
151 | } | ||
136 | //slotwriteMail(0l,0l); | 152 | //slotwriteMail(0l,0l); |
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h index 7434e59..1de5f6b 100644 --- a/kmicromail/opiemail.h +++ b/kmicromail/opiemail.h | |||
@@ -43,2 +43,4 @@ protected slots: | |||
43 | private: | 43 | private: |
44 | QString mPendingEmail; | ||
45 | QString mPendingName; | ||
44 | Settings *settings; | 46 | Settings *settings; |