added kphone to SIP ext app

1 files changed, 34 insertions, 3 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 07bdff2..779b20e 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -49,4 +49,7 @@ $Id$
 #include "kpimglobalprefs.h"
 
+//uncomment line to get debug output
+//#define DEBUG_EXT_APP_HANDLER
+
 /*********************************************************************************
  *
@@ -81,7 +84,8 @@ bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& pa
   //sourceMessage passes two parameters: sourceChannel, uid
   QString sourceMessage = _sourceMessage + _sourceMessageParameters;
-
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("1Using QCopEnvelope e(\"%s\",\"%s\")", _targetChannel.latin1(), sourceMessage.latin1());
   qDebug("passing sourcechannel(%s), uid(%s), param1(%s), param2(%s), param3(%s) as parameter to QCopEnvelope", _sourceChannel.latin1(), uid.latin1(), param1.latin1(), param2.latin1(), param3.latin1());
+#endif
 
   QCopEnvelope e(_targetChannel.latin1(), sourceMessage.latin1());
@@ -198,6 +202,8 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt
   QString targetMessage = _targetMessage + _targetMessageParameters;
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("2Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1());
   qDebug("passing uid(%s) and map as parameter to QCopEnvelope", uid.latin1());
+#endif
 
   QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
@@ -267,4 +273,5 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
   QString targetMessage = _targetMessage + _targetMessageParameters;
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("3Using QCopEnvelope e(\"%s\",\"%s\")", _sourceChannel.latin1(), targetMessage.latin1());
   qDebug("passing uid(%s) and list1, list2, list3, list4, list5, list6 as parameter to QCopEnvelope", uid.latin1());
@@ -273,4 +280,5 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
     for ( int i = 0; i < list3.count(); i++)
       qDebug("listentry list3: %s",list3[i].latin1());
+#endif
 
   QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
@@ -295,5 +303,7 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
+#ifdef DEBUG_EXT_APP_HANDLER
     qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+#endif
 
   if (res == false)
@@ -301,5 +311,7 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
     QDataStream stream( data, IO_ReadOnly );
 
+#ifdef DEBUG_EXT_APP_HANDLER
     qDebug("2QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+#endif
 
     //we are in the source and get an answer from the target
@@ -314,5 +326,7 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
       QString uid;
 
+#ifdef DEBUG_EXT_APP_HANDLER
       qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+#endif
 
       stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6;
@@ -437,6 +451,9 @@ void ExternalAppHandler::loadConfig()
 
   //sipclients
-  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC,  "No sip client installed",       undefined,            undefined, undefined, undefined, undefined);
-  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::OTHER_SIC,  "Other sip client",       undefined,            undefined, undefined, undefined, undefined);
+  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::NONE_SIC,  "No SIP client installed",       undefined,            undefined, undefined, undefined, undefined);
+  addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::OTHER_SIC,  "Other SIP client",       undefined,            undefined, undefined, undefined, undefined);
+  if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
+      ( QFile::exists( opiepath + "/bin/kppi" )))
+      addDefaultAppItem(ExternalAppHandler::SIP, KPimGlobalPrefs::KPPI_SIC,   "KP/Pi SIP client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
 
 }
@@ -636,6 +653,8 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("4Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message2.latin1());
   qDebug("passing emailadresses(%s), attachmenturls(%s) as parameters in the form %s to QCopEnvelope", emails.latin1() , urls.latin1(), parameters2.latin1());
+#endif
 
 
@@ -693,6 +712,8 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("5Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing name(%s), emailadresses(%s) as parameters in the form %s to QCopEnvelope", name.latin1(), emailadress.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());
@@ -770,6 +791,8 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("6Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing phonenumber(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());
@@ -825,6 +848,8 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("7Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing phonenumber(%s) as parameter in the form %s to QCopEnvelope", phonenumber.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());
@@ -880,6 +905,8 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("8Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing pagernumber(%s) as parameter in the form %s to QCopEnvelope", pagernumber.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());
@@ -935,6 +962,8 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("9Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing faxnumber(%s) as parameter in the form %s to QCopEnvelope", faxnumber.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());
@@ -990,6 +1019,8 @@ bool ExternalAppHandler::callBySIP( const QString& sipnumber )
 
 
+#ifdef DEBUG_EXT_APP_HANDLER
   qDebug("10Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
   qDebug("passing sipnumber(%s) as parameter in the form %s to QCopEnvelope", sipnumber.latin1(), parameters.latin1());
+#endif
 
   QCopEnvelope e(channel.latin1(), message.latin1());