SVN commit 654396 by vanrijn: - merging all development and bug fixes from kdepim-3.5.5+ branch into stable branches/KDE/3.5 in preparation for KDE 3.5.7 - cmake cleanups - namespacing and cleanups in sysinfoconduit - lots of debugging cleanups. remove #ifdef DEBUG from much of the code. - cleanups in memofile conduit. now try to use new (OS5) database (MemosDB-PMem) if it's found, otherwise fall back to the legacy one (MemoDB) - as a first step to combatting the "kpilot ate my future" e-mails (read: data loss), we now use a CUDCounter (Create/Update/Delete). step 1 is to track these and report on them to the user in their sync log. step 2 is to catch ill behavior and prompt the user as to whether or not to allow kpilot to make the large amount of changes. step 3 is to allow the user to configure the count or percentage of changes that kpilot can make without his/her confirmation. step 1 is done. we'll approach steps 2 and 3 post kde 3.5.7. - new strings related to the above CCMAIL:kde-i18n-doc@kde.org - bug fixing in popconduit... making sure we always have a sent date - Bertjan has the start of knotes cleanup going on - bug fixing in vcalconduit... long-time bug that existed in libkcal that caused every calendar resource save to mark every calendar event as modified. now kpilot won't have to sync every record every time. - bug fixing kabc resource problems in abbrowser conduit. although it's not documented in kabc, it looks like we should be removing a local resource from the address book before we delete it. - bringing mal conduit back alive again. none of our small band of merry men use it, though, so it may or may not actually do what it's supposed to. - fixing bug where we were saving conduit databases to DBBackup instead of conduits/ directory. - changing KPilotDeviceLink to use a separate thread, dedicated to doing device communication. this is much better design as a start, but fixes the problems kpilot was having (and widely talked about) where kpilot would hang and crash if our user was using "usb:" or "net:any" devices because of how these new "device"s operated (allowed immediate opening, even though there is no physical device connected, and then hung indefinitely until the real device connected). - bringing in design documents (jpegs) for memofile conduit from 2004-12-12 (they're not installed, but are valuable for documentation and insight) - icon naming error bug fix 122582 M +13 -5 CMakeLists.txt M +1 -1 Documentation/ConduitProgrammingTutorial/mal-factory.cc M +18 -8 INSTALL M +6 -3 Makefile.cmake M +1 -1 README M +26 -1 cmake/modules/FindMal.cmake M +25 -7 cmake/modules/FindPilotlink.cmake M +12 -3 conduits/CMakeLists.txt M +8 -2 conduits/abbrowserconduit/CMakeLists.txt M +8 -3 conduits/abbrowserconduit/Makefile.am M +392 -818 conduits/abbrowserconduit/abbrowser-conduit.cc M +19 -51 conduits/abbrowserconduit/abbrowser-conduit.h M +3 -4 conduits/abbrowserconduit/abbrowser-setup.cc A conduits/abbrowserconduit/kabcRecord.cc branches/work/kdepim-3.5.5+/kpilot/conduits/abbrowserconduit/kabcRecord.cc#654370 [License: GPL (v2+)] A conduits/abbrowserconduit/kabcRecord.h branches/work/kdepim-3.5.5+/kpilot/conduits/abbrowserconduit/kabcRecord.h#654370 [License: GPL (v2+)] M +1 -1 conduits/abbrowserconduit/resolutionDialog.cc _M conduits/docconduit (directory) M +5 -1 conduits/docconduit/CMakeLists.txt M +27 -27 conduits/docconduit/DOC-converter.cc M +44 -44 conduits/docconduit/doc-conduit.cc M +5 -6 conduits/docconduit/doc-conflictdialog.cc M +3 -5 conduits/docconduit/doc-factory.cc M +1 -2 conduits/docconduit/doc-setup.cc M +17 -17 conduits/docconduit/kpalmdoc_dlg.cc M +4 -4 conduits/docconduit/pilotDOCBookmark.cc M +12 -12 conduits/docconduit/pilotDOCHead.cc A conduits/knotes/CMakeLists.txt branches/work/kdepim-3.5.5+/kpilot/conduits/knotes/CMakeLists.txt#654370 D conduits/knotes/KNotesIface.h M +8 -5 conduits/knotes/Makefile.am M +147 -141 conduits/knotes/knotes-action.cc M +4 -4 conduits/knotes/knotes-action.h M +3 -3 conduits/knotes/knotes-factory.cc M +1 -2 conduits/knotes/knotes-setup.cc M +5 -3 conduits/malconduit/CMakeLists.txt M +5 -5 conduits/malconduit/mal-conduit.cc M +7 -5 conduits/malconduit/mal-factory.cc M +2 -3 conduits/malconduit/mal-setup.cc M +4 -0 conduits/memofileconduit/CMakeLists.txt A conduits/memofileconduit/design (directory) branches/work/kdepim-3.5.5+/kpilot/conduits/memofileconduit/design#654370 A conduits/memofileconduit/design/SQD - copyHHToPC.jpg branches/work/kdepim-3.5.5+/kpilot/conduits/memofileconduit/design/SQD - copyHHToPC.jpg#654370 A conduits/memofileconduit/design/SQD - copyPCToHH.jpg branches/work/kdepim-3.5.5+/kpilot/conduits/memofileconduit/design/SQD - copyPCToHH.jpg#654370 A conduits/memofileconduit/design/SQD - detailed load.jpg branches/work/kdepim-3.5.5+/kpilot/conduits/memofileconduit/design/SQD - detailed load.jpg#654370 A conduits/memofileconduit/design/SQD - sync.jpg branches/work/kdepim-3.5.5+/kpilot/conduits/memofileconduit/design/SQD - sync.jpg#654370 M +121 -205 conduits/memofileconduit/memofile-conduit.cc M +1 -10 conduits/memofileconduit/memofile-conduit.h M +4 -9 conduits/memofileconduit/memofile-factory.cc M +1 -1 conduits/memofileconduit/memofile-factory.h M +8 -22 conduits/memofileconduit/memofile.cc M +1 -1 conduits/memofileconduit/memofile.h M +44 -121 conduits/memofileconduit/memofiles.cc M +6 -8 conduits/memofileconduit/memofiles.h M +4 -5 conduits/notepadconduit/notepad-conduit.cc M +1 -2 conduits/notepadconduit/notepad-factory.cc M +3 -3 conduits/null/null-conduit.cc M +3 -4 conduits/null/null-factory.cc M +4 -0 conduits/popmail/CMakeLists.txt M +39 -26 conduits/popmail/popmail-conduit.cc M +2 -7 conduits/popmail/setupDialog.cc M +7 -8 conduits/recordconduit/factory.cc M +3 -6 conduits/sysinfoconduit/CMakeLists.txt M +24 -13 conduits/sysinfoconduit/sysinfo-conduit.cc M +1 -1 conduits/sysinfoconduit/sysinfo-conduit.h M +4 -5 conduits/sysinfoconduit/sysinfo-setup.cc M +4 -0 conduits/timeconduit/CMakeLists.txt M +2 -2 conduits/timeconduit/time-conduit.cc M +1 -2 conduits/timeconduit/time-setup.cc M +6 -0 conduits/vcalconduit/CMakeLists.txt M +5 -2 conduits/vcalconduit/Makefile.am M +2 -2 conduits/vcalconduit/cleanupstate.cc M +3 -3 conduits/vcalconduit/deleteunsyncedhhstate.cc M +3 -3 conduits/vcalconduit/deleteunsyncedpcstate.cc M +10 -10 conduits/vcalconduit/hhtopcstate.cc M +2 -2 conduits/vcalconduit/initstate.cc A conduits/vcalconduit/kcalRecord.cc branches/work/kdepim-3.5.5+/kpilot/conduits/vcalconduit/kcalRecord.cc#654370 [License: GPL (v2+)] A conduits/vcalconduit/kcalRecord.h branches/work/kdepim-3.5.5+/kpilot/conduits/vcalconduit/kcalRecord.h#654370 [License: GPL (v2+)] M +11 -8 conduits/vcalconduit/pctohhstate.cc M +4 -4 conduits/vcalconduit/teststate.cc M +56 -164 conduits/vcalconduit/todo-conduit.cc M +7 -13 conduits/vcalconduit/todo-conduit.h M +1 -2 conduits/vcalconduit/todo-setup.cc A conduits/vcalconduit/todoRecord.cc branches/work/kdepim-3.5.5+/kpilot/conduits/vcalconduit/todoRecord.cc#654370 [License: GPL (v2+)] A conduits/vcalconduit/todoRecord.h branches/work/kdepim-3.5.5+/kpilot/conduits/vcalconduit/todoRecord.h#654370 [License: GPL (v2+)] M +19 -32 conduits/vcalconduit/vcal-conduit.cc M +6 -6 conduits/vcalconduit/vcal-conduit.h M +58 -36 conduits/vcalconduit/vcal-conduitbase.cc M +11 -11 conduits/vcalconduit/vcal-conduitbase.h M +1 -2 conduits/vcalconduit/vcal-setup.cc M +1 -1 conduits/vcalconduit/vcal-setupbase.cc M +85 -165 conduits/vcalconduit/vcalRecord.cc M +10 -21 conduits/vcalconduit/vcalRecord.h M +59 -24 configure M +65 -52 kpilot/CMakeLists.txt M +2 -3 kpilot/Makefile.am M +16 -25 kpilot/addressEditor.cc M +2 -3 kpilot/addressEditor.h M +6 -8 kpilot/addressWidget.cc M +2 -4 kpilot/conduitConfigDialog.cc M +0 -10 kpilot/dbAppInfoEditor.cc M +0 -10 kpilot/dbRecordEditor.cc M +0 -4 kpilot/dbRecordEditor.h M +2 -2 kpilot/fileInstallWidget.cc M +601 -226 kpilot/hotSync.cc M +34 -15 kpilot/hotSync.h D kpilot/interactiveSync.cc D kpilot/interactiveSync.h M +16 -18 kpilot/internalEditorAction.cc M +2 -2 kpilot/internalEditorAction.h M +18 -96 kpilot/kpilot.cc M +2 -3 kpilot/kpilotConfig.cc M +4 -7 kpilot/kpilotConfigDialog.cc M +35 -29 kpilot/kpilotProbeDialog.cc M +4 -7 kpilot/kpilotProbeDialog.h M +1 -1 kpilot/listCat.cc M +1 -2 kpilot/logFile.cc M +1 -1 kpilot/logWidget.cc M +18 -13 kpilot/main-test.cc M +2 -3 kpilot/memoWidget.cc M +27 -36 kpilot/pilotDaemon.cc D kpilot/syncStack.cc D kpilot/syncStack.h M +1 -1 kpilot/todoEditor.cc M +4 -6 kpilot/todoWidget.cc M +15 -3 lib/CMakeLists.txt M +6 -6 lib/Makefile.am A lib/actionQueue.cc branches/work/kdepim-3.5.5+/kpilot/lib/actionQueue.cc#654370 [License: GPL (v2+)] A lib/actionQueue.h branches/work/kdepim-3.5.5+/kpilot/lib/actionQueue.h#654370 [License: GPL (v2+)] A lib/actions.cc branches/work/kdepim-3.5.5+/kpilot/lib/actions.cc#654370 [License: GPL (v2+)] A lib/actions.h branches/work/kdepim-3.5.5+/kpilot/lib/actions.h#654370 [License: GPL (v2+)] D lib/fakes.c D lib/fakes.h A lib/idmapper.cc branches/work/kdepim-3.5.5+/kpilot/lib/idmapper.cc#654370 [License: LGPL (v2.1+)] A lib/idmapper.h branches/work/kdepim-3.5.5+/kpilot/lib/idmapper.h#654370 [License: LGPL (v2.1+)] A lib/idmapperxml.cc branches/work/kdepim-3.5.5+/kpilot/lib/idmapperxml.cc#654370 [License: LGPL (v2.1+)] A lib/idmapperxml.h branches/work/kdepim-3.5.5+/kpilot/lib/idmapperxml.h#654370 [License: LGPL (v2.1+)] A lib/idmapping.cc branches/work/kdepim-3.5.5+/kpilot/lib/idmapping.cc#654370 [License: LGPL (v2.1+)] A lib/idmapping.h branches/work/kdepim-3.5.5+/kpilot/lib/idmapping.h#654370 [License: LGPL (v2.1+)] A lib/kpilotdevicelink.cc branches/work/kdepim-3.5.5+/kpilot/lib/kpilotdevicelink.cc#654370 [License: LGPL (v2.1+)] M +90 -104 lib/kpilotdevicelink.h M +13 -1144 lib/kpilotlink.cc M +208 -120 lib/kpilotlink.h [POSSIBLY UNSAFE: system] A lib/kpilotlocallink.cc branches/work/kdepim-3.5.5+/kpilot/lib/kpilotlocallink.cc#654370 [License: LGPL (v2.1+)] M +18 -7 lib/kpilotlocallink.h M +37 -18 lib/options.cc M +42 -92 lib/options.h M +11 -11 lib/pilot.cc M +121 -21 lib/pilot.h M +307 -329 lib/pilotAddress.cc M +183 -61 lib/pilotAddress.h M +11 -3 lib/pilotAppInfo.cc M +10 -7 lib/pilotAppInfo.h M +2 -2 lib/pilotDatabase.cc M +8 -4 lib/pilotDatabase.h M +37 -20 lib/pilotDateEntry.cc M +30 -29 lib/pilotDateEntry.h M +7 -4 lib/pilotLinkVersion.h M +28 -28 lib/pilotLocalDatabase.cc M +15 -3 lib/pilotLocalDatabase.h M +33 -4 lib/pilotMemo.cc M +4 -2 lib/pilotMemo.h M +1 -1 lib/pilotRecord.cc M +8 -10 lib/pilotRecord.h M +54 -30 lib/pilotSerialDatabase.cc M +15 -6 lib/pilotSerialDatabase.h M +12 -23 lib/pilotTodoEntry.cc M +11 -17 lib/pilotTodoEntry.h M +5 -34 lib/pilotUser.h M +416 -19 lib/plugin.cc M +206 -46 lib/plugin.h M +10 -11 lib/pluginfactory.h M +24 -24 lib/recordConduit.cc M +5 -3 lib/recordConduit.h M +13 -13 lib/syncAction.cc M +6 -3 lib/syncAction.h D lib/uiDialog.cc D lib/uiDialog.h M +15 -6 tests/CMakeLists.txt A tests/exportdatebook.cc branches/work/kdepim-3.5.5+/kpilot/tests/exportdatebook.cc#654370 [License: LGPL (v2.1+)] M +16 -1 tests/importaddresses.cc M +27 -14 tests/importdatebook.cc M +10 -9 tests/testaddress.cc M +36 -22 tests/testcategories.cc M +12 -12 tests/testconstants.cc M +3 -2 tests/testdatabase.cc M +9 -7 tests/testdatebook.cc A tests/testidmapper.cc branches/work/kdepim-3.5.5+/kpilot/tests/testidmapper.cc#654370 [License: LGPL (v2.1+)]