Some fixes

8 files changed, 21 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 41976f3..2d0e855 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,7 @@ build_qtopia_plugin: build_microkde
 
 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; \
@@ -84,7 +84,7 @@ build_opie_plugin: build_microkde
   
 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; \
@@ -93,7 +93,7 @@ build_sharp_plugin: build_microkde
   
 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; \
@@ -103,7 +103,7 @@ build_ldap_plugin: build_microkde
 
 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; \
@@ -112,7 +112,7 @@ build_micromail: build_microkde
 
 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; \
@@ -166,6 +166,9 @@ variable_test: variable_info
         $(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 --------------------------------------
 
 
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 5cd9649..6538295 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -637,7 +637,7 @@ void KABCore::beamVCard(const QStringList& uids)
 #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 );
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 18e4299..4ff6861 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -560,7 +560,7 @@ void SimpleAlarmDaemonImpl::newEvent()
 }
 void SimpleAlarmDaemonImpl::newMail()
 {
- QCopEnvelope e("QPE/Application/kmpi", "newMail()");
+ QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
 void SimpleAlarmDaemonImpl::showAdd()
 {
diff --git a/kdepim.control b/kdepim.control
index 56f9460..b0355a2 100644
--- a/kdepim.control
+++ b/kdepim.control
@@ -4,7 +4,7 @@ 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
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index 173b639..d894176 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,4 +1,4 @@
-Files:  bin/db2file lib/libmicro* 
+Files:  bin/db2file lib/libmicro* pics/kdepim/LICENCE.TXT
 
 Priority: optional
 Section: qpe/pim
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index f7604ad..14feeee 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -201,7 +201,7 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
     raise();
 
     if ( mPickLineEdit == 0 ) { //whoami received
-
+        qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn ");
         QString defmail = uidList[0];
         if (  emailList.count() == 0 )
             QMessageBox::information( 0, tr( "Hint" ),
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index a3e1b86..65de770 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -47,7 +47,7 @@ int main( int argc,  char **argv ) {
 #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 );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3e560c5..a1c5645 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -11,6 +11,7 @@
 #include "selectsmtp.h"
 
 #include <qmessagebox.h>
+#include <libkdepim/externalapphandler.h>
 
 #include <qpe/qpeapplication.h>
 #include <libmailwrapper/smtpwrapper.h>
@@ -47,15 +48,16 @@ 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)")
     {
@@ -79,7 +81,8 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
         //qDebug("message %s ", nameemail.latin1());
  
         slotwriteMail2( nameemail  );
-    }
+    } else
+         ExternalAppHandler::instance()->appMessage ( msg, data);
 }
 void OpieMail::slotwriteMail2(const QString& namemail )
 {