4 files changed, 223 insertions, 381 deletions
diff --git a/Makefile b/Makefile
index 8c6110c..1e4b69d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,362 +1,169 @@
-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.1) on: Wed Oct 20 16:51:16 2004
+# Project:  kdepim-desktop.pro
-ifeq ($(PLATFORM) , zaurus)
+# Template: subdirs
-  BUILD_NO_LDAP_PLUGIN=1
+# Command: $(QMAKE) -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 \
+        SUBTARGETS = \
-   libical/src/libicalss \
+                sub-gammu-emb-common \
-   qtcompat \
+                sub-gammu-emb-gammu \
-   microkde \
+                sub-libical \
-   libkcal \
+                sub-libkcal \
-   libkdepim \
+                sub-microkde \
-   kabc \
+                sub-libkdepim \
-   kabc/formats/binary \
+                sub-kabc \
-   kabc/plugins/file \
+                sub-korganizer \
-   kabc/plugins/dir \
+                sub-kaddressbook \
-   korganizer \
+                sub-kabc-plugins-file \
-   kalarmd \
+                sub-kabc-plugins-dir
-   kaddressbook
+first: all
-SUBDIRS_QTOPIA_PLUGIN = \
-   kabc/plugins/qtopia
+all: Makefile $(SUBTARGETS)
-SUBDIRS_OPIE_PLUGIN = \
+gammu/emb/common/$(MAKEFILE): 
-   kabc/plugins/opie
+        @$(CHK_DIR_EXISTS) "gammu/emb/common" || $(MKDIR) "gammu/emb/common"
+        cd gammu/emb/common && $(QMAKE) common.pro -o $(MAKEFILE)
-SUBDIRS_SHARP_PLUGIN = \
+sub-gammu-emb-common: gammu/emb/common/$(MAKEFILE) FORCE
-   kabc/plugins/sharpdtm
+        cd gammu/emb/common && $(MAKE) -f $(MAKEFILE)
-SUBDIRS_LDAP_PLUGIN = \
+gammu/emb/gammu/$(MAKEFILE): 
-   kabc/plugins/ldap
+        @$(CHK_DIR_EXISTS) "gammu/emb/gammu" || $(MKDIR) "gammu/emb/gammu"
+        cd gammu/emb/gammu && $(QMAKE) gammu.pro -o $(MAKEFILE)
-SUBDIRS_MICROMAIL = \
+sub-gammu-emb-gammu: gammu/emb/gammu/$(MAKEFILE) FORCE
-   kmicromail/libetpan \
+        cd gammu/emb/gammu && $(MAKE) -f $(MAKEFILE)
-   kmicromail/libmailwrapper \
-   kmicromail
+libical/$(MAKEFILE): 
+        @$(CHK_DIR_EXISTS) "libical" || $(MKDIR) "libical"
-SUBDIRS_GAMMU = \
+        cd libical && $(QMAKE) libical.pro -o $(MAKEFILE)
-   gammu/emb/common \
+sub-libical: libical/$(MAKEFILE) FORCE
-   gammu/emb/gammu
+        cd libical && $(MAKE) -f $(MAKEFILE)
-SUBDIRS_PWMANAGER = \
+libkcal/$(MAKEFILE): 
-   pwmanager/libcrypt/mpi  \
+        @$(CHK_DIR_EXISTS) "libkcal" || $(MKDIR) "libkcal"
-   pwmanager/libcrypt/error  \
+        cd libkcal && $(QMAKE) libkcal.pro -o $(MAKEFILE)
-   pwmanager/libcrypt/cipher  \
+sub-libkcal: libkcal/$(MAKEFILE) FORCE
-   pwmanager/libcrypt/zlib \
+        cd libkcal && $(MAKE) -f $(MAKEFILE)
-   pwmanager/pwmanager
+microkde/$(MAKEFILE): 
-SUBDIRS = \
+        @$(CHK_DIR_EXISTS) "microkde" || $(MKDIR) "microkde"
-   $(SUBDIRS_MICROKDE) \
+        cd microkde && $(QMAKE) microkde.pro -o $(MAKEFILE)
-   $(SUBDIRS_QTOPIA_PLUGIN) \
+sub-microkde: microkde/$(MAKEFILE) FORCE
-   $(SUBDIRS_OPIE_PLUGIN) \
+        cd microkde && $(MAKE) -f $(MAKEFILE)
-   $(SUBDIRS_SHARP_PLUGIN) \
-   $(SUBDIRS_LDAP_PLUGIN) \
+libkdepim/$(MAKEFILE): 
-   $(SUBDIRS_MICROMAIL) \
+        @$(CHK_DIR_EXISTS) "libkdepim" || $(MKDIR) "libkdepim"
-   $(SUBDIRS_GAMMU) \
+        cd libkdepim && $(QMAKE) libkdepim.pro -o $(MAKEFILE)
-   $(SUBDIRS_PWMANAGER) 
+sub-libkdepim: libkdepim/$(MAKEFILE) FORCE
+        cd libkdepim && $(MAKE) -f $(MAKEFILE)
-all: build_microkde \
+kabc/$(MAKEFILE): 
-     build_qtopia_plugin \
+        @$(CHK_DIR_EXISTS) "kabc" || $(MKDIR) "kabc"
-     build_opie_plugin \
+        cd kabc && $(QMAKE) kabc.pro -o $(MAKEFILE)
-     build_sharp_plugin \
+sub-kabc: kabc/$(MAKEFILE) FORCE
-     build_ldap_plugin \
+        cd kabc && $(MAKE) -f $(MAKEFILE)
-     build_micromail \
-     build_gammu \
+korganizer/$(MAKEFILE): 
-     build_pwmanager
+        @$(CHK_DIR_EXISTS) "korganizer" || $(MKDIR) "korganizer"
+        cd korganizer && $(QMAKE) korganizer.pro -o $(MAKEFILE)
+sub-korganizer: korganizer/$(MAKEFILE) FORCE
-build_microkde: variable_test tmake
+        cd korganizer && $(MAKE) -f $(MAKEFILE)
-        for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+kaddressbook/$(MAKEFILE): 
-          done
+        @$(CHK_DIR_EXISTS) "kaddressbook" || $(MKDIR) "kaddressbook"
+        cd kaddressbook && $(QMAKE) kaddressbook.pro -o $(MAKEFILE)
-build_qtopia_plugin: build_microkde
+sub-kaddressbook: kaddressbook/$(MAKEFILE) FORCE
-  ifdef BUILD_NO_QTOPIA_PLUGIN
+        cd kaddressbook && $(MAKE) -f $(MAKEFILE)
-        @echo == qtopia plugin not build.
-  else
+kabc/plugins/file/$(MAKEFILE): 
-        for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
+        @$(CHK_DIR_EXISTS) "kabc/plugins/file" || $(MKDIR) "kabc/plugins/file"
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+        cd kabc/plugins/file && $(QMAKE) file.pro -o $(MAKEFILE)
-          done
+sub-kabc-plugins-file: kabc/plugins/file/$(MAKEFILE) FORCE
-  endif
+        cd kabc/plugins/file && $(MAKE) -f $(MAKEFILE)
-build_opie_plugin: build_microkde
+kabc/plugins/dir/$(MAKEFILE): 
-  ifdef BUILD_NO_OPIE_PLUGIN
+        @$(CHK_DIR_EXISTS) "kabc/plugins/dir" || $(MKDIR) "kabc/plugins/dir"
-        @echo == opie plugin not build.
+        cd kabc/plugins/dir && $(QMAKE) dir.pro -o $(MAKEFILE)
-  else
+sub-kabc-plugins-dir: kabc/plugins/dir/$(MAKEFILE) FORCE
-        for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \
+        cd kabc/plugins/dir && $(MAKE) -f $(MAKEFILE)
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
-          done
+Makefile: kdepim-desktop.pro  /usr/lib/qt3/mkspecs/default/qmake.conf 
-  endif
+        $(QMAKE) -o Makefile kdepim-desktop.pro
+qmake: qmake_all
-build_sharp_plugin: build_microkde
+        @$(QMAKE) -o Makefile kdepim-desktop.pro
-  ifdef BUILD_NO_SHARP_PLUGIN
-        @echo == ldap plugin not build.
+all: $(SUBTARGETS)
-  else
+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)
-        for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          done
+         ( [ -d libical ] && cd libical ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  endif
+         ( [ -d libkcal ] && cd libkcal ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  
+         ( [ -d microkde ] && cd microkde ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-build_ldap_plugin: build_microkde
+         ( [ -d libkdepim ] && cd libkdepim ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  ifdef BUILD_NO_LDAP_PLUGIN
+         ( [ -d kabc ] && cd kabc ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-        @echo == ldap plugin not build.
+         ( [ -d korganizer ] && cd korganizer ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-  else
+         ( [ -d kaddressbook ] && cd kaddressbook ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-            make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
-          done
+clean uicables mocables uiclean mocclean lexclean yaccclean : qmake_all FORCE
-  endif
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-build_micromail: build_microkde
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  ifdef BUILD_NO_MICROMAIL
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        @echo == kmicromail not build.
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  else
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-        for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-          done
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; ) || true
-  endif
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; ) || true
+uninstall_subdirs: qmake_all FORCE
-build_gammu: variable_test tmake
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_GAMMU
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo == gammu not build.
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  else
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        for i in $(SUBDIRS_GAMMU); do pushd $$i; \
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-          done
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  endif
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-build_pwmanager: build_microkde
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-  ifdef BUILD_NO_PWMANAGER
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) uninstall; ) || true
-        @echo == pwmanager not build.
+install_subdirs: qmake_all FORCE
-  else
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) install; ) || true
-          make -f Makefile$(PLATFORM) || exit 1; popd; \
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) install; ) || true
-          done
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) install; ) || true
-  endif
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) install; ) || true
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) install; ) || true
-variable_info:
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo --------------------------------------
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo KDEPIM buildsystem, variableinfo...
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo KDEPIMDIR=$(KDEPIMDIR)
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) install; ) || true
-        @echo QTDIR=$(QTDIR)
+distclean: qmake_all FORCE
-        @echo QPEDIR=$(QPEDIR)
+         ( [ -d gammu/emb/common ] && cd gammu/emb/common ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo OPIEDIR=$(OPIEDIR)
+         ( [ -d gammu/emb/gammu ] && cd gammu/emb/gammu ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo PLATFORM=$(PLATFORM)
+         ( [ -d libical ] && cd libical ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo RELEASE_DEBUG=$(RELEASE_DEBUG)
+         ( [ -d libkcal ] && cd libkcal ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL)
+         ( [ -d microkde ] && cd microkde ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN)
+         ( [ -d libkdepim ] && cd libkdepim ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN)
+         ( [ -d kabc ] && cd kabc ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN)
+         ( [ -d korganizer ] && cd korganizer ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN)
+         ( [ -d kaddressbook ] && cd kaddressbook ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        ifndef BUILD_NO_SHARP_PLUGIN
+         ( [ -d kabc/plugins/file ] && cd kabc/plugins/file ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        @echo SHARPDTMSDK=$(SHARPDTMSDK)
+         ( [ -d kabc/plugins/dir ] && cd kabc/plugins/dir ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
-        endif
-        @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU)
+install:  install_subdirs
-        @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER)
-        @echo --------------------------------------
+uninstall:  uninstall_subdirs
-variable_test: variable_info
+FORCE:
-        @echo KDEPIM buildsystem, variablecheck...
-  ifndef KDEPIMDIR
-        @echo KDEPIMDIR is not defined.
-        $(error KDEPIMDIR is not defined)
-  endif
-  ifndef PLATFORM
-        @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)
-        mkdir -p pwmanager/libcrypt/$(PLATFORM)
-clean:
-        rm -rf libical/lib/$(PLATFORM)/*;
-        rm -rf pwmanager/libcrypt/$(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) \
-       pwmanager/libcrypt/mpi/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/error/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/cipher/Makefile$(PLATFORM) \
-       pwmanager/libcrypt/zlib/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)
-pwmanager/libcrypt/mpi/Makefile$(PLATFORM): pwmanager/libcrypt/mpi/mpi.pro
-        cd pwmanager/libcrypt/mpi;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" mpi.pro -o Makefile$(PLATFORM)
-pwmanager/libcrypt/error/Makefile$(PLATFORM): pwmanager/libcrypt/error/error.pro
-        cd pwmanager/libcrypt/error;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" error.pro -o Makefile$(PLATFORM)
-pwmanager/libcrypt/cipher/Makefile$(PLATFORM): pwmanager/libcrypt/cipher/cipher.pro
-        cd pwmanager/libcrypt/cipher;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" cipher.pro -o Makefile$(PLATFORM)
-pwmanager/libcrypt/zlib/Makefile$(PLATFORM): pwmanager/libcrypt/zlib/zlib.pro
-        cd pwmanager/libcrypt/zlib;tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" zlib.pro -o Makefile$(PLATFORM)
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 63484d6..e3dad94 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -1843,46 +1843,52 @@ void MainWindow::exportVCalendar()
    if ( info. exists() ) {
        mes = i18n("Save file\nalready exists!\nOld save file from:\n%1\nOverwrite?\n").arg (KGlobal::locale()->formatDateTime(info.lastModified (), true, false ) );
        int result = QMessageBox::warning( this, i18n("KO/Pi: Warning!"),mes,
                                           i18n("Overwrite!"), i18n("Cancel"), 0,
                                           0, 1 );
        if ( result != 0 ) {
            createbup = false;
        }
    }
    if ( createbup ) {
        if ( mView->exportVCalendar( fn ) ) {
            KOPrefs::instance()->mLastVcalFile = fn;
            if ( fn.length() > 20 )
                mes = i18n("KO/Pi:Exported to ...%1").arg(fn.right(20)) ;
            else
                mes = i18n("KO/Pi:Exported to %1").arg(fn );
            setCaption(mes);
        }
    }
 }
 void MainWindow::syncFileRequest()
 {
+    if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
+        mSyncManager->slotSyncMenu( 999 );
+    } 
    save();
 }
 void MainWindow::getFile( bool success )
 {
    if ( ! success ) {
        setCaption( i18n("Error receiving file. Nothing changed!") );
        return;
    }
-    mView->openCalendar( defaultFileName() );
+    mView->openCalendar( defaultFileName() ); 
+    if ( KOPrefs::instance()->mPassiveSyncWithDesktop ) {
+        mSyncManager->slotSyncMenu( 999 );
+    } 
    setCaption( i18n("Pi-Sync successful!") );
 } 
 void MainWindow::printSel( )
 {
    mView->viewManager()->agendaView()->agenda()->printSelection();
 }
 void MainWindow::printCal()
 {
    mView->print();//mCp->showDialog();
 }
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 7ca3ee0..554c6e5 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -160,65 +160,80 @@ void KSyncManager::slotSyncMenu( int action )
        //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);
+    bool silent = false;
+    if ( action == 999 ) {
+        //special mode for silent syncing
+        action = 1000;
+        silent = 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();
+    if (silent) {
-    mSyncAlgoPrefs = temp->getSyncPrefs();
+        mAskForPreferences = false;
-    mWriteBackFile = temp->getWriteBackFile();
+        mShowSyncSummary = false;
+        mWriteBackFile = true;
+        mSyncAlgoPrefs = 2;// take newest
+    }
+    else {
+        mAskForPreferences = temp->getAskForPreferences();
+        mShowSyncSummary = temp->getShowSummaryAfterSync();
+        mWriteBackFile = temp->getWriteBackFile();
+        mSyncAlgoPrefs = temp->getSyncPrefs();
+    }
    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();
@@ -281,48 +296,49 @@ void KSyncManager::enableQuick( bool ask )
        lab.setText( mPrefs->mPassiveSyncPort );
        lay.setMargin(7);
        lay.setSpacing(7);
        int po = 9197+mTargetApp;
        QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
        lay.addWidget( &label);
        lay.addWidget( &lab);
        QLineEdit lepw ( &dia );
        lepw.setText( mPrefs->mPassiveSyncPw );
        QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
        lay.addWidget( &label2);
        lay.addWidget( &lepw);
        QCheckBox autostart(i18n("Automatically start\nat application startup"), &dia );
        lay.addWidget( &autostart);
        autostart.setChecked( mPrefs->mPassiveSyncAutoStart );
 #ifdef DESKTOP_VERSION
 #ifdef _WIN32_
        QCheckBox syncdesktop( i18n("Automatically sync with Outlook\nwhen receiving sync request"),&dia );
 #else
        QCheckBox syncdesktop( i18n("Automatically sync with KDE-Desktop\nwhen receiving sync request"),&dia );
 #endif
        lay.addWidget( &syncdesktop);
 #else
+        mPrefs->mPassiveSyncWithDesktop = false;
        QCheckBox syncdesktop( i18n("Automatically sync\nwith KDE-Desktop"),&dia );
        syncdesktop.hide();
 #endif
        syncdesktop.setChecked( mPrefs->mPassiveSyncWithDesktop );
        dia.setFixedSize( 230,120 );
        dia.setCaption( i18n("Enter port for Pi-Sync") );
        QPushButton pb ( "OK",  &dia);
        lay.addWidget( &pb );
        connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
        dia.show();
        if ( ! dia.exec() )
            return;
        dia.hide();
        qApp->processEvents();
        if ( mPrefs->mPassiveSyncPw != lepw.text() ) {
            changed = true;
            mPrefs->mPassiveSyncPw = lepw.text();
        }
        if ( mPrefs->mPassiveSyncPort != lab.text() ) {
            mPrefs->mPassiveSyncPort = lab.text();
            changed = true;
        }
        autoStart = autostart.isChecked();
@@ -395,88 +411,94 @@ void KSyncManager::syncLocalFile()
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
    bool ret = false;
    QFileInfo info;
    info.setFile( fn );
    QString mess;
    bool loadbup = true;
    if ( !info. exists() ) {
        mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
        int result = QMessageBox::warning( mParent, i18n("Warning!"),
                                           mess );
        return ret;
    }
    int result = 0;
    if ( !quick ) {
        mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
        result = QMessageBox::warning( mParent, i18n("Warning!"),
                                       mess,
                                       i18n("Sync"), i18n("Cancel"), 0,
                                       0, 1 );
        if ( result )
            return false;
    }
    if ( mAskForPreferences )
-        edit_sync_options();
+        if ( !edit_sync_options()) {
+            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
+            return false;
+        }
    if ( result == 0 ) {
        //qDebug("Now sycing ... ");
        if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
            mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
        else
            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
        if ( ! quick )
            mPrefs->mLastSyncedLocalFile = fn;
    }
    return ret;
 }
 void KSyncManager::quickSyncLocalFile()
 {
    
    if ( syncWithFile( mPrefs->mLastSyncedLocalFile, true ) ) {
        qDebug("quick syncLocalFile() successful ");
      
    }
 }
 void KSyncManager::multiSync( bool askforPrefs  )
 {
    if (blockSave())
        return;
    setBlockSave(true);
    QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
    if ( QMessageBox::information( mParent, i18n("KDE-Pim Sync"),
                                   question,
                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 ) {
        setBlockSave(false);
        mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
        return;
    }
    mCurrentSyncDevice = i18n("Multiple profiles") ;
    mSyncAlgoPrefs = mPrefs->mRingSyncAlgoPrefs;
    if ( askforPrefs ) {
-        edit_sync_options();
+        if ( !edit_sync_options()) {
+            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
+            return;
+        }
        mPrefs->mRingSyncAlgoPrefs = mSyncAlgoPrefs;
    }
    mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
    qApp->processEvents();
    int num = ringSync() ;
    if (  num > 1 )
        ringSync();
    setBlockSave(false);
    if ( num )
        emit save();
    if ( num )
        mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync complete!").arg(num) );
    else
        mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
    return;
 }
 int KSyncManager::ringSync()
 {
    int syncedProfiles = 0;
    unsigned int i;
    QTime timer;
    KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
    QStringList syncProfileNames = mSyncProfileNames;
@@ -666,130 +688,131 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
    //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
    if ( syncWithFile( localTempFile, true ) ) {
        if ( mWriteBackFile ) {
            int fi;
            if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                QString pwd = getPassword();
                postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                
            }
            mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
            result = system ( postCommand );
            qDebug("Sync:Writing back file result: %d ", result);
            if ( result != 0 ) {
                mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                return;
            } else {
                mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) );
            }
        }
    }
    return;
 }
-void KSyncManager::edit_pisync_options()
+bool KSyncManager::edit_pisync_options()
 {
    QDialog dia( mParent, "dia", true );
    dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice );
    QVBoxLayout lay ( &dia );
    lay.setSpacing( 5 );
    lay.setMargin( 3 );
    QLabel lab1 ( i18n("Password for remote access:"), &dia); 
    lay.addWidget( &lab1 );
    QLineEdit le1 (&dia );
    lay.addWidget( &le1 );
    QLabel lab2 ( i18n("Remote IP address:"), &dia);
    lay.addWidget( &lab2 );
    QLineEdit le2 (&dia );
    lay.addWidget( &le2 );
    QLabel lab3 ( i18n("Remote port number:"), &dia);
    lay.addWidget( &lab3 );
    QLineEdit le3 (&dia );
    lay.addWidget( &le3 );
    QPushButton pb ( "OK",  &dia); 
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
    le1.setText( mPassWordPiSync );
    le2.setText( mActiveSyncIP  );
    le3.setText( mActiveSyncPort );
    if ( dia.exec() ) {
        mPassWordPiSync = le1.text();
        mActiveSyncPort = le3.text();
        mActiveSyncIP = le2.text();
+        return true;
    }
-   
+    return false;
 }
-void KSyncManager::edit_sync_options()
+bool KSyncManager::edit_sync_options()
 {
    QDialog dia( mParent, "dia", true );
    dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
    QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
    QVBoxLayout lay ( &dia );
    lay.setSpacing( 2 );
    lay.setMargin( 3 );
    lay.addWidget(&gr);
    QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
    QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
    QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
    QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
    QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
    QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
    //QRadioButton both( i18n("Take both on conflict"), &gr );
    QPushButton pb ( "OK",  &dia); 
    lay.addWidget( &pb );
    connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
    switch ( mSyncAlgoPrefs ) {
    case 0:
        loc.setChecked( true);
        break;
    case 1:
        rem.setChecked( true );
        break;
    case 2:
        newest.setChecked( true);
        break;
    case 3:
        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 ;
+        return true;
    }
-   
+    return false;
 }
 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;
@@ -843,50 +866,53 @@ void KSyncManager::syncKDE()
            }
            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 )
+    if ( mAskForPreferences )  
-        edit_sync_options();
+        if ( !edit_sync_options()) {
+            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
+            return false;
+        }
    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();
@@ -914,49 +940,52 @@ QString KSyncManager::syncFileName()
        case (KAPI):
            fn = "tempsyncab.vcf";
            break;
        case (KOPI):
            fn = "tempsynccal.ics";
            break;
        case (PWMPI):
            fn = "tempsyncpw.pwm";
            break;
        default:
            break;
        }
 #ifdef _WIN32_
    return  locateLocal( "tmp", fn );
 #else
    return (QString( "/tmp/" )+ fn );
 #endif
 }
 void KSyncManager::syncPi()
 {
    mPisyncFinished = false;
    qApp->processEvents();
    if ( mAskForPreferences )
-        edit_pisync_options();
+        if ( !edit_pisync_options()) {
+            mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") );
+            return;
+        }
    bool ok;
    Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
    if ( ! ok ) {
        mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
        return;
    }
    KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
    connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
    mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
    commandSocket->readFile(  syncFileName() );
 }
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
    //enum { success, errorW, errorR, quiet };
    if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) {
        mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
        delete s;
        if ( state == KCommandSocket::errorR ) {
            KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
            connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
            commandSocket->sendStop();
        }
        mPisyncFinished = true;
@@ -1145,82 +1174,82 @@ void KServerSocket::readBackFileFromSocket()
        return;
    }
    QString fileName = mFileName;
    QFile file ( fileName );
    if (!file.open( IO_WriteOnly ) ) {
        delete mSyncActionDialog;
        mSyncActionDialog = 0;
        qDebug("KSS:Error open read back file ");
        piFileString = "";
        emit file_received( false );
        blockRC = false;
        return ;
                    
    } 
    // mView->setLoadedFileVersion(QDateTime::currentDateTime().addSecs( -1));
    QTextStream ts ( &file );
    ts.setEncoding( QTextStream::Latin1 );
    mSyncActionDialog->setCaption( i18n("Writing file to disk...") );
    ts << piFileString;
    mSocket->close();
    if ( mSocket->state() == QSocket::Idle )
        QTimer::singleShot( 10, this , SLOT ( discardClient()));
    file.close(); 
+    piFileString = "";
+    emit file_received( true );
    delete mSyncActionDialog;
    mSyncActionDialog = 0;
-    piFileString = "";
    blockRC = false;
-    emit file_received( true );
 }
 KCommandSocket::KCommandSocket (  QString password, Q_UINT16 port, QString host, QObject * parent, const char * name ): QObject( parent, name )
 {
    mPassWord = password;
    mSocket = 0;
    mPort = port;
    mHost = host;
    mRetVal = quiet;
    mTimerSocket = new QTimer ( this );
    connect( mTimerSocket, SIGNAL ( timeout () ), this, SLOT ( deleteSocket()  ) );
 }
 void KCommandSocket::readFile( QString fn )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(readyRead()), this, SLOT(startReadFileFromSocket()) );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
    }
    mFileString = "";
    mFileName = fn;
    mFirst = true;
    mSocket->connectToHost( mHost, mPort ); 
    QTextStream os( mSocket );
    os.setEncoding( QTextStream::Latin1 );
    os << "GET " << mPassWord << "\r\n";
-    mTimerSocket->start( 10000 );
+    mTimerSocket->start( 20000 );
 }
 void KCommandSocket::writeFile( QString fileName  )
 {
    if ( !mSocket ) {
        mSocket = new QSocket( this );
        connect( mSocket, SIGNAL(delayedCloseFinished ()), this, SLOT(deleteSocket()) );
        connect( mSocket, SIGNAL(connected ()), this, SLOT(writeFileToSocket()) );
    }
    mFileName = fileName ;
    mSocket->connectToHost( mHost, mPort ); 
 }
 void KCommandSocket::writeFileToSocket()
 {
    QFile file2( mFileName );
    if (!file2.open( IO_ReadOnly ) ) {
        mRetVal= errorW;
        mSocket->close();
        if ( mSocket->state() == QSocket::Idle )
            QTimer::singleShot( 10, this , SLOT ( deleteSocket()));
        return ;
    }  
    QTextStream ts2( &file2 );
    ts2.setEncoding( QTextStream::Latin1 );
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 7b9c499..4a610fa 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -153,50 +153,50 @@ class KSyncManager : public QObject
    void getFile( bool );
    public slots:
    void slotSyncMenu( int );
    void deleteCommandSocket(KCommandSocket*s, int state);
    void readFileFromSocket();
    void fillSyncMenu();
 private:
    void syncPi();
    KServerSocket * mServerSocket;
    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();
+    bool edit_sync_options();
-    void edit_pisync_options();
+    bool edit_pisync_options();
    int ringSync();
    QString  getPassword( );
    bool mPisyncFinished;
    bool mBlockSaveFlag;
    QWidget* mParent;
    KSyncInterface* mImplementation;
    TargetApp mTargetApp; 
    QPopupMenu* mSyncMenu;
    QProgressBar* bar;
 private slots:
    void confSync();
 };
 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