Some fixes

8 files changed, 21 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 41976f3..2d0e855 100644
--- a/Makefile
+++ b/Makefile
@@ -30,187 +30,190 @@ SUBDIRS_QTOPIA_PLUGIN = \
 SUBDIRS_OPIE_PLUGIN = \
    kabc/plugins/opie
 
 SUBDIRS_SHARP_PLUGIN = \
    kabc/plugins/sharpdtm
 
 SUBDIRS_LDAP_PLUGIN = \
    kabc/plugins/ldap
 
 SUBDIRS_MICROMAIL = \
    kmicromail/libetpan \
    kmicromail/libmailwrapper \
    kmicromail
 
 SUBDIRS_GAMMU = \
    gammu/emb/common \
    gammu/emb/gammu
 
 SUBDIRS = \
    $(SUBDIRS_MICROKDE) \
    $(SUBDIRS_QTOPIA_PLUGIN) \
    $(SUBDIRS_OPIE_PLUGIN) \
    $(SUBDIRS_SHARP_PLUGIN) \
    $(SUBDIRS_LDAP_PLUGIN) \
    $(SUBDIRS_MICROMAIL) \
    $(SUBDIRS_GAMMU) 
 
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
      build_micromail \
      build_gammu
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
-	@echo ---> opie plugin not build.
+	@echo == opie plugin not build.
   else
 	for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
   
 build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
-	@echo ---> ldap plugin not build.
+	@echo == ldap plugin not build.
   else
 	for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
   
 build_ldap_plugin: build_microkde
   ifdef BUILD_NO_LDAP_PLUGIN
-	@echo ---> ldap plugin not build.
+	@echo == ldap plugin not build.
   else
 	  for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
             make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
 
 
 build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
-	@echo ---> micromail not build.
+	@echo == kmicromail not build.
   else
 	for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
 
 build_gammu: variable_test tmake
   ifdef BUILD_NO_GAMMU
-	@echo ---> gammu not build.
+	@echo == gammu not build.
   else
 	for i in $(SUBDIRS_GAMMU); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
   endif
 
 
 variable_info:
 	@echo --------------------------------------
 	@echo KDEPIM buildsystem, variableinfo...
 	@echo KDEPIMDIR=$(KDEPIMDIR)
 	@echo QTDIR=$(QTDIR)
 	@echo QPEDIR=$(QPEDIR)
 	@echo OPIEDIR=$(OPIEDIR)
 	@echo PLATFORM=$(PLATFORM)
 	@echo RELEASE_DEBUG=$(RELEASE_DEBUG)
 	@echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
 	@echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
 	@echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
 	@echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
         ifndef BUILD_NO_SHARP_PLUGIN
 	@echo SHARPDTMSDK=$(SHARPDTMSDK)
         endif
 	@echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
 	@echo --------------------------------------
 
 variable_test: variable_info
 	@echo KDEPIM buildsystem, variablecheck...
   ifndef KDEPIMDIR
 	@echo KDEPIMDIR is not defined.
 	$(error KDEPIMDIR is not defined)
   endif
   ifndef PLATFORM
 	@echo PLATFORM is not defined.
 	$(error PLATFORM is not defined)
   endif
   ifdef BUILD_NO_LDAP_PLUGIN
 	@echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
   endif
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
   endif
   ifdef BUILD_NO_MICROMAIL
 	@echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
   endif
   ifdef BUILD_NO_SHARP_PLUGIN
 	@echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
   else
   	ifndef SHARPDTMSDK
 	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
 	$(error SHARPDTMSDK is not defined)
   	endif
   endif
+  ifdef BUILD_NO_GAMMU
+	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
+  endif
 	@echo --------------------------------------
 
 
 objects:
 	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
 	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
 	mkdir -p libical/lib/$(PLATFORM)
 
 clean:
 	rm -rf libical/lib/$(PLATFORM)/*;
 	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
 install:
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(QPEDIR)/bin/db2file
 	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
 	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kmicromail.desktop
 
 dist:
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
 	./mkipks kammu.control
   endif
 	./mkipks pim_TAB_icon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5cd9649..6538295 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -592,97 +592,97 @@ void KABCore::beamVCard()
 }
 
 
 void KABCore::beamVCard(const QStringList& uids)
 {
 /*US
 	QString beamFilename;
 	Opie::OPimContact c;
 	if ( actionPersonal->isOn() ) {
 		beamFilename = addressbookPersonalVCardName();
 		if ( !QFile::exists( beamFilename ) )
 			return; // can't beam a non-existent file
 		Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
 											beamFilename );
 		Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		Opie::OPimContactAccess::List allList = access->allRecords();
 		Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
 		c = *it;
 
 		delete access;
 	} else {
 		unlink( beamfile ); // delete if exists
 		mkdir("/tmp/obex/", 0755);
 		c = m_abView -> currentEntry();
 		Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
 											beamfile );
 		Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 		access->add( c );
 		access->save();
 		delete access;
 
 		beamFilename = beamfile;
 	}
 
 	owarn << "Beaming: " << beamFilename << oendl;
 */
 
 #if 0
   QString tmpdir = locateLocal("tmp", KGlobal::getAppName());
 
   QString dirName = tmpdir + "/" + KApplication::randomString( 8 );
 
   QString name = "contact.vcf";
 
   QString fileName = dirName + "/" + name;
 #endif
   // LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
   //
