3 files changed, 93 insertions, 2 deletions

diff --git a/libkdepim/addresseeview.cpp b/libkdepim/addresseeview.cpp
index 5c69010..b4717d7 100644
--- a/libkdepim/addresseeview.cpp
+++ b/libkdepim/addresseeview.cpp
@@ -74,22 +74,25 @@ void AddresseeView::setSource(const QString& n)
   else if ( n.left( 5 ) == "faxto" )
     ExternalAppHandler::instance()->callByFax(  n.mid(6) );
   else if ( n.left( 5 ) == "smsto" )
     ExternalAppHandler::instance()->callBySMS(  n.mid(6) );
   else if ( n.left( 7 ) == "pagerto" )
     ExternalAppHandler::instance()->callByPager(  n.mid(8) );
+  else if ( n.left( 5 ) == "sipto" )
+    ExternalAppHandler::instance()->callBySIP(  n.mid(6) );
 
 }
 void AddresseeView::setAddressee( const KABC::Addressee& addr )
 {
   ExternalAppHandler* eah = ExternalAppHandler::instance();
   bool kemailAvail = eah->isEmailAppAvailable();
   bool kphoneAvail = eah->isPhoneAppAvailable();
   bool kfaxAvail = eah->isFaxAppAvailable();
   bool ksmsAvail = eah->isSMSAppAvailable();
   bool kpagerAvail = eah->isPagerAppAvailable();
+  bool ksipAvail = eah->isSIPAppAvailable();
 
 
   mAddressee = addr;
   // clear view
   setText( QString::null );
 
@@ -156,12 +159,15 @@ void AddresseeView::setAddressee( const KABC::Addressee& addr )
     if ((phonetype & KABC::PhoneNumber::Fax) == KABC::PhoneNumber::Fax) {
       if (kfaxAvail) extension = "faxto:";
     }
     else if ((phonetype & KABC::PhoneNumber::Pager) == KABC::PhoneNumber::Pager) {
       if (kpagerAvail) extension = "pagerto:";
     }
+    else if ((phonetype & KABC::PhoneNumber::Sip) == KABC::PhoneNumber::Sip) {
+      if (ksipAvail) extension = "sipto:";
+    }
     else if (kphoneAvail) {
       extension = "phoneto:";
     }
     else
       extension = QString::null;
 
diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 5ba32b6..fa56ee9 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -352,13 +352,13 @@ void ExternalAppHandler::loadConfig()
   mDefaultItems.clear();
   mEmailAppAvailable = UNDEFINED;
   mPhoneAppAvailable = UNDEFINED;
   mFaxAppAvailable = UNDEFINED;
   mSMSAppAvailable = UNDEFINED;
   mPagerAppAvailable = UNDEFINED;
-
+  mSIPAppAvailable = UNDEFINED;
 
   QString opiepath = QString::fromLatin1( getenv("OPIEDIR") );
   QString qtopiapath = QString::fromLatin1( getenv("QPEDIR") );
 
   if (opiepath.isEmpty())
     opiepath = qtopiapath;
@@ -401,12 +401,16 @@ void ExternalAppHandler::loadConfig()
   addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::OTHER_SMC,  "Other sms client",       undefined,            undefined, undefined, undefined, undefined);
 
   //pagerclients
   addDefaultAppItem(ExternalAppHandler::PAGER, KPimGlobalPrefs::NONE_PAC,  "No pager client installed",       undefined,            undefined, undefined, undefined, undefined);
   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);
+
 }
 
 ExternalAppHandler *ExternalAppHandler::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleter.setObject( new ExternalAppHandler() );
@@ -539,12 +543,31 @@ bool ExternalAppHandler::isPagerAppAvailable()
   return (mPagerAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
+
+bool ExternalAppHandler::isSIPAppAvailable()
+{
+#ifndef DESKTOP_VERSION
+  if (mSIPAppAvailable == UNDEFINED)
+  {
+    int client = KPimGlobalPrefs::instance()->mSipClient;
+    if (client == KPimGlobalPrefs::NONE_SIC)
+      mSIPAppAvailable = UNAVAILABLE;
+    else
+      mSIPAppAvailable = AVAILABLE;
+  }
+
+  return (mSIPAppAvailable == AVAILABLE);
+#else //DESKTOP_VERSION
+  return false;
+#endif //DESKTOP_VERSION
+}
+
 /**************************************************************************
  *
  **************************************************************************/
 
 
 //calls the emailapplication with a number of attachments that need to be send (Seperated by Comma)
@@ -898,12 +921,68 @@ bool ExternalAppHandler::callByFax( const QString& faxnumber )
 }
 
 /**************************************************************************
  *
  **************************************************************************/
 
