author | zautrix <zautrix> | 2004-09-08 02:02:15 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-09-08 02:02:15 (UTC) |
commit | e5f6ea343bc2b129f81fde3734b100cfa2ed6c83 (patch) (unidiff) | |
tree | 8d33b16e52b1d886cf524052418e8dd445689a66 /kmicromail/opiemail.cpp | |
parent | 199025628054eef739a261437a51a98f5218ab0f (diff) | |
download | kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.zip kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.tar.gz kdepimpi-e5f6ea343bc2b129f81fde3734b100cfa2ed6c83.tar.bz2 |
Some fixes
-rw-r--r-- | kmicromail/opiemail.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3e560c5..a1c5645 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -8,12 +8,13 @@ | |||
8 | #include "mailistviewitem.h" | 8 | #include "mailistviewitem.h" |
9 | #include "viewmail.h" | 9 | #include "viewmail.h" |
10 | #include "selectstore.h" | 10 | #include "selectstore.h" |
11 | #include "selectsmtp.h" | 11 | #include "selectsmtp.h" |
12 | 12 | ||
13 | #include <qmessagebox.h> | 13 | #include <qmessagebox.h> |
14 | #include <libkdepim/externalapphandler.h> | ||
14 | 15 | ||
15 | #include <qpe/qpeapplication.h> | 16 | #include <qpe/qpeapplication.h> |
16 | #include <libmailwrapper/smtpwrapper.h> | 17 | #include <libmailwrapper/smtpwrapper.h> |
17 | #include <libmailwrapper/mailtypes.h> | 18 | #include <libmailwrapper/mailtypes.h> |
18 | #include <libmailwrapper/abstractmail.h> | 19 | #include <libmailwrapper/abstractmail.h> |
19 | /* OPIE */ | 20 | /* OPIE */ |
@@ -44,21 +45,22 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data) | |||
44 | } | 45 | } |
45 | #include <stdlib.h> | 46 | #include <stdlib.h> |
46 | void OpieMail::message(const QCString &msg, const QByteArray &data) | 47 | void OpieMail::message(const QCString &msg, const QByteArray &data) |
47 | { | 48 | { |
48 | // copied from old mail2 | 49 | // copied from old mail2 |
49 | static int ii = 0; | 50 | static int ii = 0; |
50 | 51 | qDebug("call ############################# %d ", ii); | |
51 | // block second call | 52 | // block second call |
52 | if ( ii < 2 ) { | 53 | if ( ii < 2 ) { |
53 | ++ii; | 54 | //++ii; |
54 | if ( ii > 1 ) { | 55 | if ( ii > 1 ) { |
55 | qDebug("qcop call blocked "); | 56 | qDebug("qcop call blocked "); |
56 | return; | 57 | //return; |
57 | } | 58 | } |
58 | } | 59 | } |
60 | ++ii; | ||
59 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); | 61 | //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this); |
60 | if (msg == "writeMail(QString,QString)") | 62 | if (msg == "writeMail(QString,QString)") |
61 | { | 63 | { |
62 | QDataStream stream(data,IO_ReadOnly); | 64 | QDataStream stream(data,IO_ReadOnly); |
63 | QString name, email; | 65 | QString name, email; |
64 | stream >> name >> email; | 66 | stream >> name >> email; |
@@ -76,13 +78,14 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) | |||
76 | stream >> nameemail; | 78 | stream >> nameemail; |
77 | // the format is | 79 | // the format is |
78 | // NAME <EMAIL>:SUBJECT | 80 | // NAME <EMAIL>:SUBJECT |
79 | //qDebug("message %s ", nameemail.latin1()); | 81 | //qDebug("message %s ", nameemail.latin1()); |
80 | 82 | ||
81 | slotwriteMail2( nameemail ); | 83 | slotwriteMail2( nameemail ); |
82 | } | 84 | } else |
85 | ExternalAppHandler::instance()->appMessage ( msg, data); | ||
83 | } | 86 | } |
84 | void OpieMail::slotwriteMail2(const QString& namemail ) | 87 | void OpieMail::slotwriteMail2(const QString& namemail ) |
85 | { | 88 | { |
86 | // qDebug("OpieMail::slotwriteMail2 "); | 89 | // qDebug("OpieMail::slotwriteMail2 "); |
87 | qApp->processEvents(); | 90 | qApp->processEvents(); |
88 | ComposeMail compose( settings, this, 0, true ); | 91 | ComposeMail compose( settings, this, 0, true ); |