Version: 4.4.0 (using KDE Devel) Installed from: Compiled sources OS: Linux Currently, if a conflict occurs in the addressbook conduit, it asks for every field of the conflicting records. It would be better to first detect all conflicting fields, and let them be resolved together in one dialogbox.
Subject: kdepim/kpilot/conduits/abbrowserconduit CVS commit by kainhofe: This monster commit is a complete rewrite of the addressbook conduit (for the, umhh, third(?) time). 1) NEW FEATURE: custom fields can now also be synced with birth date, URL, ICQ, etc. (bug #50871) 2) Conflict resolution shows the whole conflicting item and all conflicting fields (so far, every conflicting field was shown on its own, bug #59222). The conflict resolution is done completely independent from the addressee object and might so be reused later in other conduits as well. 3) Separated the mechanism to detect changes from the mechanism to sync/merge addressees. This makes the whole thing a lot easier to understand and maintain, and there are far less cases you have to consider. 4) the conduit now obeys the global conflict resolution (ask, PC overrides, HH overrides, last sync overrides, duplicate) and sync direction (fast, full, only PC->HH, only HH->PC)settings. Bug #59220. 5) The "only HH->PC" and "only PC->HH" sync directions first copy all existing entries to the receiving end, and only then remove all other entries from there. This avoids data loss if the connection breaks while such a special sync is running. 6) Added a crash handler to clean up the addressbook if the conduit crashes. CCMAIL: 50871-close@bugs.kde.org, 59220-close@bugs.kde.org, 59222-close@bugs.kde.org A resolutionDialog_base.ui 1.1 A resolutionTable.h 1.1 [GPL (v2+)] M +3 -0 .cvsignore 1.10 M +3 -2 Makefile.am 1.38 M +1087 -1300 abbrowser-conduit.cc 1.76 M +135 -104 abbrowser-conduit.h 1.39 M +1 -0 abbrowser-factory.cc 1.17 M +1 -1 abbrowser-factory.h 1.14 M +21 -5 abbrowser-setup.cc 1.22 M +39 -22 kaddressbookConduit.ui 1.16 M +259 -46 resolutionDialog.cc 1.9 M +19 -11 resolutionDialog.h 1.8