-  QString fileName = "/tmp/kdepimbeamfile";
+  QString fileName = "/tmp/kapibeamfile.vcf";
 
 
   //QDir().mkdir( dirName, true );
 
   QFile outFile(fileName);
   KABC::VCardConverter converter;
   QString description;
 
   if ( outFile.open(IO_WriteOnly) ) {  // file opened successfully
 
     QTextStream t( &outFile );  // use a text stream
     t.setEncoding( QTextStream::UnicodeUTF8 );
 
     for( QStringList::ConstIterator it = uids.begin(); it != uids.end(); ++it ) {
       KABC::Addressee a = mAddressBook->findByUid( *it );
 
       if ( a.isEmpty() )
         continue;
 
       if (description.isEmpty())
         description = a.formattedName();
 
       QString vcard;
       converter.addresseeToVCard( a, vcard );
       t << vcard;
 
     }
   } else {
       qDebug("Error open temp  beam file ");
       return;
   }
 
   outFile.close();
 
 #ifndef DESKTOP_VERSION
   Ir *ir = new Ir( this );
   connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
   ir->send( fileName, description, "text/x-vCard" );
 #endif
 
 }
 
 void KABCore::beamDone( Ir *ir )
 {
 #ifndef DESKTOP_VERSION
   delete ir;
 #endif
 }
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 18e4299..4ff6861 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -515,93 +515,93 @@ void SimpleAlarmDaemonImpl::confTimer( int time )
             QSpinBox spinh( 0, 24, 1,& hbox );
             QLabel lab4 ((" min:"), &hbox );
             QSpinBox spinm( 0, 59, 1,&hbox );
             spinh.setValue( mCustomMinutes/60 );
             spinm.setValue( mCustomMinutes%60 );
             lay.addWidget( &hbox);
             dia.resize( dia.sizeHint().width(), dia.sizeHint().height() );
             if ( !dia.exec() )
                 return;
             mCustomText = lEdit.text();
             mCustomMinutes = spinh.value()*60+spinm.value();
             if ( mCustomMinutes == 0 )
                 mCustomMinutes = 1;
             if ( mCustomMinutes > 1440 )
                 mCustomMinutes = 1440;
             mess += mCustomText;
             minutes = mCustomMinutes;
         }
         else
             mess+= QString::number ( minutes ) + ( " minutes are past!");
     }
     //minutes = 1;
     mRunningTimer = QDateTime::currentDateTime().addSecs( minutes * 60 );
     timerMesssage = mess;
     AlarmServer::addAlarm ( mRunningTimer,"koalarm",timerMesssage.latin1());
     mTimerTime = 1;
 }
 
 void SimpleAlarmDaemonImpl::writeFile()
 {
     QCopEnvelope e("QPE/Application/kopi", "-writeFile");
 }
 void SimpleAlarmDaemonImpl::showWN()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showWN");
 }
 void SimpleAlarmDaemonImpl::newTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newTodo");
 }
 
 void SimpleAlarmDaemonImpl::newEvent()
 {
     QCopEnvelope e("QPE/Application/kopi", "-newEvent");
 
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
- QCopEnvelope e("QPE/Application/kmpi", "newMail()");
+ QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
  QCopEnvelope e("QPE/Application/kapi", " ");
 }
 void SimpleAlarmDaemonImpl::ringSync()
 {
     QCopEnvelope e("QPE/Application/kopi", "-ringSync");
 
 }
 void SimpleAlarmDaemonImpl::newCountdown()
 {
     //recieve("cal_alarm", 10 );
 }
 void SimpleAlarmDaemonImpl::simulate()
 {
     writeFile();
     QString filename =  getenv("QPEDIR") ;
     filename += "/pics/kdepim/korganizer/koalarm.wav";
     startAlarm("Alarm simulation", filename );
 }
 void SimpleAlarmDaemonImpl::showKO()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showKO");
 
 }
 void SimpleAlarmDaemonImpl::showTodo()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showTodo");
 
 }
 void SimpleAlarmDaemonImpl::writeJournal()
 {
     QCopEnvelope e("QPE/Application/kopi", "-showJournal");
 
 }
 
 void SimpleAlarmDaemonImpl::mousePressEvent( QMouseEvent * )
 {
 
     mPopUp->popup(mapToGlobal(QPoint (0, -mPopUp->height() )));
 
 }
 
