author | zautrix <zautrix> | 2004-10-27 22:35:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-27 22:35:41 (UTC) |
commit | 5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c (patch) (unidiff) | |
tree | 914ce70d7e5a1afcd2da0c2fda34b959d65d0462 /libkdepim | |
parent | 9c88346fc757fd1dc54b3fca151a2a610159d8cf (diff) | |
download | kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.zip kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.tar.gz kdepimpi-5afbc6ae0908ce12fd5abb1c4eadf9c61a01503c.tar.bz2 |
pwm close fix
-rw-r--r-- | libkdepim/externalapphandler.cpp | 6 | ||||
-rw-r--r-- | libkdepim/externalapphandler.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp index 9085673..9f12152 100644 --- a/libkdepim/externalapphandler.cpp +++ b/libkdepim/externalapphandler.cpp | |||
@@ -1087,64 +1087,70 @@ void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& paramete | |||
1087 | 1087 | ||
1088 | if(it2 != keyvallist.end()) | 1088 | if(it2 != keyvallist.end()) |
1089 | { | 1089 | { |
1090 | QString value = (*it2); | 1090 | QString value = (*it2); |
1091 | value = value.replace( QRegExp("%1"), param1 ); | 1091 | value = value.replace( QRegExp("%1"), param1 ); |
1092 | value = value.replace( QRegExp("%2"), param2 ); | 1092 | value = value.replace( QRegExp("%2"), param2 ); |
1093 | 1093 | ||
1094 | valmap.insert(key, value); | 1094 | valmap.insert(key, value); |
1095 | useValMap = true; | 1095 | useValMap = true; |
1096 | } | 1096 | } |
1097 | else | 1097 | else |
1098 | { | 1098 | { |
1099 | // qDebug("pass parameter << %s", key.latin1()); | 1099 | // qDebug("pass parameter << %s", key.latin1()); |
1100 | (*e) << key; | 1100 | (*e) << key; |
1101 | } | 1101 | } |
1102 | } | 1102 | } |
1103 | 1103 | ||
1104 | if (useValMap == true) | 1104 | if (useValMap == true) |
1105 | (*e) << valmap; | 1105 | (*e) << valmap; |
1106 | 1106 | ||
1107 | #endif | 1107 | #endif |
1108 | 1108 | ||
1109 | } | 1109 | } |
1110 | 1110 | ||
1111 | 1111 | ||
1112 | 1112 | ||
1113 | /************************************************************************** | 1113 | /************************************************************************** |
1114 | * | 1114 | * |
1115 | **************************************************************************/ | 1115 | **************************************************************************/ |
1116 | 1116 | ||
1117 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) | 1117 | void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data ) |
1118 | { | 1118 | { |
1119 | |||
1120 | if ( cmsg == "nextView()" ) { | ||
1121 | emit nextView(); | ||
1122 | return; | ||
1123 | } | ||
1124 | |||
1119 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1125 | bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1120 | if (!res) | 1126 | if (!res) |
1121 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); | 1127 | res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data ); |
1122 | 1128 | ||
1123 | if (!res) | 1129 | if (!res) |
1124 | res = mDisplayDetails->appMessage( cmsg, data ); | 1130 | res = mDisplayDetails->appMessage( cmsg, data ); |
1125 | 1131 | ||
1126 | // if (!res) | 1132 | // if (!res) |
1127 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); | 1133 | // res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data ); |
1128 | } | 1134 | } |
1129 | 1135 | ||
1130 | 1136 | ||
1131 | 1137 | ||
1132 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) | 1138 | bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid) |
1133 | { | 1139 | { |
1134 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1140 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1135 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); | 1141 | return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid); |
1136 | } | 1142 | } |
1137 | 1143 | ||
1138 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) | 1144 | bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3) |
1139 | { | 1145 | { |
1140 | QStringList list4, list5, list6; | 1146 | QStringList list4, list5, list6; |
1141 | 1147 | ||
1142 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); | 1148 | mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel); |
1143 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); | 1149 | return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6); |
1144 | } | 1150 | } |
1145 | 1151 | ||
1146 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) | 1152 | bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email) |
1147 | { | 1153 | { |
1148 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); | 1154 | mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel); |
1149 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); | 1155 | return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email); |
1150 | } | 1156 | } |
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h index 6f5d345..52a64e1 100644 --- a/libkdepim/externalapphandler.h +++ b/libkdepim/externalapphandler.h | |||
@@ -204,64 +204,65 @@ class ExternalAppHandler : public QObject | |||
204 | //Call this method on the source when you want to select names from the addressbook by using QCop | 204 | //Call this method on the source when you want to select names from the addressbook by using QCop |
205 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | 205 | bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid); |
206 | //Call this method on the target when you want to return the name/email map to the source (client). | 206 | //Call this method on the target when you want to return the name/email map to the source (client). |
207 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 207 | bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
208 | 208 | ||
209 | 209 | ||
210 | 210 | ||
211 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); | 211 | bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email); |
212 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); | 212 | bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid); |
213 | 213 | ||
214 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); | 214 | bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid); |
215 | 215 | ||
216 | 216 | ||
217 | 217 | ||
218 | bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid); | 218 | bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid); |
219 | bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, | 219 | bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, |
220 | const QStringList& birthdayList, const QStringList& anniversaryList, | 220 | const QStringList& birthdayList, const QStringList& anniversaryList, |
221 | const QStringList& realNameList, const QStringList& emailList, | 221 | const QStringList& realNameList, const QStringList& emailList, |
222 | const QStringList& assembledNameList, const QStringList& uidList); | 222 | const QStringList& assembledNameList, const QStringList& uidList); |
223 | 223 | ||
224 | 224 | ||
225 | //loadConfig clears the cache and checks again if the applications are available or not | 225 | //loadConfig clears the cache and checks again if the applications are available or not |
226 | void loadConfig(); | 226 | void loadConfig(); |
227 | 227 | ||
228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); | 228 | QList<DefaultAppItem> getAvailableDefaultItems(Types); |
229 | DefaultAppItem* getDefaultItem(Types, int); | 229 | DefaultAppItem* getDefaultItem(Types, int); |
230 | 230 | ||
231 | public slots: | 231 | public slots: |
232 | void appMessage( const QCString& msg, const QByteArray& data ); | 232 | void appMessage( const QCString& msg, const QByteArray& data ); |
233 | 233 | ||
234 | 234 | ||
235 | signals: | 235 | signals: |
236 | void nextView(); | ||
236 | // Emmitted when the target app receives a request from the source app | 237 | // Emmitted when the target app receives a request from the source app |
237 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); | 238 | void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid); |
238 | 239 | ||
239 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 240 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
240 | // The first parameter is a uniqueid. It can be used to identify the event | 241 | // The first parameter is a uniqueid. It can be used to identify the event |
241 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 242 | void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
242 | 243 | ||
243 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); | 244 | void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email); |
244 | void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); | 245 | void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList); |
245 | 246 | ||
246 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); | 247 | void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid); |
247 | 248 | ||
248 | 249 | ||
249 | // Emmitted when the target app receives a request from the source app | 250 | // Emmitted when the target app receives a request from the source app |
250 | void requestForBirthdayList(const QString& sourceChannel, const QString& uid); | 251 | void requestForBirthdayList(const QString& sourceChannel, const QString& uid); |
251 | 252 | ||
252 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi | 253 | // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi |
253 | // The first parameter is a uniqueid. It can be used to identify the event | 254 | // The first parameter is a uniqueid. It can be used to identify the event |
254 | void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList, | 255 | void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList, |
255 | const QStringList& anniversaryList, const QStringList& realNameList, | 256 | const QStringList& anniversaryList, const QStringList& realNameList, |
256 | const QStringList& emailList, const QStringList& assembledNameList, | 257 | const QStringList& emailList, const QStringList& assembledNameList, |
257 | const QStringList& uidList); | 258 | const QStringList& uidList); |
258 | 259 | ||
259 | 260 | ||
260 | private: | 261 | private: |
261 | ExternalAppHandler(); | 262 | ExternalAppHandler(); |
262 | QList<DefaultAppItem> mDefaultItems; | 263 | QList<DefaultAppItem> mDefaultItems; |
263 | 264 | ||
264 | Availability mEmailAppAvailable; | 265 | Availability mEmailAppAvailable; |
265 | Availability mPhoneAppAvailable; | 266 | Availability mPhoneAppAvailable; |
266 | Availability mFaxAppAvailable; | 267 | Availability mFaxAppAvailable; |
267 | Availability mSMSAppAvailable; | 268 | Availability mSMSAppAvailable; |