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
@@ -1023,159 +1023,165 @@ bool ExternalAppHandler::callBySIP( const QString& sipnumber )
 
 
   //first check if one of the sip apps need the emails right in the message.
   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
 
   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 );
 }
 
 /**************************************************************************
  *
  **************************************************************************/
 
 void ExternalAppHandler::passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1 , const QString& param2) const
 {
 #ifndef DESKTOP_VERSION
   QMap<QString, QString> valmap;
   bool useValMap = false;
 
   // first extract all parts of the parameters.
   QStringList paramlist = QStringList::split(";", parameters);
 
   //Now check how many parts we have.
   //=0 :no params to pass
   //>0 :parameters to pass
   for ( QStringList::Iterator it = paramlist.begin(); it != paramlist.end(); ++it )
   {
     QString param = (*it);
     QStringList keyvallist = QStringList::split("=", param);
 
     //if we have keyvalue pairs, we assume that we pass a map to the envelope
     QStringList::Iterator it2 = keyvallist.begin();
     QString key = (*it2);
     key = key.replace( QRegExp("%1"), param1 );
     key = key.replace( QRegExp("%2"), param2 );
     ++it2;
 
     if(it2 != keyvallist.end())
     {
       QString value = (*it2);
       value = value.replace( QRegExp("%1"), param1 );
       value = value.replace( QRegExp("%2"), param2 );
 
           valmap.insert(key, value);
           useValMap = true;
     }
     else
     {
       //      qDebug("pass parameter << %s", key.latin1());
       (*e) << key;
     }
   }
 
   if (useValMap == true)
     (*e) << valmap;
 
 #endif
 
 }
 
 
 
 /**************************************************************************
  *
  **************************************************************************/
 
 void ExternalAppHandler::appMessage( const QCString& cmsg, const QByteArray& data )
 {
+
+    if ( cmsg == "nextView()" ) {
+        emit nextView();
+        return;
+    }
+        
   bool res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
   if (!res)
     res = mBirthdayListFromKAPITransfer->appMessage( cmsg, data );
 
   if (!res)
     res = mDisplayDetails->appMessage( cmsg, data );
 
 //  if (!res)
 //    res = mNameEmailUidListFromKAPITransfer->appMessage( cmsg, data );
 }
 
 
 
 bool ExternalAppHandler::requestNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid)
 {
   mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel);
   return mNameEmailUidListFromKAPITransfer->sendMessageToTarget(sessionuid);
 }
 
 bool ExternalAppHandler::returnNameEmailUidListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
 {
   QStringList list4, list5, list6;
 
   mNameEmailUidListFromKAPITransfer->setSourceChannel(sourceChannel);
   return mNameEmailUidListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
 }
 
 bool ExternalAppHandler::requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email)
 {
   mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel);
   return mFindByEmailFromKAPITransfer->sendMessageToTarget(sessionuid, email);
 }
 
 bool ExternalAppHandler::returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3)
 {
   QStringList list4, list5, list6;
 
   mFindByEmailFromKAPITransfer->setSourceChannel(sourceChannel);
   return mFindByEmailFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
 }
 
 bool ExternalAppHandler::requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid)
 {
   mDisplayDetails->setSourceChannel("");
   return mDisplayDetails->sendMessageToTarget("", name, email, uid);
 }
 
 bool ExternalAppHandler::requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid)
 {
   mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel);
   return mBirthdayListFromKAPITransfer->sendMessageToTarget(sessionuid);
 }
 
 bool ExternalAppHandler::returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6)
 {
   mBirthdayListFromKAPITransfer->setSourceChannel(sourceChannel);
   return mBirthdayListFromKAPITransfer->sendMessageToSource(sessionuid, list1, list2, list3, list4, list5, list6);
 }
 
 
 
 
 
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 6f5d345..52a64e1 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -140,152 +140,153 @@ class DefaultAppItem
 };
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 class ExternalAppHandler : public QObject
 {
   Q_OBJECT
   public:
     virtual ~ExternalAppHandler();
 
     static ExternalAppHandler *instance();
 
     enum Types {
                 EMAIL = 0,
                 PHONE = 1,
                 SMS   = 2,
                 FAX   = 3,
                 PAGER = 4,
                 SIP   = 5
         };
 
     enum Availability {
                 UNDEFINED = -1,
                 UNAVAILABLE   = 0,
                 AVAILABLE = 1
         };
 
     //calls the emailapplication with a number of attachments that need to be send.
     //either parameter can be left empty.
     bool mailToMultipleContacts( const QString& recipients, const QString& attachmenturls );
 
     //calls the emailapplication and creates a mail with parameter emailadress as recipients
     bool mailToOneContact( const QString& name, const QString& emailadress );
 
     //calls the emailapplication and creates a mail with parameter as recipients
     // parameters format is
     //  NAME <EMAIL>:SUBJECT
     bool mailToOneContact( const QString& adressline );
 
     //calls the phoneapplication with the number
     bool callByPhone( const QString& phonenumber );
 
     //calls the smsapplication with the number
     bool callBySMS( const QString& phonenumber );
 
     //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);
 
 
 
     bool requestFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QString& email);
     bool returnFindByEmailFromKAPI(const QString& sourceChannel, const QString& sessionuid, const QStringList& name, const QStringList& email, const QStringList& uid);
 
     bool requestDetailsFromKAPI(const QString& name, const QString& email, const QString& uid);
 
 
 
     bool requestBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid);
     bool returnBirthdayListFromKAPI(const QString& sourceChannel, const QString& sessionuid,
                                     const QStringList& birthdayList, const QStringList& anniversaryList,
                                     const QStringList& realNameList, const QStringList& emailList,
                                     const QStringList& assembledNameList, const QStringList& uidList);
 
 
     //loadConfig clears the cache and checks again if the applications are available or not
     void loadConfig();
 
     QList<DefaultAppItem> getAvailableDefaultItems(Types);
     DefaultAppItem* getDefaultItem(Types, int);
 
  public  slots:
     void appMessage( const QCString& msg, const QByteArray& data );
 
 
  signals:
