fixed several memory leaks

3 files changed, 12 insertions, 5 deletions

diff --git a/libkdepim/externalapphandler.cpp b/libkdepim/externalapphandler.cpp
index 779b20e..9085673 100644
--- a/libkdepim/externalapphandler.cpp
+++ b/libkdepim/externalapphandler.cpp
@@ -1,634 +1,642 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 #include <stdlib.h>
 
 #include <qfile.h>
 #include <qmap.h>
 #include <qregexp.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <qtopia/qcopenvelope_qws.h>
 #else
 #include <qapplication.h>
 #endif
 
 #include <kstaticdeleter.h>
 #include <kmessagebox.h>
 
 
 #include "externalapphandler.h"
 
 #include "kpimglobalprefs.h"
 
 //uncomment line to get debug output
 //#define DEBUG_EXT_APP_HANDLER
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 
 QCopTransferItem::QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
   : _usedSourceParameters(usedSourceParameters), _sourceMessage(sourceMessage), _targetChannel(targetChannel), _targetMessage(targetMessage)
 {
   //sourceMessage passes later three parameters: sourceChannel, uid, param1
     if (_usedSourceParameters == 0)
-      _sourceMessageParameters = "(QString,QString)";
+      _sourceMessageParameters = "QString,QString)";
     else if (_usedSourceParameters == 1)
       _sourceMessageParameters = "(QString,QString,QString)";
     else if (_usedSourceParameters == 2)
       _sourceMessageParameters = "(QString,QString,QString,QString)";
     else if (_usedSourceParameters == 3)
       _sourceMessageParameters = "(QString,QString,QString,QString,QString)";
 }
 
 /*********************************************************************************/
 
 QCopTransferItem::QCopTransferItem()
 {
 }
 
 /*********************************************************************************/
 bool QCopTransferItem::sendMessageToTarget(const QString& uid, const QString& param1, const QString& param2, const QString& param3)
 {
 
 #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());
 
   e << _sourceChannel << uid;
 
   if (_usedSourceParameters == 1)
     e << param1;
   else if (_usedSourceParameters == 2)
     e << param1 << param2;
   else if (_usedSourceParameters == 3)
     e << param1 << param2 << param3;
 
   qApp->processEvents();
 
   return true;
 
 #else
   KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
   return false;
 #endif
 
 }
 
 
 /*********************************************************************************/
 void QCopTransferItem::setSourceChannel(const QString& sourceChannel)
 {
 
     if ( !sourceChannel.isEmpty())
         _sourceChannel = sourceChannel;
 }
 
 
 /*********************************************************************************/
 bool QCopTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
 
   // copied from old mail2
 /*
   static int ii = 0;
 
     // block second call
     if ( ii < 2 ) {
       ++ii;
       if ( ii > 1 ) {
         qDebug("qcop call blocked ");
         return true;
       }
     }
 */
 
 //  qDebug("QCopTransferItem- QCOP message received: %s ", cmsg.data()  );
 
   //we are in the target and get a request from the source
   if ( (_sourceMessage + _sourceMessageParameters) == cmsg.data())
   {
 
     QDataStream stream( data, IO_ReadOnly );
 
 
     QString sourceChannel;
     QString uid;
     QString param1;
     QString param2;
     QString param3;
 
     stream >> sourceChannel >> uid;
 
     if (_usedSourceParameters == 0)
     {
       emit receivedMessageFromSource(sourceChannel, uid);
     }
     else if (_usedSourceParameters == 1)
     {
       stream >> param1;
       emit receivedMessageFromSource(sourceChannel, uid, param1);
         }
     else if (_usedSourceParameters == 2)
     {
       stream >> param1 >> param2;
       emit receivedMessageFromSource(sourceChannel, uid, param1, param2);
     }
     else if (_usedSourceParameters == 3)
     {
       stream >> param1 >> param2 >> param3;
       emit receivedMessageFromSource(sourceChannel, uid, param1, param2, param3);
     }
 
     return true;
   }
 
   return false;
 }
 
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 
 QCopMapTransferItem::QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
   : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
 {
   //targetMessage returns later two parameters: uid, and map<qstring,qstring>
   _targetMessageParameters = "(QString,QMAP<QString,QString>)";
 }
 
 /*********************************************************************************/
 bool QCopMapTransferItem::sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap)
 {
 #ifndef DESKTOP_VERSION
   //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
 
   e << uid << nameEmailMap;
 
   qApp->processEvents();
 
   return true;
 
 #else
   KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
   return false;
 #endif
 
 }
 
 
 /*********************************************************************************/
 bool QCopMapTransferItem::appMessage( const QCString& cmsg, const QByteArray& data )
 {
   bool res = QCopTransferItem::appMessage( cmsg, data );
 
   if (res == false)
   {
     QDataStream stream( data, IO_ReadOnly );
 
 //    qDebug("QCopMapTransferItem- QCOP message received: %s ", cmsg.data()  );
 
     //we are in the source and get an answer from the target
     if ((_targetMessage + _targetMessageParameters) == cmsg.data())
     {
       QMap<QString,QString> adrMap;
       QString uid;
 
       stream >> uid >> adrMap;
 
       emit receivedMessageFromTarget(uid, adrMap);
 
 
       return true;
     }
   }
 
   return false;
 }
 
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
+QCopListTransferItem::~QCopListTransferItem()
+{
+    
+}
 
 QCopListTransferItem::QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage)
   : QCopTransferItem(usedSourceParameters, sourceMessage, targetChannel,targetMessage)
 {
   //targetMessage returns later two parameters: uid, and three lists
   _targetMessageParameters = "(QString,QStringList,QStringList,QStringList,QStringList,QStringList,QStringList)";
 }
 
 /*********************************************************************************/
 bool QCopListTransferItem::sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5, const QStringList& list6)
 {
 #ifndef DESKTOP_VERSION
   //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
 
   e << uid << list1 << list2 << list3 << list4 << list5 << list6;
 
   qApp->processEvents();
 
   return true;
 
 #else
   KMessageBox::sorry( 0, i18n( "This version does not support QCop." ) );
   return false;
 #endif
 
 }
 
 
 /*********************************************************************************/
 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())
     {
       QStringList list1;
       QStringList list2;
       QStringList list3;
       QStringList list4;
       QStringList list5;
       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);
 
 
       return true;
     }
   }
 
   return false;
 }
 
 
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 
 ExternalAppHandler *ExternalAppHandler::sInstance = 0;
 static KStaticDeleter<ExternalAppHandler> staticDeleter;
 
 ExternalAppHandler::ExternalAppHandler()
 {
   mDefaultItems.setAutoDelete(true);
 
   mNameEmailUidListFromKAPITransfer = new QCopListTransferItem(0, "requestNameEmailUIDListFromKAPI", "QPE/Application/kapi", "receiveNameEmailUIDList");
   connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForNameEmailUidList(const QString&, const QString&)));
   connect(mNameEmailUidListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SLOT (receivedNameEmailUidList_Slot(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 
 //US  mFindByEmailFromKAPITransfer = new QCopListTransferItem(1, "requestFindByEmailFromKAPI", "QPE/Application/kapi", "receiveFindByEmailNameEmailUIDList");
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&)), this, SIGNAL (requestForFindByEmail(const QString&, const QString&, const QString&)));
 //US  connect(mFindByEmailFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedFindByEmailEvent(const QString&, const QStringList&, const QStringList&, const QStringList&)));
 
   mDisplayDetails = new QCopListTransferItem(3, "requestDisplayDetailsFromKAPI", "QPE/Application/kapi", "");
   connect(mDisplayDetails, SIGNAL (receivedMessageFromSource(const QString&, const QString&, const QString&, const QString&, const QString&)), this, SIGNAL (requestForDetails(const QString&, const QString&, const QString&, const QString&, const QString&)));
 
 
 
   mBirthdayListFromKAPITransfer = new QCopListTransferItem(0, "requestBirthdayListFromKAPI", "QPE/Application/kapi", "receiveBirthdayList");
   connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromSource(const QString&, const QString&)), this, SIGNAL (requestForBirthdayList(const QString&, const QString&)));
   connect(mBirthdayListFromKAPITransfer, SIGNAL (receivedMessageFromTarget(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)), this, SIGNAL (receivedBirthdayListEvent(const QString&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&, const QStringList&)));
 
 
 }
 
 ExternalAppHandler::~ExternalAppHandler()
