4 files changed, 219 insertions, 337 deletions
diff --git a/Makefile b/Makefile
index 6a8521f..93437e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,338 +1,171 @@
-export KDEPIMDIR = $(shell pwd)
+#############################################################################
+# Makefile for building: kdepim-desktop
-export KDEPIM_VERSION=$(shell sed -e 's/.*\"\([0-9]*\.[0-9]*\.[0-9]*\).*/\1/' < version)
+# Generated by qmake (1.07a) (Qt 3.3.3) on: Sat Oct 16 22:32:03 2004
+# Project:  kdepim-desktop.pro
-ifeq ($(PLATFORM) , zaurus)
+# Template: subdirs
-  BUILD_NO_LDAP_PLUGIN=1
+# Command: $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
-endif
+#############################################################################
-ifneq ($(PLATFORM) , zaurus)
+        MAKEFILE =Makefile
-  BUILD_NO_SHARP_PLUGIN=1
+        QMAKE    =qmake
-endif
+DEL_FILE =    rm -f
+CHK_DIR_EXISTS= test -d
-SUBDIRS_MICROKDE = \
+MKDIR    = mkdir -p
-   libical/src/libical \
+INSTALL_FILE= 
-   libical/src/libicalss \
+INSTALL_DIR = 
-   qtcompat \
+        SUBTARGETS = \
-   microkde \
+                sub-gammu-emb-common \
-   libkcal \
+                sub-gammu-emb-gammu \
-   libkdepim \
+                sub-libical \
-   kabc \
+                sub-libkcal \
-   kabc/formats/binary \
+                sub-microkde \
-   kabc/plugins/file \
+                sub-libkdepim \
-   kabc/plugins/dir \
+                sub-kabc \
-   korganizer \
+                sub-korganizer \
-   kalarmd \
+                sub-kaddressbook \
-   kaddressbook
+                sub-kabc-plugins-file \
+                sub-kabc-plugins-dir
-SUBDIRS_QTOPIA_PLUGIN = \
-   kabc/plugins/qtopia
+first: all
-SUBDIRS_OPIE_PLUGIN = \
+all: Makefile $(SUBTARGETS)
-   kabc/plugins/opie
+gammu/emb/common/$(MAKEFILE): 
-SUBDIRS_SHARP_PLUGIN = \
+        @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
-   kabc/plugins/sharpdtm
+        cd gammu/emb/common && $(QMAKE) common.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
-SUBDIRS_LDAP_PLUGIN = \
+        cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
-   kabc/plugins/ldap
+gammu/emb/gammu/$(MAKEFILE): 
-SUBDIRS_MICROMAIL = \
+        @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
-   kmicromail/libetpan \
+        cd gammu/emb/gammu && $(QMAKE) gammu.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-   kmicromail/libmailwrapper \
+sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
-   kmicromail
+        cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
-SUBDIRS_GAMMU = \
+libical/$(MAKEFILE): 
-   gammu/emb/common \
+        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
-   gammu/emb/gammu
+        cd libical && $(QMAKE) libical.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-libical: libical/$(MAKEFILE) FORCE
-SUBDIRS_PWMANAGER = \
+        cd libical && $(MAKE) -f $(MAKEFILE)
-   pwmanager/pwmanager
+libkcal/$(MAKEFILE): 
-SUBDIRS = \
+        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
-   $(SUBDIRS_MICROKDE) \
+        cd libkcal && $(QMAKE) libkcal.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-   $(SUBDIRS_QTOPIA_PLUGIN) \
+sub-libkcal: libkcal/$(MAKEFILE) FORCE
-   $(SUBDIRS_OPIE_PLUGIN) \
+        cd libkcal && $(MAKE) -f $(MAKEFILE)
-   $(SUBDIRS_SHARP_PLUGIN) \
-   $(SUBDIRS_LDAP_PLUGIN) \
+microkde/$(MAKEFILE): 
-   $(SUBDIRS_MICROMAIL) \
+        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
-   $(SUBDIRS_GAMMU) \
+        cd microkde && $(QMAKE) microkde.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-   $(SUBDIRS_PWMANAGER) 
+sub-microkde: microkde/$(MAKEFILE) FORCE
+        cd microkde && $(MAKE) -f $(MAKEFILE)
-all: build_microkde \
+libkdepim/$(MAKEFILE): 
-     build_qtopia_plugin \
+        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
-     build_opie_plugin \
+        cd libkdepim && $(QMAKE) libkdepim.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-     build_sharp_plugin \
+sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
-     build_ldap_plugin \
+        cd libkdepim && $(MAKE) -f $(MAKEFILE)
-     build_micromail \
-     build_gammu \
+kabc/$(MAKEFILE): 
-     build_pwmanager
+        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
+        cd kabc && $(QMAKE) kabc.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
+sub-kabc: kabc/$(MAKEFILE) FORCE
-build_microkde: variable_test tmake
+        cd kabc && $(MAKE) -f $(MAKEFILE)
-        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+korganizer/$(MAKEFILE): 
-          done
+        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+        cd korganizer && $(QMAKE) korganizer.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-build_qtopia_plugin: build_microkde
+sub-korganizer: korganizer/$(MAKEFILE) FORCE
-  ifdef BUILD_NO_QTOPIA_PLUGIN
+        cd korganizer && $(MAKE) -f $(MAKEFILE)
-        @echo == qtopia plugin not build.
-  else
+kaddressbook/$(MAKEFILE): 
-        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
+        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd kaddressbook && $(QMAKE) kaddressbook.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-          done
+sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-  endif
+        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
-build_opie_plugin: build_microkde
+kabc/plugins/file/$(MAKEFILE): 
-  ifdef BUILD_NO_OPIE_PLUGIN
+        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-        @echo == opie plugin not build.
+        cd kabc/plugins/file && $(QMAKE) file.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-  else
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
+kabc/plugins/dir/$(MAKEFILE): 
-  endif
+        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
+        cd kabc/plugins/dir && $(QMAKE) dir.pro "CONFIG+=thread" "CONFIG+=debug" -o $(MAKEFILE)
-build_sharp_plugin: build_microkde
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-  ifdef BUILD_NO_SHARP_PLUGIN
+        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-        @echo == ldap plugin not build.
-  else
+Makefile: kdepim-desktop.pro  /usr/local/qtgcc/mkspecs/default/qmake.conf 
-        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+        $(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+qmake: qmake_all
-          done
+        @$(QMAKE) "CONFIG+=thread" "CONFIG+=debug" -o Makefile kdepim-desktop.pro
-  endif
-  
+all: $(SUBTARGETS)
-build_ldap_plugin: build_microkde
+qmake_all: gammu/emb/common/$(MAKEFILE) gammu/emb/gammu/$(MAKEFILE) libical/$(MAKEFILE) libkcal/$(MAKEFILE) microkde/$(MAKEFILE) libkdepim/$(MAKEFILE) kabc/$(MAKEFILE) korganizer/$(MAKEFILE) kaddressbook/$(MAKEFILE) kabc/plugins/file/$(MAKEFILE) kabc/plugins/dir/$(MAKEFILE)
-  ifdef BUILD_NO_LDAP_PLUGIN
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo == ldap plugin not build.
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  else
+         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-            make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          done
+         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  endif
+         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
+         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-build_micromail: build_microkde
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  ifdef BUILD_NO_MICROMAIL
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo == kmicromail not build.
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
-  else
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-          done
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-build_gammu: variable_test tmake
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_GAMMU
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo == gammu not build.
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  else
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+uninstall_subdirs: qmake_all FORCE
-          done
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-build_pwmanager: build_microkde
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_PWMANAGER
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo == pwmanager not build.
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  else
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-          done
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+install_subdirs: qmake_all FORCE
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
-variable_info:
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo --------------------------------------
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo KDEPIM buildsystem, variableinfo...
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo KDEPIMDIR=$(KDEPIMDIR)
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo QTDIR=$(QTDIR)
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo QPEDIR=$(QPEDIR)
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo OPIEDIR=$(OPIEDIR)
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo PLATFORM=$(PLATFORM)
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+distclean: qmake_all FORCE
-        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        ifndef BUILD_NO_SHARP_PLUGIN
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo SHARPDTMSDK=$(SHARPDTMSDK)
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        endif
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo --------------------------------------
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-variable_test: variable_info
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo KDEPIM buildsystem, variablecheck...
-  ifndef KDEPIMDIR
+install:  install_subdirs
-        @echo KDEPIMDIR is not defined.
-        $(error KDEPIMDIR is not defined)
+uninstall:  uninstall_subdirs
-  endif
-  ifndef PLATFORM
+FORCE:
-        @echo PLATFORM is not defined.
-        $(error PLATFORM is not defined)
-  endif
-  ifdef BUILD_NO_LDAP_PLUGIN
-        @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN)
-  endif
-  ifdef BUILD_NO_OPIE_PLUGIN
-        @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN)
-  endif
-  ifdef BUILD_NO_QTOPIA_PLUGIN
-        @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN)
-  endif
-  ifdef BUILD_NO_MICROMAIL
-        @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL)
-  endif
-  ifdef BUILD_NO_SHARP_PLUGIN
-        @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN)
-  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
-  ifdef BUILD_NO_PWMANAGER
-        @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
-  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
-        mkdir -p libical/lib/$(PLATFORM)
-clean:
-        rm -rf libical/lib/$(PLATFORM)/*;
-        for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
-          rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
-          done 
-install:
-        cd bin/kdepim; make install
-        cp -r Pim $(QPEDIR)/apps
-        cp db2file/db2file $(QPEDIR)/bin/db2file
-        cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
-        cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
-        cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
-        cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
-    
-dist: 
-        @echo Dont forget to do "make install" before "make dist"
-        rm -f *arm.ipk
-        rm -f *~
-        cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
-        ./mkipks kmicrokdelibs.control
-        ./mkipks korganizer.control
-        ./mkipks kaddressbook.control
-  ifndef BUILD_NO_MICROMAIL
-        ./mkipks kopiemail.control
-  endif
-        ./mkipks korganizer-alarm.control
-  ifndef BUILD_NO_GAMMU
-        ./mkipks phoneaccess.control
-  endif
-  ifndef BUILD_NO_PWMANAGER
-        ./mkipks pwmanager.control
-  endif
-        ./mkipks pim_TAB_icon.control
-tmake: objects \
-       qtcompat/Makefile$(PLATFORM) \
-       microkde/Makefile$(PLATFORM) \
-       libkcal/Makefile$(PLATFORM) \
-       libkdepim/Makefile$(PLATFORM) \
-       korganizer/Makefile$(PLATFORM) \
-       kalarmd/Makefile$(PLATFORM) \
-       libical/src/libical/Makefile$(PLATFORM) \
-       libical/src/libicalss/Makefile$(PLATFORM) \
-       kabc/Makefile$(PLATFORM) \
-       kabc/formats/binary/Makefile$(PLATFORM) \
-       kabc/plugins/file/Makefile$(PLATFORM) \
-       kabc/plugins/dir/Makefile$(PLATFORM) \
-       kabc/plugins/ldap/Makefile$(PLATFORM) \
-       kabc/plugins/opie/Makefile$(PLATFORM) \
-       kabc/plugins/qtopia/Makefile$(PLATFORM) \
-       kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
-       kaddressbook/Makefile$(PLATFORM) \
-       kmicromail/Makefile$(PLATFORM) \
-       kmicromail/libetpan/Makefile$(PLATFORM) \
-       kmicromail/libmailwrapper/Makefile$(PLATFORM) \
-       gammu/emb/common/Makefile$(PLATFORM) \
-       gammu/emb/gammu/Makefile$(PLATFORM) \
-       pwmanager/pwmanager/Makefile$(PLATFORM) \
-qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
-        cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
-microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
-        cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
-libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
-        cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
-libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
-        cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
-kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
-        cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
-korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
-        cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
-libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
-        cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
-libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
-        cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
-kabc/Makefile$(PLATFORM): kabc/kabcE.pro
-        cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM)
-kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro
-        cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM)
-kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro
-        cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM)
-kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro
-        cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM)
-kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro
-        cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM)
-kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro
-        cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM)
-kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
-        cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM)
-kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
-        cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
-kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
-        cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
-kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
-        cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
-kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
-        cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
-kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
-        cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
-gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
-        cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
-gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
-        cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
-pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
-        cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
diff --git a/kde2file/caldump/main.cpp b/kde2file/caldump/main.cpp
index 95ae29e..76bfad3 100644
--- a/kde2file/caldump/main.cpp
+++ b/kde2file/caldump/main.cpp
@@ -66,139 +66,143 @@ static const char progDisplay[] = "KDE_Calendar";
 static const char progVersion[] = "33.1/3";
 static const char progDesc[] = "A command line interface to KDE calendars";
 static KCmdLineOptions options[] =
    {
        { "dump",
          I18N_NOOP( "Dumps calendar" ), 0 },
        { "read",
          I18N_NOOP( "Reads calendar" ), 0 },
        KCmdLineLastOption
    };
 int main( int argc, char *argv[] )
 {
    KAboutData aboutData(
                         progName,                        // internal program name
                         I18N_NOOP( progDisplay ),        // displayable program name.
                         progVersion,                     // version string
                         I18N_NOOP( progDesc ),           // short porgram description
                         KAboutData::License_GPL,         // license type
                         "(c) 2004, Lutz Rogowski", // copyright statement
                         0,                               // any free form text
                         "",                         // program home page address
                         "bugs.kde.org"                   // bug report email address
                         );
    // KCmdLineArgs::init() final 'true' argument indicates no commandline options
    // for QApplication/KApplication (no KDE or Qt options)
    KCmdLineArgs::init( argc, argv, &aboutData, true );
    KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
    KInstance ins  ( progName );
    KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
    bool read = false;
    if ( args->isSet( "read" ) ) {
        read = true;
        qDebug("read ");
    }
    CalendarResources *calendarResource = 0;
    CalendarLocal *localCalendar = 0;
    calendarResource = new CalendarResources( "" );
    calendarResource->readConfig();
    calendarResource->load();
    qDebug("************************************* ");
    qDebug("************************************* ");
    qDebug("************************************* ");
    qDebug("Using timezone id: %s", calendarResource->timeZoneId().latin1());
    if ( !read ) {
        localCalendar = new CalendarLocal();
        localCalendar->setTimeZoneId( calendarResource->timeZoneId());
        KCal::Incidence::List  allInc = calendarResource->rawIncidences();
        Incidence::List::ConstIterator it;
        int num = 0;
        for( it = allInc.begin(); it != allInc.end(); ++it ) {
            ResourceCalendar * re = calendarResource->resource( (*it) );
            if ( re && !re->readOnly() ) {
                ++num;
                Incidence* cl = (*it)->clone();
+                cl->setLastModified( (*it)->lastModified() );
                if ( cl->type() == "Journal" )
                    localCalendar->addJournal( (Journal *) cl  );
                else if ( cl->type() == "Todo" )
                    localCalendar->addTodo( (Todo *) cl );
                else if ( cl->type() == "Event" )
                    localCalendar->addEvent( (Event *) cl );
            }
        }
  
        FileStorage* storage = new FileStorage( calendarResource );
        storage->setFileName( "/tmp/kdedumpall.ics" );
        storage->setSaveFormat( new ICalFormat() );
        storage->save();
        delete storage;
        qDebug("************************************* ");
        qDebug("************************************* ");
        qDebug("************************************* ");
        qDebug("%d calendar entries dumped to file /tmp/kdedumpall.ics", num);
    } else {
        localCalendar = new CalendarLocal();
        localCalendar->setTimeZoneId( calendarResource->timeZoneId());
        FileStorage* storage = new FileStorage( localCalendar );
        storage->setFileName( "/tmp/kdedumpall.ics" );
        int num = 0;
        int del = 0;
        if ( storage->load() ) {
            KCal::Incidence::List  allInc = calendarResource->rawIncidences();
            KCal::Incidence::List  newInc = localCalendar->rawIncidences();
            Incidence::List::ConstIterator it;
            for( it = allInc.begin(); it != allInc.end(); ++it ) {
                ResourceCalendar * re = calendarResource->resource( (*it) );
                if ( re && !re->readOnly() ) {
                    Incidence* cl = localCalendar->incidence( (*it)->uid() );
                    if ( cl ) {
+                        QDateTime lm = cl->lastModified();
                        cl->setResources( (*it)->resources() );
+                        cl->setLastModified(lm);
                    } 
                    ++del; 
                    cl = (*it);
                    if ( cl->type() == "Journal" )
                        calendarResource->deleteJournal( (Journal *) cl  );
                    else if ( cl->type() == "Todo" )
                        calendarResource->deleteTodo( (Todo *) cl );
                    else if ( cl->type() == "Event" )
                        calendarResource->deleteEvent( (Event *) cl );
                }
            }
            for( it = newInc.begin(); it != newInc.end(); ++it ) {
                Incidence* cl = (*it)->clone();
                ++num;
                calendarResource->addIncidence( cl );
+                //cl->setLastModified( (*it)->lastModified() );
            }
            calendarResource->save();
            qDebug("************************************* ");
            qDebug("************************************* ");
            qDebug("************************************* ");
            qDebug("%d calendar entries deleted/ %d added from file /tmp/kdedumpall.ics", del, num);
            
        } else
            qDebug("error loading file /tmp/kdedumpall.ics");
    }
    if ( localCalendar ) {
        localCalendar->close();
        delete localCalendar;
    }
    if ( calendarResource ) {
        calendarResource->close();
        delete calendarResource;
    }
    qDebug("ente ");
    return 0;
 }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 5175f94..7ee56e4 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -38,216 +38,230 @@
 #include <qprogressbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qdialog.h>
 #include <qlayout.h>
 #include <qtextcodec.h>
 #include <qlabel.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <kfiledialog.h>
 KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu)
    : QObject(), mParent(parent), mImplementation(implementation), mTargetApp(ta), mPrefs(prefs ),mSyncMenu(syncmenu)
 {
    mServerSocket = 0;
    bar = new QProgressBar ( 1, 0 );
    bar->setCaption ("");
    
    int w = 300;
    if ( QApplication::desktop()->width() < 320 )
        w = 220;
    int h = bar->sizeHint().height() ;
    int dw = QApplication::desktop()->width();
    int dh = QApplication::desktop()->height();
    bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
 }
 KSyncManager::~KSyncManager()
 {
    delete bar;
 }
 void KSyncManager::fillSyncMenu()
 {
    if ( mSyncMenu->count() )
        mSyncMenu->clear();
    
    mSyncMenu->insertItem( i18n("Configure..."), 0 );
    mSyncMenu->insertSeparator();
    if ( mServerSocket == 0 ) {
        mSyncMenu->insertItem( i18n("Enable Pi-Sync"), 2 );
    } else {
        mSyncMenu->insertItem( i18n("Disable Pi-Sync"), 3 );
    }
    mSyncMenu->insertSeparator();
    mSyncMenu->insertItem( i18n("Multiple sync"), 1 );
    mSyncMenu->insertSeparator();
    
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    config.setGroup("General");
    QStringList prof = config.readListEntry("SyncProfileNames");
    mLocalMachineName = config.readEntry("LocalMachineName","undefined");
    if ( prof.count() < 2 ) {
        prof.clear();
+#ifdef DESKTOP_VERSION
+#ifdef _WIN32_
+        prof << i18n("OutLook(not_implemented)");
+#else
+        prof << i18n("KDE_Desktop");
+#endif
+#else
        prof << i18n("Sharp_DTM");
+#endif
        prof << i18n("Local_file");
        prof << i18n("Last_file");
        KSyncProfile* temp = new KSyncProfile ();
        temp->setName( prof[0] );
        temp->writeConfig(&config);
        temp->setName( prof[1] );
        temp->writeConfig(&config);
        temp->setName( prof[2] );
        temp->writeConfig(&config);
        config.setGroup("General");
        config.writeEntry("SyncProfileNames",prof);
        config.writeEntry("ExternSyncProfiles","Sharp_DTM");
        config.sync();
        delete temp;
    }
    mExternSyncProfiles = config.readListEntry("ExternSyncProfiles");
    mSyncProfileNames = prof;
    unsigned int i;
    for ( i = 0; i < prof.count(); ++i ) {
        mSyncMenu->insertItem(  prof[i], 1000+i );
        if ( i == 2 )
            mSyncMenu->insertSeparator();
    }
    QDir app_dir;
    //US do not display SharpDTM if app is pwmpi, or no sharpfiles available
    if ( mTargetApp == PWMPI) {
        mSyncMenu->removeItem( 1000 );
    }
+#ifndef DESKTOP_VERSION
    else if (!app_dir.exists(QDir::homeDirPath()+"/Applications/dtm" ) ) {
        mSyncMenu->removeItem( 1000 );
    }
+#endif
    mSyncMenu->removeItem( 1002 );
 }
 void KSyncManager::slotSyncMenu( int action )
 {
    //qDebug("syncaction %d ", action);
    if ( action == 0 ) {
        // seems to be a Qt2 event handling bug
        // syncmenu.clear causes a segfault at first time
        // when we call it after the main event loop, it is ok
        // same behaviour when calling OM/Pi via QCOP for the first time
        QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); 
        //confSync();
        return;
    }
    if ( action == 1 ) {
        multiSync( true );
        return;
    }
    if ( action == 2 ) {
        enableQuick();
        QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
        return;
    }
    if ( action == 3 ) {
        delete mServerSocket;
        mServerSocket = 0;
        QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
        return;
    }
    if (blockSave())
        return;
    setBlockSave(true);
    mCurrentSyncProfile = action - 1000 ;
    mCurrentSyncDevice = mSyncProfileNames[mCurrentSyncProfile] ;
    mCurrentSyncName =  mLocalMachineName ;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    KSyncProfile* temp = new KSyncProfile ();
    temp->setName(mSyncProfileNames[mCurrentSyncProfile]);
    temp->readConfig(&config);
    mAskForPreferences = temp->getAskForPreferences();
    mSyncAlgoPrefs = temp->getSyncPrefs();
    mWriteBackFile = temp->getWriteBackFile();
    mWriteBackExistingOnly = temp->getWriteBackExisting();
    mIsKapiFile = temp->getIsKapiFile();
    mWriteBackInFuture = 0;
    if ( temp->getWriteBackFuture() )
        mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
    mShowSyncSummary = temp->getShowSummaryAfterSync();
    if ( action == 1000  ) {
+#ifdef DESKTOP_VERSION
+        syncKDE();
+#else
        syncSharp();
+#endif
    
    } else if ( action == 1001 ) {
        syncLocalFile();
    } else if ( action == 1002 ) {
        mWriteBackFile = false;
        mAskForPreferences = false;
        mShowSyncSummary = false; 
        mSyncAlgoPrefs = 3; 
        quickSyncLocalFile();
    } else if ( action >= 1003  ) {
        if ( temp->getIsLocalFileSync() ) {
            switch(mTargetApp)
                {
                case (KAPI):
                    if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                    break;
                case (KOPI):
                    if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                    break;
                case (PWMPI):
                    if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                        mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                    break;
                default:
                    qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
                    break;
              
                }
        } else {
            if (  temp->getIsPhoneSync() ) {
                mPhoneDevice = temp->getPhoneDevice( ) ;
                mPhoneConnection = temp->getPhoneConnection( );
                mPhoneModel = temp->getPhoneModel( );
                syncPhone();
            } else if (  temp->getIsPiSync() ) {
                if ( mTargetApp == KAPI ) {
                    mPassWordPiSync = temp->getRemotePwAB();
                    mActiveSyncPort = temp->getRemotePortAB();
                    mActiveSyncIP = temp->getRemoteIPAB();
                } else if ( mTargetApp == KOPI ) {
                    mPassWordPiSync = temp->getRemotePw();
                    mActiveSyncPort = temp->getRemotePort();
                    mActiveSyncIP = temp->getRemoteIP();
                } else  {
                    mPassWordPiSync = temp->getRemotePwPWM();
                    mActiveSyncPort = temp->getRemotePortPWM();
                    mActiveSyncIP = temp->getRemoteIPPWM();
                } 
                syncPi();
            } else
                syncRemote( temp );
        }
    }
    delete temp;
    setBlockSave(false);
 }
 void KSyncManager::enableQuick()
 {
@@ -680,128 +694,158 @@ void KSyncManager::edit_sync_options()
        ask.setChecked( true);
        break;
    case 4:
        f_loc.setChecked( true);
        break;
    case 5:
        f_rem.setChecked( true);
        break;
    case 6:
        // both.setChecked( true);
        break; 
    default:
        break;
    }
    if ( dia.exec() ) {
        mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+  ask.isChecked()*3+  f_loc.isChecked()*4+  f_rem.isChecked()*5;//+  both.isChecked()*6 ;
    }
   
 }
 QString  KSyncManager::getPassword( )
 {
    QString retfile = "";
    QDialog dia ( mParent, "input-dialog", true );
    QLineEdit lab ( &dia );
    lab.setEchoMode( QLineEdit::Password );
    QVBoxLayout lay( &dia );
    lay.setMargin(7);
    lay.setSpacing(7);
    lay.addWidget( &lab);
    dia.setFixedSize( 230,50 );
    dia.setCaption( i18n("Enter password") );
    QPushButton pb ( "OK",  &dia);
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
    dia.show();
    int res = dia.exec();
    if ( res )
        retfile = lab.text();
    dia.hide();
    qApp->processEvents();
    return retfile;
 }
 void KSyncManager::confSync()
 { 
    static KSyncPrefsDialog* sp = 0;
    if ( ! sp ) {
        sp = new KSyncPrefsDialog( mParent, "syncprefs", true );
    }
    sp->usrReadConfig();
 #ifndef DESKTOP_VERSION
    sp->showMaximized();
 #else
    sp->show();
 #endif
    sp->exec();
    mSyncProfileNames = sp->getSyncProfileNames();
    mLocalMachineName = sp->getLocalMachineName ();
    QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); 
 }
+void KSyncManager::syncKDE()
+{
+    emit save();
+    switch(mTargetApp)
+        {
+        case (KAPI):
+            break;
+        case (KOPI):
+            {
+                QString command ="./kdecaldump"; 
+                system (  command.latin1());
+                    if ( syncWithFile( "/tmp/kdedumpall.ics",true ) ) {
+                        if ( mWriteBackFile ) {
+                            command += " --read";
+                            system (  command.latin1());
+                        }
+                    }
+                
+            }
+            break;
+        case (PWMPI):
+            break;
+        default:
+            qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
+            break;
+              
+        }
+}
 void KSyncManager::syncSharp()
 {
    if ( ! syncExternalApplication("sharp") )
        qDebug("ERROR sync sharp  ");
 }
 bool KSyncManager::syncExternalApplication(QString  resource)
 {
   
    emit save();
    if ( mAskForPreferences )
        edit_sync_options();
    qDebug("Sync extern %s", resource.latin1());
    bool syncOK = mImplementation->syncExternal(this, resource);
    return syncOK;
 }
 void KSyncManager::syncPhone()
 {
    syncExternalApplication("phone");
 }
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
    if (!bar->isVisible())
        {
            bar->setCaption (caption); 
            bar->setTotalSteps (  total  ) ;
            bar->show();
        }
    bar->setProgress( percentage );
 }
 void KSyncManager::hideProgressBar()
 {
    bar->hide();
 }
 bool KSyncManager::isProgressBarCanceled()
 {
    return !bar->isVisible();
 }
 QString KSyncManager::syncFileName()
 {
    QString fn = "tempfile";
    switch(mTargetApp)
        {
        case (KAPI):
            fn = "tempsyncab.vcf";
            break;
        case (KOPI):
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 9094aac..7d5b05e 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -109,101 +109,102 @@ class KSyncManager : public QObject
    enum TargetApp {
        KOPI = 0,
        KAPI = 1,
        PWMPI = 2 };
  
    KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
    ~KSyncManager() ;
    void multiSync( bool askforPrefs  );
    bool blockSave() { return mBlockSaveFlag; }
    void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
    void setDefaultFileName( QString s) { mDefFileName = s ;}
    QString defaultFileName() { return mDefFileName ;}
    QString syncFileName();
    QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
    QString getCurrentSyncName() { return mCurrentSyncName; }
    void showProgressBar(int percentage, QString caption = QString::null, int total=100);
    void hideProgressBar();
    bool isProgressBarCanceled();
    // sync stuff
    QString mLocalMachineName;
    QStringList  mExternSyncProfiles;
    QStringList  mSyncProfileNames;
    bool mAskForPreferences;
    bool mShowSyncSummary;
    bool mIsKapiFile;
    bool mWriteBackExistingOnly;
    int mSyncAlgoPrefs;
    bool mWriteBackFile;
    int  mWriteBackInFuture;
    QString mPhoneDevice;
    QString mPhoneConnection;
    QString mPhoneModel;
    QString mPassWordPiSync;
    QString mActiveSyncPort;
    QString mActiveSyncIP ;
 signals:
    void save();
    void request_file();
    void getFile( bool );
    public slots:
    void slotSyncMenu( int );
    void deleteCommandSocket(KCommandSocket*s, int state);
    void readFileFromSocket();
    void fillSyncMenu();
 private:
    void syncPi();
    KServerSocket * mServerSocket;
    void enableQuick();
    KPimPrefs* mPrefs;
    QString mDefFileName;
    QString mCurrentSyncDevice;
    QString mCurrentSyncName;
    void quickSyncLocalFile();
    bool syncWithFile( QString fn , bool quick );
    void syncLocalFile();
    void syncPhone();
    void syncSharp();
+    void syncKDE();
    bool syncExternalApplication(QString);
    int mCurrentSyncProfile ;
    void syncRemote( KSyncProfile* prof,  bool ask = true);
    void edit_sync_options();
    void edit_pisync_options();
    int ringSync();
    QString  getPassword( );
    private slots:
    void confSync();
 private:
    bool mBlockSaveFlag;
    QWidget* mParent;
    KSyncInterface* mImplementation;
    TargetApp mTargetApp; 
    QPopupMenu* mSyncMenu;
    QProgressBar* bar;
 };
 class KSyncInterface 
 { 
 public :
    virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
    virtual bool syncExternal(KSyncManager* manager, QString resource)
    {
        // empty implementation, because some syncable applications do not 
        // have an external(sharpdtm)  syncmode, like pwmanager.
        return false;
    }
   
 };
 #endif