-rw-r--r-- | Makefile | 16 | ||||
-rw-r--r-- | Makefile.Embedded | 16 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 6 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 22 insertions, 18 deletions
@@ -217,38 +217,38 @@ install: | |||
217 | cp -r Pim $(QPEDIR)/apps | 217 | cp -r Pim $(QPEDIR)/apps |
218 | cp db2file/db2file $(QPEDIR)/bin/db2file | 218 | cp db2file/db2file $(QPEDIR)/bin/db2file |
219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop |
222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop |
223 | 223 | ||
224 | dist: | 224 | dist: |
225 | @echo Dont forget to do "make install" before "make dist" | 225 | @echo Dont forget to do "make install" before "make dist" |
226 | rm -f *arm.ipk | 226 | rm -f *arm.ipk |
227 | rm -f *~ | 227 | rm -f *~ |
228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | 228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim |
229 | ./mkipks kmicrokdelibs.control | 229 | mkipks kmicrokdelibs.control |
230 | ./mkipks korganizer.control | 230 | mkipks korganizer.control |
231 | ./mkipks kaddressbook.control | 231 | mkipks kaddressbook.control |
232 | ifndef BUILD_NO_MICROMAIL | 232 | ifndef BUILD_NO_MICROMAIL |
233 | ./mkipks kopiemail.control | 233 | mkipks kopiemail.control |
234 | endif | 234 | endif |
235 | ./mkipks korganizer-alarm.control | 235 | mkipks korganizer-alarm.control |
236 | ifndef BUILD_NO_GAMMU | 236 | ifndef BUILD_NO_GAMMU |
237 | ./mkipks phoneaccess.control | 237 | mkipks phoneaccess.control |
238 | endif | 238 | endif |
239 | ifndef BUILD_NO_PWMANAGER | 239 | ifndef BUILD_NO_PWMANAGER |
240 | ./mkipks pwmanager.control | 240 | mkipks pwmanager.control |
241 | endif | 241 | endif |
242 | ./mkipks pim_TAB_icon.control | 242 | mkipks pim_TAB_icon.control |
243 | 243 | ||
244 | tmake: objects \ | 244 | tmake: objects \ |
245 | qtcompat/Makefile$(PLATFORM) \ | 245 | qtcompat/Makefile$(PLATFORM) \ |
246 | microkde/Makefile$(PLATFORM) \ | 246 | microkde/Makefile$(PLATFORM) \ |
247 | libkcal/Makefile$(PLATFORM) \ | 247 | libkcal/Makefile$(PLATFORM) \ |
248 | libkdepim/Makefile$(PLATFORM) \ | 248 | libkdepim/Makefile$(PLATFORM) \ |
249 | korganizer/Makefile$(PLATFORM) \ | 249 | korganizer/Makefile$(PLATFORM) \ |
250 | kalarmd/Makefile$(PLATFORM) \ | 250 | kalarmd/Makefile$(PLATFORM) \ |
251 | libical/src/libical/Makefile$(PLATFORM) \ | 251 | libical/src/libical/Makefile$(PLATFORM) \ |
252 | libical/src/libicalss/Makefile$(PLATFORM) \ | 252 | libical/src/libicalss/Makefile$(PLATFORM) \ |
253 | kabc/Makefile$(PLATFORM) \ | 253 | kabc/Makefile$(PLATFORM) \ |
254 | kabc/formats/binary/Makefile$(PLATFORM) \ | 254 | kabc/formats/binary/Makefile$(PLATFORM) \ |
diff --git a/Makefile.Embedded b/Makefile.Embedded index 6a8521f..84f909e 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded | |||
@@ -217,38 +217,38 @@ install: | |||
217 | cp -r Pim $(QPEDIR)/apps | 217 | cp -r Pim $(QPEDIR)/apps |
218 | cp db2file/db2file $(QPEDIR)/bin/db2file | 218 | cp db2file/db2file $(QPEDIR)/bin/db2file |
219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop |
222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop |
223 | 223 | ||
224 | dist: | 224 | dist: |
225 | @echo Dont forget to do "make install" before "make dist" | 225 | @echo Dont forget to do "make install" before "make dist" |
226 | rm -f *arm.ipk | 226 | rm -f *arm.ipk |
227 | rm -f *~ | 227 | rm -f *~ |
228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | 228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim |
229 | ./mkipks kmicrokdelibs.control | 229 | mkipks kmicrokdelibs.control |
230 | ./mkipks korganizer.control | 230 | mkipks korganizer.control |
231 | ./mkipks kaddressbook.control | 231 | mkipks kaddressbook.control |
232 | ifndef BUILD_NO_MICROMAIL | 232 | ifndef BUILD_NO_MICROMAIL |
233 | ./mkipks kopiemail.control | 233 | mkipks kopiemail.control |
234 | endif | 234 | endif |
235 | ./mkipks korganizer-alarm.control | 235 | mkipks korganizer-alarm.control |
236 | ifndef BUILD_NO_GAMMU | 236 | ifndef BUILD_NO_GAMMU |
237 | ./mkipks phoneaccess.control | 237 | mkipks phoneaccess.control |
238 | endif | 238 | endif |
239 | ifndef BUILD_NO_PWMANAGER | 239 | ifndef BUILD_NO_PWMANAGER |
240 | ./mkipks pwmanager.control | 240 | mkipks pwmanager.control |
241 | endif | 241 | endif |
242 | ./mkipks pim_TAB_icon.control | 242 | mkipks pim_TAB_icon.control |
243 | 243 | ||
244 | tmake: objects \ | 244 | tmake: objects \ |
245 | qtcompat/Makefile$(PLATFORM) \ | 245 | qtcompat/Makefile$(PLATFORM) \ |
246 | microkde/Makefile$(PLATFORM) \ | 246 | microkde/Makefile$(PLATFORM) \ |
247 | libkcal/Makefile$(PLATFORM) \ | 247 | libkcal/Makefile$(PLATFORM) \ |
248 | libkdepim/Makefile$(PLATFORM) \ | 248 | libkdepim/Makefile$(PLATFORM) \ |
249 | korganizer/Makefile$(PLATFORM) \ | 249 | korganizer/Makefile$(PLATFORM) \ |
250 | kalarmd/Makefile$(PLATFORM) \ | 250 | kalarmd/Makefile$(PLATFORM) \ |
251 | libical/src/libical/Makefile$(PLATFORM) \ | 251 | libical/src/libical/Makefile$(PLATFORM) \ |
252 | libical/src/libicalss/Makefile$(PLATFORM) \ | 252 | libical/src/libicalss/Makefile$(PLATFORM) \ |
253 | kabc/Makefile$(PLATFORM) \ | 253 | kabc/Makefile$(PLATFORM) \ |
254 | kabc/formats/binary/Makefile$(PLATFORM) \ | 254 | kabc/formats/binary/Makefile$(PLATFORM) \ |
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 8851097..40d8e47 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -772,25 +772,29 @@ void KSyncManager::confSync() | |||
772 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | 772 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); |
773 | } | 773 | } |
774 | void KSyncManager::syncKDE() | 774 | void KSyncManager::syncKDE() |
775 | { | 775 | { |
776 | emit save(); | 776 | emit save(); |
777 | switch(mTargetApp) | 777 | switch(mTargetApp) |
778 | { | 778 | { |
779 | case (KAPI): | 779 | case (KAPI): |
780 | 780 | ||
781 | break; | 781 | break; |
782 | case (KOPI): | 782 | case (KOPI): |
783 | { | 783 | { |
784 | QString command = qApp->applicationDirPath () + "/kdecaldump"; | 784 | #ifdef DESKTOP_VERSION |
785 | QString command = qApp->applicationDirPath () + "/kdecaldump"; | ||
786 | #else | ||
787 | QString command = "kdecaldump"; | ||
788 | #endif | ||
785 | if ( ! QFile::exists ( command ) ) | 789 | if ( ! QFile::exists ( command ) ) |
786 | command = "kdecaldump"; | 790 | command = "kdecaldump"; |
787 | QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; | 791 | QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; |
788 | system ( command.latin1()); | 792 | system ( command.latin1()); |
789 | if ( syncWithFile( fileName,true ) ) { | 793 | if ( syncWithFile( fileName,true ) ) { |
790 | if ( mWriteBackFile ) { | 794 | if ( mWriteBackFile ) { |
791 | command += " --read"; | 795 | command += " --read"; |
792 | system ( command.latin1()); | 796 | system ( command.latin1()); |
793 | } | 797 | } |
794 | } | 798 | } |
795 | 799 | ||
796 | } | 800 | } |
@@ -1 +1 @@ | |||
version = "1.9.7"; | version = "1.9.8"; | ||