added kphone to SIP ext app

3 files changed, 37 insertions, 5 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 07bdff2..779b20e 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -48,6 +48,9 @@ $Id$
 
 #include "kpimglobalprefs.h"
 
+//uncomment line to get debug output
+//#define DEBUG_EXT_APP_HANDLER
+
 /*********************************************************************************
  *
  ********************************************************************************/
@@ -80,9 +83,10 @@ bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& pa
 #ifndef DESKTOP_VERSION
   //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());
 
@@ -197,8 +201,10 @@ bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QSt
   //targetMessage passes two parameters: uid, map
   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());
     //US we need no names in the To field. The emailadresses are enough
@@ -266,12 +272,14 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
   //targetMessage passes two parameters: uid, map
   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());
 
   
     for ( int i = 0; i < list3.count(); i++)
       qDebug("listentry list3: %s",list3[i].latin1());
+#endif
 
   QCopEnvelope e(_sourceChannel.latin1(), targetMessage.latin1());
     //US we need no names in the To field. The emailadresses are enough
@@ -294,13 +302,17 @@ bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QString
 bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
+#ifdef DEBUG_EXT_APP_HANDLER
     qDebug("1QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+#endif
 
   if (res == false)
   {
     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
     if ((_targetMessage + _targetMessageParameters) == cmsg.data())
@@ -313,7 +325,9 @@ bool QCopListTransferItem::appMessage( const QCString& cmsg, const QByteArray& d
       QStringList list6;
       QString uid;
 
+#ifdef DEBUG_EXT_APP_HANDLER
       qDebug("3QCopListTransferItem- QCOP message received: %s ", cmsg.data()  );
+#endif
 
       stream >> uid >> list1 >> list2 >> list3 >> list4 >> list5 >> list6;
       emit receivedMessageFromTarget(uid, list1, list2, list3, list4, list5, list6);
@@ -436,8 +450,11 @@ void ExternalAppHandler::loadConfig()
   addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::OTHER_PAC,  "Other pager client",       undefined,            undefined, undefined, undefined, undefined);
 
   //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);
 
 }
 
@@ -635,8 +652,10 @@ bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QS
   message2 = translateMessage(message2, emails, urls);
 
 
+#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
 
 
   QCopEnvelope e(channel.latin1(), message2.latin1());
@@ -692,8 +711,10 @@ bool ExternalAppHandler::mailToOneContact( const QString& name, const QString& e
   message = translateMessage(message, name, emailadress);
 
 
+#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());
     //US we need no names in the To field. The emailadresses are enough
@@ -769,8 +790,10 @@ bool ExternalAppHandler::callByPhone( const QString& phonenumber )
   message = translateMessage(message, 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());
     //US we need no names in the To field. The emailadresses are enough
@@ -824,8 +847,10 @@ bool ExternalAppHandler::callBySMS( const QString& phonenumber )
   message = translateMessage(message, 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());
     //US we need no names in the To field. The emailadresses are enough
@@ -879,8 +904,10 @@ bool ExternalAppHandler::callByPager( const QString& pagernumber )
   message = translateMessage(message, 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());
     //US we need no names in the To field. The emailadresses are enough
@@ -934,8 +961,10 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
   message = translateMessage(message, 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());
     //US we need no names in the To field. The emailadresses are enough
@@ -989,8 +1018,10 @@ bool ExternalAppHandler::callBySIP( const QString& sipnumber )
   message = translateMessage(message, 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());
     //US we need no names in the To field. The emailadresses are enough
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 04e2072..7cd6038 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -92,7 +92,7 @@ KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
   addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
 
-  addItemInt( "SIPChannelType", &mSipClient, NONE_SIC );
+  addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC );
   addItemString( "SIPChannel", &mSipOtherChannel, "" );
   addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
   addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
diff --git a/libkdepim/kpimglobalprefs.h b/libkdepim/kpimglobalprefs.h
index 7c55099..d09c3da 100644
--- a/libkdepim/kpimglobalprefs.h
+++ b/libkdepim/kpimglobalprefs.h
@@ -75,7 +75,8 @@ class KPimGlobalPrefs : public KPrefs
 
     enum SIPClients {
       NONE_SIC = 0,
-      OTHER_SIC = 1
+      OTHER_SIC = 1,
+      KPPI_SIC = 2
     };
 
   private: