Some fixes

8 files changed, 21 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 41976f3..2d0e855 100644
--- a/Makefile
+++ b/Makefile
@@ -77,3 +77,3 @@ build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
-        @echo ---> opie plugin not build.
+        @echo == opie plugin not build.
   else
@@ -86,3 +86,3 @@ build_sharp_plugin: build_microkde
   ifdef BUILD_NO_SHARP_PLUGIN
-        @echo ---> ldap plugin not build.
+        @echo == ldap plugin not build.
   else
@@ -95,3 +95,3 @@ build_ldap_plugin: build_microkde
   ifdef BUILD_NO_LDAP_PLUGIN
-        @echo ---> ldap plugin not build.
+        @echo == ldap plugin not build.
   else
@@ -105,3 +105,3 @@ build_micromail: build_microkde
   ifdef BUILD_NO_MICROMAIL
-        @echo ---> micromail not build.
+        @echo == kmicromail not build.
   else
@@ -114,3 +114,3 @@ build_gammu: variable_test tmake
   ifdef BUILD_NO_GAMMU
-        @echo ---> gammu not build.
+        @echo == gammu not build.
   else
@@ -168,2 +168,5 @@ variable_test: variable_info
   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
@@ -639,3 +639,3 @@ void KABCore::beamVCard(const QStringList& uids)
   //
-  QString fileName = "/tmp/kdepimbeamfile";
+  QString fileName = "/tmp/kapibeamfile.vcf";
 
diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp
index 18e4299..4ff6861 100644
--- a/kalarmd/simplealarmdaemonimpl.cpp
+++ b/kalarmd/simplealarmdaemonimpl.cpp
@@ -562,3 +562,3 @@ void SimpleAlarmDaemonImpl::newMail()
 {
- QCopEnvelope e("QPE/Application/kmpi", "newMail()");
+ QCopEnvelope e("QPE/Application/ompi", "newMail()");
 }
diff --git a/kdepim.control b/kdepim.control
index 56f9460..b0355a2 100644
--- a/kdepim.control
+++ b/kdepim.control
@@ -6,3 +6,3 @@ Maintainer: Lutz Rogowski <lutz@pi-sync.net>
 Architecture: arm
-Version: 1.9.2a
+Version: 1.9.4
 License: GPL
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index 173b639..d894176 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,2 +1,2 @@
-Files:  bin/db2file lib/libmicro* 
+Files:  bin/db2file lib/libmicro* pics/kdepim/LICENCE.TXT
 
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index f7604ad..14feeee 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -203,3 +203,3 @@ void  ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
     if ( mPickLineEdit == 0 ) { //whoami received
-
+        qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn ");
         QString defmail = uidList[0];
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index a3e1b86..65de770 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -49,3 +49,3 @@ int main( int argc,  char **argv ) {
     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 );
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3e560c5..a1c5645 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -13,2 +13,3 @@
 #include <qmessagebox.h>
+#include <libkdepim/externalapphandler.h>
 
@@ -49,11 +50,12 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
     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);
@@ -81,3 +83,4 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
         slotwriteMail2( nameemail  );
-    }
+    } else
+         ExternalAppHandler::instance()->appMessage ( msg, data);
 }