+//calls the sipapplication with the number
+bool ExternalAppHandler::callBySIP( const QString& sipnumber )
+{
+#ifndef DESKTOP_VERSION
+  QString channel;
+  QString message;
+  QString parameters;
+
+
+  int client = KPimGlobalPrefs::instance()->mSipClient;
+  if (client == KPimGlobalPrefs::OTHER_SIC)
+  {
+    channel = KPimGlobalPrefs::instance()->mSipOtherChannel;
+    message = KPimGlobalPrefs::instance()->mSipOtherMessage;
+    parameters = KPimGlobalPrefs::instance()->mSipOtherMessageParameters;
+  }
+  else
+  {
+    DefaultAppItem* dai = ExternalAppHandler::getDefaultItem(SIP, client);
+    if (!dai)
+    {
+      qDebug("could not find configured sip application.");
+          return false;
+    }
+    channel = dai->_channel;
+    message = dai->_message;
+    parameters = dai->_parameters;
+  }
+
+
+  //first check if one of the sip apps need the emails right in the message.
+  message = translateMessage(message, sipnumber, "");
+
+
+  qDebug("Using QCopEnvelope e(\"%s\",\"%s\")", channel.latin1(), message.latin1());
+  qDebug("passing sipnumber(%s) as parameter in the form %s to QCopEnvelope", sipnumber.latin1(), parameters.latin1());
+
+  QCopEnvelope e(channel.latin1(), message.latin1());
+    //US we need no names in the To field. The emailadresses are enough
+
+  passParameters(&e, parameters, sipnumber, "");
+
+
+#else
+  KMessageBox::sorry( 0, i18n( "This version does not support sip." ) );
+#endif
+
+
+  return true;
+}
+
+
+/**************************************************************************
+ *
+ **************************************************************************/
+
 
 QString& ExternalAppHandler::translateMessage(QString& message, const QString& param1, const QString& param2 ) const
 {
   message = message.replace( QRegExp("%1"), param1 );
   return message.replace( QRegExp("%2"), param2 );
 }
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 1b04b2b..cfe577b 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -154,13 +154,14 @@ class ExternalAppHandler : public QObject
 
     enum Types {
                 EMAIL = 0,
                 PHONE = 1,
                 SMS   = 2,
                 FAX   = 3,
-                PAGER = 4
+                PAGER = 4,
+                SIP   = 5
         };
 
     enum Availability {
                 UNDEFINED = -1,
                 UNAVAILABLE   = 0,
                 AVAILABLE = 1
@@ -187,17 +188,21 @@ class ExternalAppHandler : public QObject
     //calls the pagerapplication with the number
     bool callByPager( const QString& pagernumber );
 
     //calls the faxapplication with the number
     bool callByFax( const QString& faxnumber );
 
+    //calls the sipapplication with the number
+    bool callBySIP( const QString& sipnumber );
+
     bool isEmailAppAvailable();
     bool isSMSAppAvailable();
     bool isPhoneAppAvailable();
     bool isFaxAppAvailable();
     bool isPagerAppAvailable();
+    bool isSIPAppAvailable();
 
 
     //Call this method on the source when you want to select names from the addressbook by using QCop
     bool requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
     //Call this method on the target when you want to return the name/email map to the source (client).
     bool returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
@@ -238,12 +243,13 @@ class ExternalAppHandler : public QObject
 
     Availability mEmailAppAvailable;
     Availability mPhoneAppAvailable;
     Availability mFaxAppAvailable;
     Availability mSMSAppAvailable;
     Availability mPagerAppAvailable;
+    Availability mSIPAppAvailable;
 
     QCopListTransferItem* mNameEmailUidListFromKAPITransfer;
     QCopListTransferItem* mFindByEmailFromKAPITransfer;
     QCopTransferItem* mDisplayDetails;