1 files changed, 12 insertions, 6 deletions

diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index efcdd89..3cf9e06 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -36,104 +36,110 @@ $Id$
 class QCopEnvelope;
 
 
 class ExternalAppHandler;
 
 class DefaultAppItem
 {
   public:
     DefaultAppItem(int type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameters, const QString& message2, const QString& parameters2)
       : _type(type), _id(id), _label(label), _channel(channel), _message(message), _parameters(parameters), _message2(message2), _parameters2(parameters2)
               {}
 
         DefaultAppItem()
         {  }
 
   public:
     int _type;
     int _id;
     QString _label;
     QString _channel;
     QString _message;
             QString _parameters;// a list of parameters in stringrepresentation. Delimiter is ;
     QString _message2;
     QString _parameters2;  // a list of parameters in stringrepresentation. Delimiter is ;
 
 };
 
 class ExternalAppHandler
 {
   public:
     virtual ~ExternalAppHandler();
 
     static ExternalAppHandler *instance();
 
     enum Types {
                 EMAIL = 0,
                 PHONE = 1,
                 SMS   = 2,
                 FAX   = 3,
                 PAGER = 4
         };
 
     enum Availability {
                 UNDEFINED = -1,
                 UNAVAILABLE   = 0,
                 AVAILABLE = 1
         };
 
-    //calls the emailapplication with a number of attachments that need to be send
-    bool mailAttachments( const QString& urls );
+    //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 emails as recipients
-    bool mailToContacts( const QString& emails );
+    //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 );
 
     bool isEmailAppAvailable();
     bool isSMSAppAvailable();
     bool isPhoneAppAvailable();
     bool isFaxAppAvailable();
     bool isPagerAppAvailable();
 
 
 
     //loadConfig clears the cache and checks again if the applications are available or not
     void loadConfig();
 
     QList<DefaultAppItem> getAvailableDefaultItems(Types);
     DefaultAppItem* getDefaultItem(Types, int);
 
 
   private:
     ExternalAppHandler();
     QList<DefaultAppItem> mDefaultItems;
 
     Availability mEmailAppAvailable;
     Availability mPhoneAppAvailable;
     Availability mFaxAppAvailable;
     Availability mSMSAppAvailable;
     Availability mPagerAppAvailable;
 
 
     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& emails) const;
-        void passParameter(QCopEnvelope* e, const QString& parameters, const QString& param1) const;
+    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;
 
 
 };
 
 #endif