summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--Makefile16
-rw-r--r--Makefile.Embedded16
-rw-r--r--libkdepim/ksyncmanager.cpp4
-rw-r--r--version2
4 files changed, 21 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 6a8521f..84f909e 100644
--- a/Makefile
+++ b/Makefile
@@ -223,26 +223,26 @@ install:
223 223
224dist: 224dist:
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
244tmake: objects \ 244tmake: 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) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 6a8521f..84f909e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -223,26 +223,26 @@ install:
223 223
224dist: 224dist:
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
244tmake: objects \ 244tmake: 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) \
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8851097..40d8e47 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -778,13 +778,17 @@ void KSyncManager::syncKDE()
778 { 778 {
779 case (KAPI): 779 case (KAPI):
780 780
781 break; 781 break;
782 case (KOPI): 782 case (KOPI):
783 { 783 {
784#ifdef DESKTOP_VERSION
784 QString command = qApp->applicationDirPath () + "/kdecaldump"; 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 ) {
diff --git a/version b/version
index f085278..de8a794 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.7"; version = "1.9.8";