summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
-rw-r--r--libkdepim/externalapphandler.cpp36
2 files changed, 22 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index ac1d5b7..2049dde 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
1############################################################################# 1#############################################################################
2# Makefile for building: kopi-desktop 2# Makefile for building: kopi-desktop
3# Generated by qmake (1.07a) (Qt 3.3.3) on: Mon Aug 9 13:18:13 2004 3# Generated by qmake (1.07a) (Qt 3.3.3) on: Tue Aug 10 18:20:15 2004
4# Project: kopi-desktop.pro 4# Project: kopi-desktop.pro
5# Template: subdirs 5# Template: subdirs
6# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro 6# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kopi-desktop.pro
7############################################################################# 7#############################################################################
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 6f812d0..0128cf7 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -30,14 +30,16 @@ $Id$
30#include <stdlib.h> 30#include <stdlib.h>
31 31
32#include <qfile.h> 32#include <qfile.h>
33#include <qmap.h> 33#include <qmap.h>
34#include <qregexp.h>
34 35
35 36#ifndef DESKTOP_VERSION
36#include <qtopia/qcopenvelope_qws.h> 37#include <qtopia/qcopenvelope_qws.h>
37 38#endif
38 39
39#include <kstaticdeleter.h> 40#include <kstaticdeleter.h>
41#include <kmessagebox.h>
40 42
41 43
42#include "externalapphandler.h" 44#include "externalapphandler.h"
43 45
@@ -167,9 +169,10 @@ DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
167 169
168//calls the emailapplication with a number of attachments that need to be send (Seperated by Comma) 170//calls the emailapplication with a number of attachments that need to be send (Seperated by Comma)
169bool ExternalAppHandler::mailAttachments( const QString& urls ) 171bool ExternalAppHandler::mailAttachments( const QString& urls )
170{ 172{
171#ifndef QT_NO_COP 173
174#ifndef DESKTOP_VERSION
172 QString channel; 175 QString channel;
173 QString message2; 176 QString message2;
174 QString parameters2; 177 QString parameters2;
175 178
@@ -197,16 +200,18 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
197 200
198 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1()); 201 qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1());
199 qDebug("passing attachmenturls:(%s) as parameter in the form %s to QCopEnvelope", urls.latin1(), parameters2.latin1()); 202 qDebug("passing attachmenturls:(%s) as parameter in the form %s to QCopEnvelope", urls.latin1(), parameters2.latin1());
200 203
204
201 QCopEnvelope e(channel.latin1(), message2.latin1()); 205 QCopEnvelope e(channel.latin1(), message2.latin1());
202 //US we need no names in the To field. The emailadresses are enough 206 //US we need no names in the To field. The emailadresses are enough
203 207
204 passParameter(&e, parameters2, urls); 208 passParameter(&e, parameters2, urls);
205 209
206 210
211
207#else 212#else
208 KMessageBox::sorry( this, i18n( "This version does not support the sending of emails." ) ); 213 KMessageBox::sorry( 0, i18n( "This version does not support the sending of emails." ) );
209#endif 214#endif
210 215
211 return true; 216 return true;
212} 217}
@@ -215,9 +220,9 @@ bool ExternalAppHandler::mailAttachments( const QString& urls )
215 220
216//calls the emailapplication and creates a mail with parameter emails as recipients 221//calls the emailapplication and creates a mail with parameter emails as recipients
217bool ExternalAppHandler::mailToContacts( const QString& emails ) 222bool ExternalAppHandler::mailToContacts( const QString& emails )
218{ 223{
219#ifndef QT_NO_COP 224#ifndef DESKTOP_VERSION
220 QString channel; 225 QString channel;
221 QString message; 226 QString message;
222 QString parameters; 227 QString parameters;
223 228
@@ -256,9 +261,9 @@ bool ExternalAppHandler::mailToContacts( const QString& emails )
256 passParameter(&e, parameters, emails); 261 passParameter(&e, parameters, emails);
257 262
258 263
259#else 264#else
260 KMessageBox::sorry( this, i18n( "This version does not support the sending of emails." ) ); 265 KMessageBox::sorry( 0, i18n( "This version does not support the sending of emails." ) );
261#endif 266#endif
262 267
263 268
264 return true; 269 return true;
@@ -267,9 +272,9 @@ bool ExternalAppHandler::mailToContacts( const QString& emails )
267 272
268//calls the phoneapplication with the number 273//calls the phoneapplication with the number
269bool ExternalAppHandler::callByPhone( const QString& phonenumber ) 274bool ExternalAppHandler::callByPhone( const QString& phonenumber )
270{ 275{
271#ifndef QT_NO_COP 276#ifndef DESKTOP_VERSION
272 QString channel; 277 QString channel;
273 QString message; 278 QString message;
274 QString parameters; 279 QString parameters;
275 280
@@ -308,9 +313,9 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
308 passParameter(&e, parameters, phonenumber); 313 passParameter(&e, parameters, phonenumber);
309 314
310 315
311#else 316#else
312 KMessageBox::sorry( this, i18n( "This version does not support phonecalls." ) ); 317 KMessageBox::sorry( 0, i18n( "This version does not support phonecalls." ) );
313#endif 318#endif
314 319
315 320
316 return true; 321 return true;
@@ -318,9 +323,9 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
318 323
319//calls the smsapplication with the number 324//calls the smsapplication with the number
320bool ExternalAppHandler::callBySMS( const QString& phonenumber ) 325bool ExternalAppHandler::callBySMS( const QString& phonenumber )
321{ 326{
322#ifndef QT_NO_COP 327#ifndef DESKTOP_VERSION
323 QString channel; 328 QString channel;
324 QString message; 329 QString message;
325 QString parameters; 330 QString parameters;
326 331
@@ -359,9 +364,9 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
359 passParameter(&e, parameters, phonenumber); 364 passParameter(&e, parameters, phonenumber);
360 365
361 366
362#else 367#else
363 KMessageBox::sorry( this, i18n( "This version does not support the sending of sms." ) ); 368 KMessageBox::sorry( 0, i18n( "This version does not support the sending of sms." ) );
364#endif 369#endif
365 370
366 371
367 return true; 372 return true;
@@ -369,9 +374,9 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
369 374
370//calls the pagerapplication with the number 375//calls the pagerapplication with the number
371bool ExternalAppHandler::callByPager( const QString& pagernumber ) 376bool ExternalAppHandler::callByPager( const QString& pagernumber )
372{ 377{
373#ifndef QT_NO_COP 378#ifndef DESKTOP_VERSION
374 QString channel; 379 QString channel;
375 QString message; 380 QString message;
376 QString parameters; 381 QString parameters;
377 382
@@ -410,9 +415,9 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
410 passParameter(&e, parameters, pagernumber); 415 passParameter(&e, parameters, pagernumber);
411 416
412 417
413#else 418#else
414 KMessageBox::sorry( this, i18n( "This version does not support paging." ) ); 419 KMessageBox::sorry( 0, i18n( "This version does not support paging." ) );
415#endif 420#endif
416 421
417 422
418 return true; 423 return true;
@@ -420,9 +425,9 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
420 425
421//calls the faxapplication with the number 426//calls the faxapplication with the number
422bool ExternalAppHandler::callByFax( const QString& faxnumber ) 427bool ExternalAppHandler::callByFax( const QString& faxnumber )
423{ 428{
424#ifndef QT_NO_COP 429#ifndef DESKTOP_VERSION
425 QString channel; 430 QString channel;
426 QString message; 431 QString message;
427 QString parameters; 432 QString parameters;
428 433
@@ -461,9 +466,9 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
461 passParameter(&e, parameters, faxnumber); 466 passParameter(&e, parameters, faxnumber);
462 467
463 468
464#else 469#else
465 KMessageBox::sorry( this, i18n( "This version does not support the sending of faxes." ) ); 470 KMessageBox::sorry( 0, i18n( "This version does not support the sending of faxes." ) );
466#endif 471#endif
467 472
468 473
469 return true; 474 return true;
@@ -480,8 +485,9 @@ QString& ExternalAppHandler::translateMessage(QString& message, const QString& p
480} 485}
481 486
482void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const 487void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const
483{ 488{
489#ifndef DESKTOP_VERSION
484 QMap<QString, QString> valmap; 490 QMap<QString, QString> valmap;
485 bool useValMap = false; 491 bool useValMap = false;
486 492
487 // first extract all parts of the parameters. 493 // first extract all parts of the parameters.
@@ -517,9 +523,9 @@ void ExternalAppHandler::passParameter(QCopEnvelope* e, const QString& parameter
517 523
518 if (useValMap == true) 524 if (useValMap == true)
519 (*e) << valmap; 525 (*e) << valmap;
520 526
521 527#endif
522 528
523} 529}
524 530
525 531