+    void nextView();
     // Emmitted when the target app receives a request from the source app
     void requestForNameEmailUidList(const QString& sourceChannel, const QString& uid);
 
     // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
     // The first parameter is a uniqueid. It can be used to identify the event
     void receivedNameEmailUidListEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
 
     void requestFindByEmail(const QString& sourceChannel, const QString& uid, const QString& email);
     void receivedFindByEmailEvent(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList);
 
     void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
 
 
     // Emmitted when the target app receives a request from the source app
     void requestForBirthdayList(const QString& sourceChannel, const QString& uid);
 
     // Emitted when the source app recieves a list of name/email pairs (=addresses) from another target app. Usually Ka/Pi
     // The first parameter is a uniqueid. It can be used to identify the event
     void receivedBirthdayListEvent(const QString& uid, const QStringList& birthdayList,
                                    const QStringList& anniversaryList, const QStringList& realNameList,
                                    const QStringList& emailList, const QStringList& assembledNameList,
                                    const QStringList& uidList);
 
 
   private:
     ExternalAppHandler();
     QList<DefaultAppItem> mDefaultItems;
 
     Availability mEmailAppAvailable;
     Availability mPhoneAppAvailable;
     Availability mFaxAppAvailable;
     Availability mSMSAppAvailable;
     Availability mPagerAppAvailable;
     Availability mSIPAppAvailable;
 
     QCopListTransferItem* mNameEmailUidListFromKAPITransfer;
     QCopListTransferItem* mFindByEmailFromKAPITransfer;
     QCopTransferItem* mDisplayDetails;
     QCopListTransferItem* mBirthdayListFromKAPITransfer;
 
 
     void addDefaultAppItem(Types type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2);
 
     QString& translateMessage(QString& message, const QString& param1, const QString& param2) const;
         void passParameters(QCopEnvelope* e, const QString& parameters, const QString& param1, const QString& param2) const;
 
 
     static ExternalAppHandler *sInstance;
 
   private slots:
     void receivedNameEmailUidList_Slot(const QString& uid, const QStringList& nameList, const QStringList& emailList, const QStringList& uidList, const QStringList&, const QStringList&, const QStringList& );
 
 };
 
 
 #endif