diff --git a/kdepim.control b/kdepim.control
index 56f9460..b0355a2 100644
--- a/kdepim.control
+++ b/kdepim.control
@@ -1,14 +1,14 @@
 Files: bin/kopi  bin/db2file bin/kapi apps/Pim/korganizer.desktop  apps/Pim/kaddressbook.desktop  pics/kdepim/* lib/libmicro* 
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.2a
+Version: 1.9.4
 License: GPL
 Depends:
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index 173b639..d894176 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,14 +1,14 @@
-Files:  bin/db2file lib/libmicro* 
+Files:  bin/db2file lib/libmicro* pics/kdepim/LICENCE.TXT
 
 Priority: optional
 Section: qpe/pim
 Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
 Version: 1.9.4
 License: GPL
 Depends:
 Description: KOrganizer/Pi and Kaddressbook/Pi
  The embedded version of KOrganizer/Platform-independend, 
     the KDE calendar and scheduling program
   optimized for 640x480 and 320x240 resolution
     on Zaurus PDA
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index f7604ad..14feeee 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -156,97 +156,97 @@ void ComposeMail::saveAsDraft()
 void  ComposeMail::clearStatus()
 {
     topLevelWidget()->setCaption( tr("Compose mail") );
 }
 void  ComposeMail::setStatus( QString status )
 {
     topLevelWidget()->setCaption( status );
     QTimer::singleShot ( 10000, this, SLOT( clearStatus() ) ) ;
 }
 void ComposeMail::pickAddress( )
 {
 
     QLineEdit *line = mPickLineEdit;
     if ( line == 0 )
         return;
 #ifdef DESKTOP_VERSION
     //qDebug(" ComposeMail::pickAddress ");
     QString names ;//= AddressPicker::getNames();
 
     KABC::Addressee::List list = KABC::AddresseeDialog::getAddressees(this);
     uint i=0;
     for (i=0; i < list.count(); i++) {
         if ( !list[i].preferredEmail().isEmpty()) {
             if ( ! names.isEmpty() )
                 names+= ",";
             names+=  "\""+list[i].realName() +"\"<" +list[i].preferredEmail() +">";
           
         }
     }
 
 
     if ( line->text().isEmpty() ) {
         line->setText( names );
     } else if ( !names.isEmpty() ) {
         line->setText( line->text() + ", " + names );
     }
 #else
     bool res = ExternalAppHandler::instance()->requestNameEmailUidListFromKAPI("QPE/Application/ompi", this->name() /* name is here the unique uid*/);
     // the result should now arrive through method insertAttendees
 #endif
 }
 //the map includes name/email pairs, that comes from Ka/Pi
 void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList)
 {
     qDebug("ComposeMail::insertAttendees ");
     raise();
 
     if ( mPickLineEdit == 0 ) { //whoami received
-
+        qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn ");
         QString defmail = uidList[0];
         if (  emailList.count() == 0 )
             QMessageBox::information( 0, tr( "Hint" ),
                                       tr( "Please apply\n\"Set Who Am I\"\nin KA/Pi to get the from\nfield automatically filled out!\n" ),
                                       tr( "Ok" ) );
         if (defmail.length()!=0) {
             fromBox->insertItem(defmail);
         }
         QStringList::ConstIterator sit = emailList.begin();
         int pref = 0;
         for (;sit!=emailList.end();++sit) {
             if ( (*sit)==defmail)
                 continue;
             fromBox->insertItem((*sit));
         }
         senderNameEdit->setText(nameList[0]);
         return;
     }
     QString names ;
     QLineEdit *line = mPickLineEdit;
     if (uid == this->name())
         {
             for ( int i = 0; i < nameList.count(); i++)
                 {
                     QString _name = nameList[i];
                     QString _email = emailList[i];
                     QString _uid = uidList[i];
                     if ( ! _email.isEmpty() ) {
                         if ( ! names.isEmpty() )
                             names+= ",";
                         names+=  "\""+_name +"\"<" +_email +">";
                     }
                 }
         }
     if ( line->text().isEmpty() ) {
         line->setText( names );
     } else if ( !names.isEmpty() ) {
         line->setText( line->text() + ", " + names );
     }
 }
 
 void ComposeMail::setTo( const QString & to )
 {
     toLine->setText( to );
 }
 
 void ComposeMail::setSubject( const QString & subject )
 {
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index a3e1b86..65de770 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -2,60 +2,60 @@
 
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <libkdepim/externalapphandler.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qstring.h>
 #include <qwindowsstyle.h> 
 #include <qplatinumstyle.h> 
 #include <qsgistyle.h> 
 #endif
 #include "opiemail.h"
 #include <qdir.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include "mainwindow.h"
 
 using namespace Opie::Core;
 int main( int argc,  char **argv ) {  
 
 #ifndef DESKTOP_VERSION
     QPEApplication a( argc, argv );
     a.setKeepRunning ();
 #else
     QApplication a( argc, argv ); 
     QApplication::setStyle( new QPlatinumStyle ());
 #endif
 
     KGlobal::setAppName( "kmicromail" );
     QString fileName ;
 #ifndef DESKTOP_VERSION
     fileName = getenv("QPEDIR");
     if ( QApplication::desktop()->width() > 320 )
         KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/icons22/");
     else
         KGlobal::iconLoader()->setIconPath( fileName +"/pics/kdepim/kmicromail/");
 #else
     fileName  = qApp->applicationDirPath () + "/kdepim/kmicromail/";
     KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
 #endif 
     KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kmicromail")));
     OpieMail  mw;
 #ifndef DESKTOP_VERSION
     //qDebug("CONNECT ");
     QObject::connect( &a, SIGNAL (appMessage ( const QCString &, const QByteArray & )),&mw, SLOT(message(  const QCString&, const QByteArray& ))); 
-    QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
+    // QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
     a.showMainWidget(&mw );
 #else
     a.setMainWidget(&mw );
     mw.show();
     //m.resize( 800, 600 );
     QObject::connect(&a, SIGNAL(lastWindowClosed()), &a, SLOT(quit()));
 #endif
     int rv = a.exec(); 
     return rv; 
    
 }
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3e560c5..a1c5645 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,130 +1,133 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // CHANGED 2004-08-06 Lutz Rogowski
 
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 
 #include <qmessagebox.h>
+#include <libkdepim/externalapphandler.h>
 
 #include <qpe/qpeapplication.h>
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 /* OPIE */
 //#include <qpe/resource.h>
 //#include <qpe/qpeapplication.h>
 
 /* QT */
 
 using namespace Opie::Core;
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
     : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
   
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     
 }
 #include <stdlib.h>
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     static int ii = 0;
-
+    qDebug("call ############################# %d ", ii);
     // block second call
     if ( ii < 2 ) {
-        ++ii;
+        //++ii;
         if ( ii > 1 ) {
             qDebug("qcop call blocked ");
-            return;
+            //return;
         }
     }
