summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile13
-rw-r--r--kaddressbook/kabcore.cpp2
-rw-r--r--kalarmd/simplealarmdaemonimpl.cpp2
-rw-r--r--kdepim.control2
-rw-r--r--kmicrokdelibs.control2
-rw-r--r--kmicromail/composemail.cpp2
-rw-r--r--kmicromail/main.cpp2
-rw-r--r--kmicromail/opiemail.cpp11
8 files changed, 21 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 41976f3..2d0e855 100644
--- a/Makefile
+++ b/Makefile
@@ -76,5 +76,5 @@ 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; \
@@ -85,5 +85,5 @@ 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; \
@@ -94,5 +94,5 @@ 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; \
@@ -104,5 +104,5 @@ 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; \
@@ -113,5 +113,5 @@ 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; \
@@ -167,4 +167,7 @@ variable_test: variable_info
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
@@ -638,5 +638,5 @@ void KABCore::beamVCard(const QStringList& uids)
// LR: we should use the /tmp dir, because: /tmp = RAM, (HOME)/kdepim = flash memory
//
- 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
@@ -561,5 +561,5 @@ 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
@@ -5,5 +5,5 @@ Section: qpe/pim
Maintainer: Lutz Rogowski <lutz@pi-sync.net>
Architecture: arm
-Version: 1.9.2a
+Version: 1.9.4
License: GPL
Depends:
diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control
index 173b639..d894176 100644
--- a/kmicrokdelibs.control
+++ b/kmicrokdelibs.control
@@ -1,3 +1,3 @@
-Files: bin/db2file lib/libmicro*
+Files: bin/db2file lib/libmicro* pics/kdepim/LICENCE.TXT
Priority: optional
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index f7604ad..14feeee 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -202,5 +202,5 @@ void ComposeMail::insertAttendees(const QString& uid,const QStringList& nameLis
if ( mPickLineEdit == 0 ) { //whoami received
-
+ qDebug("returnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn ");
QString defmail = uidList[0];
if ( emailList.count() == 0 )
diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp
index a3e1b86..65de770 100644
--- a/kmicromail/main.cpp
+++ b/kmicromail/main.cpp
@@ -48,5 +48,5 @@ int main( int argc, char **argv ) {
//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
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3e560c5..a1c5645 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -12,4 +12,5 @@
#include <qmessagebox.h>
+#include <libkdepim/externalapphandler.h>
#include <qpe/qpeapplication.h>
@@ -48,13 +49,14 @@ 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)")
@@ -80,5 +82,6 @@ void OpieMail::message(const QCString &msg, const QByteArray &data)
slotwriteMail2( nameemail );
- }
+ } else
+ ExternalAppHandler::instance()->appMessage ( msg, data);
}
void OpieMail::slotwriteMail2(const QString& namemail )