-{
+{ 
+    delete mNameEmailUidListFromKAPITransfer;
+    //delete mFindByEmailFromKAPITransfer;
+    delete mDisplayDetails;
+    delete mBirthdayListFromKAPITransfer;
 }
 
 void ExternalAppHandler::receivedNameEmailUidList_Slot(const QString& uid,
                                                        const QStringList& nameList,
                                                        const QStringList& emailList,
                                                        const QStringList& uidList,
                                                        const QStringList&,
                                                        const QStringList&,
                                                        const QStringList& )
 {
   // this method is a conevnient way to reduce the number of parameters I have to pass 
   emit receivedNameEmailUidListEvent(uid, nameList, emailList, uidList);
 }
 
 
 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;
 
   //mailclients
   QString mailmsg1 = "writeMail(QString,QString)";
   QString mailmsg2 = "writeMail(QMap(QString,QString))";
 
   QString undefined = "";
 
   addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::NONE_EMC,   "No email client installed",       undefined,                undefined,        undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OTHER_EMC,  "Userdefined email client",       undefined,                undefined,        undefined, undefined, undefined);
 
   if (( QFile::exists( qtopiapath + "/bin/ompi" )) ||
      ( QFile::exists( opiepath + "/bin/ompi" )))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OMPI_EMC,   "OM/Pi email client",   "QPE/Application/ompi",    mailmsg1, "%1;%2",        mailmsg2,   "TO=%1;ATTACHMENT=%2");
 
   if ( QFile::exists( qtopiapath + "/bin/qtmail" ))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::QTOPIA_EMC, "Qtopia email client", "QPE/Application/qtmail",   mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
 
   if ( QFile::exists( opiepath + "/bin/opiemail" ))
     addDefaultAppItem(ExternalAppHandler::EMAIL, KPimGlobalPrefs::OPIE_EMC,   "Opie email client",   "QPE/Application/opiemail", mailmsg1, "%1;%2",       mailmsg2,    "TO=%1;ATTACHMENT=%2");
 
 
 
   //phoneclients
 
   addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::NONE_PHC,  "No phone client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::OTHER_PHC,  "Other phone client",       undefined,            undefined, undefined, undefined, undefined);
   if (( QFile::exists( qtopiapath + "/bin/kppi" )) ||
      ( QFile::exists( opiepath + "/bin/kppi" )))
     addDefaultAppItem(ExternalAppHandler::PHONE, KPimGlobalPrefs::KPPI_PHC,   "KP/Pi phone client",       "QPE/Application/kppi", "-ring:%1", "", undefined, undefined);
 
   //faxclients
   addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::NONE_FAC,  "No fax client installed",       undefined,            undefined, undefined, undefined, undefined);
   addDefaultAppItem(ExternalAppHandler::FAX,   KPimGlobalPrefs::OTHER_FAC,  "Other fax client",       undefined,            undefined, undefined, undefined, undefined);
 
   //smsclients
   addDefaultAppItem(ExternalAppHandler::SMS,   KPimGlobalPrefs::NONE_SMC,  "No sms client installed",       undefined,            undefined, undefined, undefined, undefined);
   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);
   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);
 
 }
 
 ExternalAppHandler *ExternalAppHandler::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleter.setObject( new ExternalAppHandler() );
     sInstance->loadConfig();
   }
 
   return sInstance;
 }
 
 void ExternalAppHandler::addDefaultAppItem(Types type, int id, const QString& label,  const QString& channel, const QString& message, const QString& parameter, const QString& message2, const QString& parameter2)
 {
   DefaultAppItem* dai = new DefaultAppItem(type, id, label,  channel, message, parameter, message2, parameter2);
   // qDebug("%d %d %s %s ",   type,  id,  label.latin1(), channel.latin1() );
   mDefaultItems.append(dai);
 }
 
 
 QList<DefaultAppItem> ExternalAppHandler::getAvailableDefaultItems(Types type)
 {
   QList<DefaultAppItem> list;
 
   DefaultAppItem* dai;
 
   for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
   {
     if (dai->_type == type)
       list.append(dai);
   }
 
   return list;
 }
 
 DefaultAppItem* ExternalAppHandler::getDefaultItem(Types type, int clientid)
 {
   DefaultAppItem* dai;
 
   for ( dai=mDefaultItems.first(); dai != 0; dai=mDefaultItems.next() )
   {
     if (dai->_type == type && dai->_id == clientid)
       return dai;
   }
 
   return 0;
 }
 
 bool ExternalAppHandler::isEmailAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mEmailAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mEmailClient;
     if (client == KPimGlobalPrefs::NONE_EMC)
       mEmailAppAvailable = UNAVAILABLE;
     else
       mEmailAppAvailable = AVAILABLE;
   }
   return (mEmailAppAvailable == AVAILABLE);
 
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isSMSAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mSMSAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mSMSClient;
     if (client == KPimGlobalPrefs::NONE_SMC)
       mSMSAppAvailable = UNAVAILABLE;
     else
       mSMSAppAvailable = AVAILABLE;
   }
 
   return (mSMSAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isPhoneAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mPhoneAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mPhoneClient;
     if (client == KPimGlobalPrefs::NONE_PHC)
       mPhoneAppAvailable = UNAVAILABLE;
     else
       mPhoneAppAvailable = AVAILABLE;
   }
 
   return (mPhoneAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isFaxAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mFaxAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mFaxClient;
     if (client == KPimGlobalPrefs::NONE_FAC)
       mFaxAppAvailable = UNAVAILABLE;
     else
       mFaxAppAvailable = AVAILABLE;
   }
 
   return (mFaxAppAvailable == AVAILABLE);
 #else //DESKTOP_VERSION
   return false;
 #endif //DESKTOP_VERSION
 }
 
 bool ExternalAppHandler::isPagerAppAvailable()
 {
 #ifndef DESKTOP_VERSION
   if (mPagerAppAvailable == UNDEFINED)
   {
     int client = KPimGlobalPrefs::instance()->mPagerClient;
     if (client == KPimGlobalPrefs::NONE_PAC)
       mPagerAppAvailable = UNAVAILABLE;
     else
       mPagerAppAvailable = AVAILABLE;
   }
 
   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)
 bool ExternalAppHandler::mailToMultipleContacts( const QString& emails, const QString& urls )
 {
 
 #ifndef DESKTOP_VERSION
   QString channel;
   QString message2;
   QString parameters2;
 
 
   int client = KPimGlobalPrefs::instance()->mEmailClient;
   if (client == KPimGlobalPrefs::OTHER_EMC)
   {
     channel = KPimGlobalPrefs::instance()->mEmailOtherChannel;
diff --git a/libkdepim/externalapphandler.h b/libkdepim/externalapphandler.h
index 4c6f1ea..6f5d345 100644
--- a/libkdepim/externalapphandler.h
+++ b/libkdepim/externalapphandler.h
@@ -1,291 +1,291 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2004 Ulf Schenk
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef EXTERNALAPPHANDLER_H
 #define EXTERNALAPPHANDLER_H
 
 #include <qobject.h>
 #include <qlist.h>
 #include <qmap.h>
 
 class QCopEnvelope;
 
 
 class ExternalAppHandler;
 class QCopTransferItem  : public QObject
 {
   Q_OBJECT
   public:
     QCopTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
         QCopTransferItem();
 
     bool sendMessageToTarget(const QString& uid, const QString& param1 = QString::null, const QString& param2 = QString::null, const QString& param3 = QString::null);
 
     void setSourceChannel(const QString& sourceChannel);
 
     virtual bool appMessage( const QCString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid);
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1);
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2);
     void receivedMessageFromSource(const QString& sourceChannel, const QString& uid, const QString& param1, const QString& param2, const QString& param3);
 
   public:
     int _usedSourceParameters;
     QString _sourceChannel;
     QString _sourceMessage;
     QString _sourceMessageParameters;
     QString _targetChannel;
     QString _targetMessage;
     QString _targetMessageParameters;
 
 };
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 class QCopMapTransferItem : public QCopTransferItem
 {
   Q_OBJECT
   public:
     QCopMapTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
 
     bool sendMessageToSource(const QString& uid, const QMap<QString,QString>& nameEmailMap);
 
 
     virtual bool appMessage( const QCString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromTarget(const QString& uid, const QMap<QString,QString>& nameEmailMap);
 
 };
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 class QCopListTransferItem : public QCopTransferItem
 {
   Q_OBJECT
   public:
     QCopListTransferItem(int usedSourceParameters, const QString& sourceMessage, const QString& targetChannel, const QString& targetMessage);
-
+    ~QCopListTransferItem();
     bool sendMessageToSource(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4, const QStringList& list5,  const QStringList& list6);
 
 
     virtual bool appMessage( const QCString& msg, const QByteArray& data );
 
 
  signals:
     void receivedMessageFromTarget(const QString& uid, const QStringList& list1, const QStringList& list2, const QStringList& list3, const QStringList& list4 , const QStringList& list5,  const QStringList& list6);
 
 };
 
 /*********************************************************************************
  *
  ********************************************************************************/
 
 
 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 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:
     // 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
diff --git a/libkdepim/kpimglobalprefs.cpp b/libkdepim/kpimglobalprefs.cpp
index 3771569..0fdc3e4 100644
--- a/libkdepim/kpimglobalprefs.cpp
+++ b/libkdepim/kpimglobalprefs.cpp
@@ -1,205 +1,204 @@
 /*
     This file is part of libkdepim.
     Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kglobal.h>
 #include <kconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
 #include <qregexp.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qapplication.h>
 #include "kpimglobalprefs.h"
 
 KPimGlobalPrefs *KPimGlobalPrefs::sInstance = 0;
 static KStaticDeleter<KPimGlobalPrefs> staticDeleterGP;
 
 
 KPimGlobalPrefs::KPimGlobalPrefs( const QString &name )
   : KPrefs("microkdeglobalrc")
 {
     mLocaleDict = 0;
   KPrefs::setCurrentGroup("Locale");
   addItemInt("PreferredLanguage",&mPreferredLanguage,0);
   addItemInt("PreferredTime",&mPreferredTime,0);
   addItemInt("PreferredDate",&mPreferredDate,0);
   addItemBool("WeekStartsOnSunday",&mWeekStartsOnSunday,false);
   addItemString("UserDateFormatLong", &mUserDateFormatLong, "%A %d %b %y");
   addItemString("UserDateFormatShort", &mUserDateFormatShort, "%aK %d.%m.%y");
 
   KPrefs::setCurrentGroup("Time & Date");
 
   addItemString("TimeZoneName",&mTimeZoneId, ("+01:00 Europe/Oslo(CET)") );
   addItemBool("UseDaylightsaving",&mUseDaylightsaving,true);
   addItemBool("TimeZoneAdd30min",&mTimeZoneAdd30min,false);
   addItemInt("DaylightsavingStart",&mDaylightsavingStart,90);
   addItemInt("DaylightsavingEnd",&mDaylightsavingEnd,304);
 
   KPrefs::setCurrentGroup( "ExternalApplications" );
 
   addItemInt( "EmailChannelType", &mEmailClient, OMPI_EMC );
   addItemString( "EmailChannel", &mEmailOtherChannel, "" );
   addItemString( "EmailChannelMessage", &mEmailOtherMessage, "" );
   addItemString( "EmailChannelParameters", &mEmailOtherMessageParameters, "" );
   addItemString( "EmailChannelMessage2", &mEmailOtherMessage2, "" );
   addItemString( "EmailChannelParameters2", &mEmailOtherMessageParameters2, "" );
 
   addItemInt( "PhoneChannelType", &mPhoneClient, KPPI_PHC );
   addItemString( "PhoneChannel", &mPhoneOtherChannel, "" );
   addItemString( "PhoneChannelMessage", &mPhoneOtherMessage, "" );
   addItemString( "PhoneChannelParameters", &mPhoneOtherMessageParameters, "" );
 
   addItemInt( "FaxChannelType", &mFaxClient, NONE_FAC );
   addItemString( "FaxChannel", &mFaxOtherChannel, "" );
   addItemString( "FaxChannelMessage", &mFaxOtherMessage, "" );
   addItemString( "FaxChannelParameters", &mFaxOtherMessageParameters, "" );
 
   addItemInt( "SMSChannelType", &mSMSClient, NONE_SMC );
   addItemString( "SMSChannel", &mSMSOtherChannel, "" );
   addItemString( "SMSChannelMessage", &mSMSOtherMessage, "" );
   addItemString( "SMSChannelParameters", &mSMSOtherMessageParameters, "" );
 
   addItemInt( "PagerChannelType", &mPagerClient, NONE_PAC );
   addItemString( "PagerChannel", &mPagerOtherChannel, "" );
   addItemString( "PagerChannelMessage", &mPagerOtherMessage, "" );
   addItemString( "PagerChannelParameters", &mPagerOtherMessageParameters, "" );
 
   addItemInt( "SIPChannelType", &mSipClient, KPPI_SIC );
   addItemString( "SIPChannel", &mSipOtherChannel, "" );
   addItemString( "SIPChannelMessage", &mSipOtherMessage, "" );
   addItemString( "SIPChannelParameters", &mSipOtherMessageParameters, "" );
 
   KPrefs::setCurrentGroup( "PhoneAccess" );
   addItemString("Ex2PhoneDevice",&mEx2PhoneDevice,"/dev/ircomm");
   addItemString("Ex2PhoneConnection",&mEx2PhoneConnection,"irda");
   addItemString("Ex2PhoneModel",&mEx2PhoneModel,"6310i");
 
 }
 
 void KPimGlobalPrefs::setGlobalConfig()
 {
     if ( mLocaleDict == 0 ) {
         QString fileName ; 
         QString name = KGlobal::getAppName() +"/";
 #ifndef DESKTOP_VERSION
         fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/"+name
 #else
             fileName  = qApp->applicationDirPath () + "/kdepim/"+ name;
 #endif
         mLocaleDict = 0;
         if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
          
             if ( mPreferredLanguage == 1 ) 
                 fileName = fileName+"germantranslation.txt"; 
             else if ( mPreferredLanguage == 4 ) 
                 fileName = fileName+"usertranslation.txt"; 
             else if ( mPreferredLanguage == 2 ) 
                 fileName = fileName+"frenchtranslation.txt"; 
             else if ( mPreferredLanguage == 3 ) 
                 fileName = fileName+"italiantranslation.txt";
             QFile file( fileName );
             if (file.open( IO_ReadOnly ) ) {
                 QTextStream ts( &file );
                 ts.setEncoding( QTextStream::Latin1 );
                 //ts.setCodec( QTextCodec::latin1 );
                 QString  text = ts.read();
                 file.close();  
                 text.replace( QRegExp("\\\\n"), "\n" );
                 QString line;
                 QString we;
                 QString wt;
                 int br = 0;
                 int nbr;
                 nbr = text.find ( "},", br );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
                 int se, ee, st, et;
                 mLocaleDict = new QDict<QString>;
+                mLocaleDict->setAutoDelete( true );
                 QString end = "{ \"\",\"\" }";
                 while ( (line != end) && (br > 1)  ) {
                     //qDebug("%d *%s* ", br, line.latin1());
                     se = line.find("\"")+1;
                     et = line.findRev("\"",-1);
                     ee = line.find("\",\"");
                     st = ee+3;
                     we = line.mid( se, ee-se );
                     wt = line.mid( st, et-st );
                     //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
                     mLocaleDict->insert( we, new QString (wt) );
                     nbr = text.find ( "}", br );
                     line = text.mid( br, nbr - br );
                     br = nbr+1;
                 }
                 //qDebug("end *%s* ", end.latin1());
 
                 setLocaleDict( mLocaleDict );
             } else {
                 qDebug("KO: Cannot find translation file %s",fileName.latin1() );
             }
         }
     }
 
     KGlobal::locale()->setHore24Format( !mPreferredTime );
     KGlobal::locale()->setWeekStartMonday( !mWeekStartsOnSunday );
     KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)mPreferredDate );
     KGlobal::locale()->setLanguage( mPreferredLanguage );
     QString dummy = mUserDateFormatLong;
     KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
     dummy = mUserDateFormatShort;
     KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
     KGlobal::locale()->setDaylightSaving( mUseDaylightsaving,
                                           mDaylightsavingStart,
                                           mDaylightsavingEnd );
     KGlobal::locale()->setTimezone( mTimeZoneId, mTimeZoneAdd30min );
 
 }
 KPimGlobalPrefs::~KPimGlobalPrefs()
 { 
     if (sInstance == this)
       sInstance = staticDeleterGP.setObject(0); 
     else
         qDebug("Whats this? Error in KPimGlobalPrefs::~KPimGlobalPrefs() ?");
-    //qDebug("KPimGlobalPrefs::~KPimGlobalPrefs() ");
-    writeConfig();
     if ( mLocaleDict )
         delete mLocaleDict;
 }
 
 KPimGlobalPrefs *KPimGlobalPrefs::instance()
 {
   if ( !sInstance ) {
     sInstance = staticDeleterGP.setObject( new KPimGlobalPrefs() );
     sInstance->readConfig();
   }
 
   return sInstance;
 }