+    ++ii;
     //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this);
     if (msg == "writeMail(QString,QString)")
     {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
         // removing the whitespaces at beginning and end is needed!
         slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
     }
     else if (msg == "newMail()")
     {
         slotComposeMail();
     }
     else if (msg == "newMail(QString)")
     {
         QDataStream stream(data,IO_ReadOnly);
         QString nameemail;
         stream >> nameemail;
         // the format is 
         //  NAME <EMAIL>:SUBJECT
         //qDebug("message %s ", nameemail.latin1());
  
         slotwriteMail2( nameemail  );
-    }
+    } else
+         ExternalAppHandler::instance()->appMessage ( msg, data);
 }
 void OpieMail::slotwriteMail2(const QString& namemail )
 {
     // qDebug("OpieMail::slotwriteMail2 ");
     qApp->processEvents();
      ComposeMail compose( settings, this, 0, true );
     if ( !namemail.isEmpty() ) {
         QString to = namemail;
         if ( namemail.find( " <") > 1 ) {
             to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
         } else 
         if ( namemail.find( "<") > 1 ) {
             to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
         }
         int sub = to.find( ">:");
         if ( sub > 0 ) {
             compose.setTo( to.left(sub+1)  );
             compose.setSubject( to.mid(sub+2) );
         } else
             compose.setTo( to );
      }
     compose.slotAdjustColumns();
     compose.showMaximized();
     compose.exec();
     raise();
     //qDebug("retttich ");
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
     // qDebug("OpieMail::slotwriteMail ");
     ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
     if (!email.isEmpty())
     {
         if (!name.isEmpty())
         {
             compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
         }
         else
         {
             compose.setTo(email);
         }
     }
     compose.slotAdjustColumns();
     compose.showMaximized();
     compose.exec();
 }
 
 void OpieMail::slotComposeMail()