summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2004-10-17 20:33:08 (UTC)
committer zautrix <zautrix>2004-10-17 20:33:08 (UTC)
commit50470fdeb0ed62f05ff6780607cc30a8e84ef5b1 (patch) (unidiff)
tree87fbffa1db9d979dbe9c2e018cd2bdc5d833823f
parent4220d587eb43d4117e5d5a8a8f0cb6e8381b5fbe (diff)
downloadkdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.zip
kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.gz
kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.bz2
compile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile16
-rw-r--r--Makefile.Embedded16
-rw-r--r--libkdepim/ksyncmanager.cpp6
-rw-r--r--version2
4 files changed, 22 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index 6a8521f..84f909e 100644
--- a/Makefile
+++ b/Makefile
@@ -205,62 +205,62 @@ objects:
205 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 205 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
206 mkdir -p libical/lib/$(PLATFORM) 206 mkdir -p libical/lib/$(PLATFORM)
207 207
208clean: 208clean:
209 rm -rf libical/lib/$(PLATFORM)/*; 209 rm -rf libical/lib/$(PLATFORM)/*;
210 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 210 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
211 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 211 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
212 done 212 done
213 213
214install: 214install:
215 215
216 cd bin/kdepim; make install 216 cd bin/kdepim; make 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
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) \
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) \
255 kabc/plugins/file/Makefile$(PLATFORM) \ 255 kabc/plugins/file/Makefile$(PLATFORM) \
256 kabc/plugins/dir/Makefile$(PLATFORM) \ 256 kabc/plugins/dir/Makefile$(PLATFORM) \
257 kabc/plugins/ldap/Makefile$(PLATFORM) \ 257 kabc/plugins/ldap/Makefile$(PLATFORM) \
258 kabc/plugins/opie/Makefile$(PLATFORM) \ 258 kabc/plugins/opie/Makefile$(PLATFORM) \
259 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 259 kabc/plugins/qtopia/Makefile$(PLATFORM) \
260 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 260 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
261 kaddressbook/Makefile$(PLATFORM) \ 261 kaddressbook/Makefile$(PLATFORM) \
262 kmicromail/Makefile$(PLATFORM) \ 262 kmicromail/Makefile$(PLATFORM) \
263 kmicromail/libetpan/Makefile$(PLATFORM) \ 263 kmicromail/libetpan/Makefile$(PLATFORM) \
264 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 264 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
265 gammu/emb/common/Makefile$(PLATFORM) \ 265 gammu/emb/common/Makefile$(PLATFORM) \
266 gammu/emb/gammu/Makefile$(PLATFORM) \ 266 gammu/emb/gammu/Makefile$(PLATFORM) \
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 6a8521f..84f909e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -205,62 +205,62 @@ objects:
205 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done 205 for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
206 mkdir -p libical/lib/$(PLATFORM) 206 mkdir -p libical/lib/$(PLATFORM)
207 207
208clean: 208clean:
209 rm -rf libical/lib/$(PLATFORM)/*; 209 rm -rf libical/lib/$(PLATFORM)/*;
210 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ 210 for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
211 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ 211 rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
212 done 212 done
213 213
214install: 214install:
215 215
216 cd bin/kdepim; make install 216 cd bin/kdepim; make 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
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) \
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) \
255 kabc/plugins/file/Makefile$(PLATFORM) \ 255 kabc/plugins/file/Makefile$(PLATFORM) \
256 kabc/plugins/dir/Makefile$(PLATFORM) \ 256 kabc/plugins/dir/Makefile$(PLATFORM) \
257 kabc/plugins/ldap/Makefile$(PLATFORM) \ 257 kabc/plugins/ldap/Makefile$(PLATFORM) \
258 kabc/plugins/opie/Makefile$(PLATFORM) \ 258 kabc/plugins/opie/Makefile$(PLATFORM) \
259 kabc/plugins/qtopia/Makefile$(PLATFORM) \ 259 kabc/plugins/qtopia/Makefile$(PLATFORM) \
260 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ 260 kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
261 kaddressbook/Makefile$(PLATFORM) \ 261 kaddressbook/Makefile$(PLATFORM) \
262 kmicromail/Makefile$(PLATFORM) \ 262 kmicromail/Makefile$(PLATFORM) \
263 kmicromail/libetpan/Makefile$(PLATFORM) \ 263 kmicromail/libetpan/Makefile$(PLATFORM) \
264 kmicromail/libmailwrapper/Makefile$(PLATFORM) \ 264 kmicromail/libmailwrapper/Makefile$(PLATFORM) \
265 gammu/emb/common/Makefile$(PLATFORM) \ 265 gammu/emb/common/Makefile$(PLATFORM) \
266 gammu/emb/gammu/Makefile$(PLATFORM) \ 266 gammu/emb/gammu/Makefile$(PLATFORM) \
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 8851097..40d8e47 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -760,49 +760,53 @@ void KSyncManager::confSync()
760 if ( ! sp ) { 760 if ( ! sp ) {
761 sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); 761 sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
762 } 762 }
763 sp->usrReadConfig(); 763 sp->usrReadConfig();
764#ifndef DESKTOP_VERSION 764#ifndef DESKTOP_VERSION
765 sp->showMaximized(); 765 sp->showMaximized();
766#else 766#else
767 sp->show(); 767 sp->show();
768#endif 768#endif
769 sp->exec(); 769 sp->exec();
770 mSyncProfileNames = sp->getSyncProfileNames(); 770 mSyncProfileNames = sp->getSyncProfileNames();
771 mLocalMachineName = sp->getLocalMachineName (); 771 mLocalMachineName = sp->getLocalMachineName ();
772 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 772 QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) );
773} 773}
774void KSyncManager::syncKDE() 774void 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 }
797 break; 801 break;
798 case (PWMPI): 802 case (PWMPI):
799 803
800 break; 804 break;
801 default: 805 default:
802 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); 806 qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
803 break; 807 break;
804 808
805 } 809 }
806} 810}
807 811
808void KSyncManager::syncSharp() 812void KSyncManager::syncSharp()
diff --git a/version b/version
index f085278..de8a794 100644
--- a/version
+++ b/version
@@ -1 +1 @@
version = "1.9.7"; version = "1.9.8";