| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 2 | ||||
| -rw-r--r-- | kalarmd/simplealarmdaemonimpl.cpp | 2 | ||||
| -rw-r--r-- | kdepim.control | 2 | ||||
| -rw-r--r-- | kmicrokdelibs.control | 2 | ||||
| -rw-r--r-- | kmicromail/composemail.cpp | 2 | ||||
| -rw-r--r-- | kmicromail/main.cpp | 2 | ||||
| -rw-r--r-- | kmicromail/opiemail.cpp | 11 |
8 files changed, 21 insertions, 15 deletions
@@ -72,50 +72,50 @@ 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 @@ -163,12 +163,15 @@ variable_test: variable_info 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 diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 5cd9649..6538295 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -634,13 +634,13 @@ void KABCore::beamVCard(const QStringList& uids) 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; diff --git a/kalarmd/simplealarmdaemonimpl.cpp b/kalarmd/simplealarmdaemonimpl.cpp index 18e4299..4ff6861 100644 --- a/kalarmd/simplealarmdaemonimpl.cpp +++ b/kalarmd/simplealarmdaemonimpl.cpp @@ -557,13 +557,13 @@ 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() diff --git a/kdepim.control b/kdepim.control index 56f9460..b0355a2 100644 --- a/kdepim.control +++ b/kdepim.control @@ -1,13 +1,13 @@ 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 diff --git a/kmicrokdelibs.control b/kmicrokdelibs.control index 173b639..d894176 100644 --- a/kmicrokdelibs.control +++ b/kmicrokdelibs.control @@ -1,7 +1,7 @@ -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 diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp index f7604ad..14feeee 100644 --- a/kmicromail/composemail.cpp +++ b/kmicromail/composemail.cpp @@ -198,13 +198,13 @@ void ComposeMail::pickAddress( ) 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) { diff --git a/kmicromail/main.cpp b/kmicromail/main.cpp index a3e1b86..65de770 100644 --- a/kmicromail/main.cpp +++ b/kmicromail/main.cpp @@ -44,13 +44,13 @@ int main( int argc, char **argv ) { #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())); diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 3e560c5..a1c5645 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp @@ -8,12 +8,13 @@ #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 */ @@ -44,21 +45,22 @@ 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; @@ -76,13 +78,14 @@ void OpieMail::message(const QCString &msg, const QByteArray &data) 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 ); |