From 435aad934e11c94e7f38c68f67e73d4268fbfca7 Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Fri, 28 Jun 2013 11:41:01 +0000 Subject: [PATCH] Imported Upstream version 1.0.99.6 --- ChangeLog | 830 ++++++++++++++++ Makefile.am | 2 +- Makefile.in | 22 +- NEWS | 27 + README | 189 +++- README.html | 158 ++- README.rst | 185 +++- aclocal.m4 | 1 + config.h.in | 10 + configure | 1004 +++++++++++++++++++- configure-post.in | 19 + configure-pre.in | 11 +- configure.in | 78 +- gen-autotools.sh | 3 +- m4-repo/autotroll.m4 | 563 +++++++++++ m4-repo/autotroll.mk | 108 +++ src/Makefile-gen.am | 5 +- src/Makefile.am | 11 +- src/Makefile.in | 139 ++- src/backends/addressbook/Makefile.in | 20 +- src/backends/evolution/EvolutionCalendarSource.cpp | 2 + src/backends/evolution/Makefile.in | 20 +- src/backends/file/FileSyncSource.h | 9 + src/backends/file/Makefile.in | 20 +- src/backends/kcalextended/KCalExtendedSource.cpp | 447 +++++++++ src/backends/kcalextended/KCalExtendedSource.h | 92 ++ .../kcalextended/KCalExtendedSourceRegister.cpp | 98 ++ src/backends/kcalextended/Makefile.am | 22 + src/backends/kcalextended/Makefile.in | 754 +++++++++++++++ src/backends/kcalextended/configure-sub.in | 17 + src/backends/maemo/Makefile.in | 20 +- src/backends/qtcontacts/Makefile.am | 27 + src/backends/qtcontacts/Makefile.in | 757 +++++++++++++++ src/backends/qtcontacts/QtContactsSource.cpp | 328 +++++++ src/backends/qtcontacts/QtContactsSource.h | 72 ++ .../qtcontacts/QtContactsSourceRegister.cpp | 98 ++ src/backends/qtcontacts/configure-sub.in | 23 + src/backends/sqlite/Makefile.in | 20 +- src/backends/xmlrpc/Makefile.in | 20 +- src/client-test-app.cpp | 83 +- src/dbus/Makefile.in | 20 +- src/dbus/interfaces/Makefile.in | 20 +- src/dbus/interfaces/syncevo-server-full.xml | 143 ++- src/dbus/interfaces/syncevo-session-full.xml | 31 + src/gdbus/Makefile.am | 13 +- src/gdbus/Makefile.in | 129 ++- src/gdbus/gdbus-cxx-bridge.h | 296 +++--- src/gdbus/gdbus-cxx.h | 6 +- src/gdbus/gdbus.h | 164 ++-- src/gdbus/mainloop.c | 40 +- src/gdbus/object.c | 146 +-- src/gdbus/test/example.cpp | 4 +- src/gdbus/watch.c | 52 +- src/gnome-bluetooth/Makefile.in | 20 +- src/gtk-ui/Makefile.in | 20 +- src/gtk-ui/sync-gtk.desktop.in | 6 +- src/syncevo-dbus-server.cpp | 273 ++++-- src/syncevo/Cmdline.cpp | 570 +++++++---- src/syncevo/Cmdline.h | 56 ++ src/syncevo/FileConfigTree.cpp | 6 + src/syncevo/Makefile.am | 8 + src/syncevo/Makefile.in | 40 +- src/syncevo/SafeConfigNode.cpp | 69 -- src/syncevo/SafeConfigNode.h | 23 +- src/syncevo/SyncConfig.cpp | 29 +- src/syncevo/SyncConfig.h | 20 +- src/syncevo/SyncContext.cpp | 7 + src/syncevo/SyncContext.h | 14 + src/syncevo/SyncSource.cpp | 17 +- src/syncevo/configs/Makefile.in | 20 +- src/syncevo/configs/datatypes/01vcard-profile.xml | 20 +- .../remoterules/00_have_evolution_ui_slot.xml | 5 + .../configs/remoterules/00_syncevolution.xml | 7 + src/syncevo/configs/remoterules/all.xml | 5 + src/syncevo/configs/remoterules/evolution.xml | 1 + .../configs/remoterules/server/00_nokia.xml | 19 + src/syncevo/configs/remoterules/server/46_E55.xml | 14 - src/syncevo/eds_abi_wrapper.cpp | 47 + src/syncevo/eds_abi_wrapper.h | 2 + src/syncevo/readme2c.pl | 42 + src/syncevo/util.cpp | 125 +++ src/syncevo/util.h | 62 ++ src/syncevolution.cpp | 66 +- src/synthesis-includes/Makefile.in | 20 +- src/synthesis/ChangeLog | 35 +- src/synthesis/src/sysync/binfileimplds.cpp | 3 + src/synthesis/src/sysync/mimedirprofile.cpp | 49 +- src/synthesis/src/sysync/mimedirprofile.h | 8 + .../clients/phone/{nokia/S60/N85.ini => nokia.ini} | 7 +- src/templates/clients/phone/nokia/maemo/n900.ini | 29 - src/templates/clients/phone/sony-ericsson-old.ini | 30 + src/templates/clients/phone/sony-ericsson.ini | 29 + test/ClientTest.cpp | 57 +- test/ClientTest.h | 17 + test/Makefile.am | 2 + test/Makefile.in | 22 +- test/client-test-main.cpp | 4 + test/synccompare.pl | 6 + test/syncevo-phone-config.py | 1 + test/testcases/templates/clients/SyncEvolution.ini | 26 + .../templates/clients/phone/nokia/S40/7210c.ini | 0 101 files changed, 8268 insertions(+), 1068 deletions(-) create mode 100644 m4-repo/autotroll.m4 create mode 100644 m4-repo/autotroll.mk create mode 100644 src/backends/kcalextended/KCalExtendedSource.cpp create mode 100644 src/backends/kcalextended/KCalExtendedSource.h create mode 100644 src/backends/kcalextended/KCalExtendedSourceRegister.cpp create mode 100644 src/backends/kcalextended/Makefile.am create mode 100644 src/backends/kcalextended/Makefile.in create mode 100644 src/backends/kcalextended/configure-sub.in create mode 100644 src/backends/qtcontacts/Makefile.am create mode 100644 src/backends/qtcontacts/Makefile.in create mode 100644 src/backends/qtcontacts/QtContactsSource.cpp create mode 100644 src/backends/qtcontacts/QtContactsSource.h create mode 100644 src/backends/qtcontacts/QtContactsSourceRegister.cpp create mode 100644 src/backends/qtcontacts/configure-sub.in create mode 100644 src/syncevo/configs/remoterules/00_have_evolution_ui_slot.xml create mode 100644 src/syncevo/configs/remoterules/00_syncevolution.xml create mode 100644 src/syncevo/configs/remoterules/all.xml create mode 100644 src/syncevo/configs/remoterules/server/00_nokia.xml delete mode 100644 src/syncevo/configs/remoterules/server/46_E55.xml create mode 100644 src/syncevo/readme2c.pl rename src/templates/clients/phone/{nokia/S60/N85.ini => nokia.ini} (66%) delete mode 100644 src/templates/clients/phone/nokia/maemo/n900.ini create mode 100644 src/templates/clients/phone/sony-ericsson-old.ini create mode 100644 src/templates/clients/phone/sony-ericsson.ini create mode 100644 test/testcases/templates/clients/SyncEvolution.ini rename {src => test/testcases}/templates/clients/phone/nokia/S40/7210c.ini (100%) diff --git a/ChangeLog b/ChangeLog index 20d7190..a42b269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,468 @@ # Generated by configure. Do no edit. +2010-09-09 Patrick Ohly + + * configure-pre.in: + + version bump: 1.0.99.6 + +2010-09-09 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + nightly testing: adapted Cmdline test to string changes + +2010-09-08 Patrick Ohly + + * NEWS: + + NEWS: updated for 1.1 pre-release + +2010-09-02 Patrick Ohly + + * src/backends/file/FileSyncSource.h: + * src/syncevo/configs/datatypes/01vcard-profile.xml: + * src/syncevo/configs/remoterules/00_have_evolution_ui_slot.xml: + * src/syncevo/configs/remoterules/00_syncevolution.xml: + * src/syncevo/configs/remoterules/all.xml: + * src/syncevo/configs/remoterules/evolution.xml: + + Nokia phones: avoid data loss in two-way sync due to + X-EVOLUTION-UI-SLOT (MBC #2566) + +2010-09-08 Patrick Ohly + + * src/gtk-ui/sync-gtk.desktop.in: + + sync-ui (GTK version): updated .desktop file + +2010-09-08 Patrick Ohly + + * test/evo.supp: + + nightly testing: suppress leak in libebook + +2010-09-07 Patrick Ohly + + * src/syncevo-dbus-server.cpp: + + syncevo-dbus-server: fixed compile issue with libsoup disabled + (MBC #6367) + +2010-09-07 Patrick Ohly + + * src/syncevo/SyncConfig.cpp: + + documentation: extended description of "sync" property (MBC + #6373) + +2010-09-07 Patrick Ohly + + * test/evo.supp: + + nightly testing: improved valgrind suppressions + +2010-09-06 Patrick Ohly + + * README.rst: + + README: several improvements + +2010-09-06 Patrick Ohly + + * src/syncevo/eds_abi_wrapper.cpp: + + EDS: revised workaround for D-Bus method timeouts (BMC #4026) + +2010-09-03 Patrick Ohly + + * configure-post.in: + * configure-pre.in: + * debian/dbus-wrapper.cpp: + * src/syncevo/eds_abi_wrapper.cpp: + * src/syncevolution.cpp: + + EDS: workaround for D-Bus method timeouts (BMC #4026) + +2010-09-03 Patrick Ohly + + * test/evo.supp: + + evo.supp: updated suppressions for libical (BMC #6275) + +2010-09-02 Patrick Ohly + + * test/synccompare.pl: + + nightly testing: adapted synccompare to mkcal + +2010-09-02 Patrick Ohly + + * test/runtests.py: + + nightly testing: log report generation functions + +2010-09-02 Patrick Ohly + + * test/generate-html.xsl: + + nightly testing: reorder columns so that valgrind and overall + result come first + +2010-09-02 Patrick Ohly + + * test/generate-html.xsl: + * test/resultchecker.py: + + nightly testing: added a column for "network failure" + +2010-09-02 Patrick Ohly + + * test/runtests.py: + + nightly testing: disable testDeleteAllRefresh for Google + +2010-09-02 Patrick Ohly + + * test/runtests.py: + + nightly testing: only include services in report which actually + were active + +2010-09-01 Patrick Ohly + + * src/syncevo/configs/remoterules/server/00_nokia.xml: + * src/syncevo/configs/remoterules/server/46_E55.xml: + + Nokia phones: alarm times in UTC, sending PHOTO (BMC #1657, + #5860) + +2010-09-01 Patrick Ohly + + * src/client-test-app.cpp: + + nightly testing: fixed caching of Evolution sources (BMC #5864) + +2010-09-01 Patrick Ohly + + * src/client-test-app.cpp: + * test/ClientTest.cpp: + * test/ClientTest.h: + * test/client-test-main.cpp: + + nightly testing: avoid shutdown issues due to caching Evolution + sources (BMC #5864) + +2010-09-01 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSourceRegister.cpp: + + KCalExtended: use "mkcal" as generic type name + +2010-09-01 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: adapted "update" code patch to new API + +2010-09-01 Patrick Ohly + + * src/syncevo/Cmdline.h: + * src/syncevo/SafeConfigNode.cpp: + * src/syncevo/SafeConfigNode.h: + * src/syncevo/SyncConfig.h: + * src/syncevo/SyncSource.cpp: + * src/syncevo/util.cpp: + * src/syncevo/util.h: + + command line: use % as escape character for luids + +2010-09-01 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + * src/syncevo/Cmdline.h: + + command line: code clean-up around LUID escaping + +2010-08-31 Patrick Ohly + + + Merge branch 'master', remote branch 'origin' + +2010-08-31 Patrick Ohly + + * test/runtests.py: + + nightly testing: allow enabling valgrind for "prebuilt" test (BMC + #1007) + +2010-08-31 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: fix for invalid memory access + +2010-08-30 Patrick Ohly + + * test/Makefile.am: + + testing: fixed "make dist" issue + +2010-08-27 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: more QtContacts API related fixes (BMC #5710) + +2010-08-26 Patrick Ohly + + * test/syncevo-phone-config.py: + + syncevo-phone-config: set consumerReady in output (BMC #3803) + +2010-08-26 Patrick Ohly + + * src/Makefile-gen.am: + * src/templates/clients/phone/nokia.ini: + * src/templates/clients/phone/nokia/S40/7210c.ini: + * src/templates/clients/phone/nokia/S60/N85.ini: + * src/templates/clients/phone/nokia/maemo/n900.ini: + * src/templates/clients/phone/sony-ericsson-old.ini: + * src/templates/clients/phone/sony-ericsson.ini: + * test/testcases/templates/clients/SyncEvolution.ini: + * test/testcases/templates/clients/phone/nokia/S40/7210c.ini: + + phone templates: updated, copied from syncevolution.org Wiki (BMC + #5727) + +2010-08-27 Patrick Ohly + + * src/client-test-app.cpp: + + nightly testing: workaround for Evolution 2.30 storage shutdown + (BMC #5864) + +2010-08-27 Patrick Ohly + + * test/evo.supp: + + evo.supp: added suppressions for Evolution 2.30 (BMC #1007) + +2010-08-25 Patrick Ohly + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/dbus/interfaces/syncevo-session-full.xml: + + D-Bus API: fixed type signature + +2010-08-25 Patrick Ohly + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/syncevo-dbus-server.cpp: + * src/syncevo/Cmdline.cpp: + * src/syncevo/Cmdline.h: + * test/test-dbus.py: + + D-Bus API: added Server.ConfigChanged signal (BMC #3558) + +2010-08-25 Patrick Ohly + + * src/dbus/interfaces/syncevo-session-full.xml: + * src/syncevo-dbus-server.cpp: + * test/test-dbus.py: + + D-Bus API: added Session.GetConfigName() (BMC #3559) + +2010-08-25 Patrick Ohly + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/syncevo-dbus-server.cpp: + * test/test-dbus.py: + + D-Bus API: added suppression of libnotify notifications (BMC + #3560) + +2010-08-25 Patrick Ohly + + * src/syncevolution.cpp: + + command line: start D-Bus session with "no-sync" flag unless + running a sync (BMC #3562) + +2010-08-25 Patrick Ohly + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/dbus/interfaces/syncevo-session-full.xml: + * src/syncevo-dbus-server.cpp: + * test/test-dbus.py: + + D-Bus API: added Server.StartSessionWithFlags() and + Session.GetFlags() + +2010-08-25 Patrick Ohly + + * test/test-dbus.py: + + test-dbus.py: fixed Python syntax error in last commit + +2010-08-25 Patrick Ohly + + * src/gdbus/gdbus-cxx-bridge.h: + + gdbus C++: fixed cut-and-paste error + +2010-08-24 Patrick Ohly + + * src/syncevolution.cpp: + + command line: do sanity version check when running as D-Bus + client + +2010-08-24 Patrick Ohly + + * src/dbus/interfaces/syncevo-server-full.xml: + * src/syncevo-dbus-server.cpp: + * test/test-dbus.py: + + D-Bus: added Server.GetCapabilities and Server.GetVersions (BMC + #3563) + +2010-08-25 Zhu, Yongsheng + + * src/client-test-app.cpp: + + client-test: avoid duplicate sources in m_localSource2Config + +2010-08-25 Zhu, Yongsheng + + * test/test-dbus.py: + + test-dbus.py: adapted to modified 'message type' error + description + +2010-08-24 Patrick Ohly + + * test/test-dbus.py: + + test-dbus.py: removed ZYB, it is no longer supported + +2010-08-02 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + * src/syncevo/FileConfigTree.cpp: + * src/syncevo/SyncConfig.cpp: + + command line: allow creating contexts without peers + +2010-08-02 Patrick Ohly + + * src/syncevo/SyncConfig.cpp: + + SyncConfig: do not mistake "foo" context for old-style "foo" + client config + +2010-08-23 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + command line: fixed --delete-items/--import for KCalExtended + +2010-08-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: further adaptions to KCalExtended API change + +2010-08-23 Patrick Ohly + + * test/runtests.py: + + runtests.py: make repos group-writable + +2010-08-23 Patrick Ohly + + * test/runtests.py: + + runtests.py: avoid ssh access to gitorious.org in nightly + checkout + +2010-08-17 Patrick Ohly + + * src/backends/kcalextended/configure-sub.in: + + KCalExtended: workaround for incomplete libmkcal.pc + +2010-08-17 Patrick Ohly + + * src/syncevo/eds_abi_wrapper.cpp: + * src/syncevo/eds_abi_wrapper.h: + + EDS compatibility: added icalproperty_free() + +2010-08-16 Qiankun Miao + + * src/backends/evolution/EvolutionCalendarSource.cpp: + + EvolutionBackend: fix memory leak + +2010-08-15 Patrick Ohly + + + Merge branch 'meego-1.0' + +2010-08-15 Patrick Ohly + + * src/gdbus/Makefile.am: + + gdbus: ensure that header files are included in "make dist" + +2010-08-13 Patrick Ohly + + * gen-autotools.sh: + + gen-autotools.sh: fixed ambiguous HEAD reference + +2010-08-12 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + * src/backends/kcalextended/configure-sub.in: + + kcalextended: adapted to revised API + +2010-07-29 Patrick Ohly + + * src/syncevo/SyncContext.h: + + SyncContext: added comment for getUsedSyncURL() + +2010-08-09 Patrick Ohly + + * src/gdbus/Makefile.am: + + Revert "compile fix for FC 13 (and possibly others): use private + copy of gdbus (MBC #3556)" + +2010-08-09 Patrick Ohly + + * src/gdbus/Makefile.am: + * src/gdbus/gdbus-cxx-bridge.h: + * src/gdbus/gdbus-cxx.h: + * src/gdbus/gdbus.h: + * src/gdbus/mainloop.c: + * src/gdbus/object.c: + * src/gdbus/test/example.cpp: + * src/gdbus/watch.c: + * src/syncevo-dbus-server.cpp: + * src/syncevolution.cpp: + + gdbus: avoid name conflict with glib + +2010-08-09 Patrick Ohly + + * src/gdbus/Makefile.am: + + gdbus: do not install header files + 2010-07-16 Patrick Ohly * NEWS: @@ -7,6 +470,11 @@ NEWS, version: updated for 1.0.1 +2010-07-16 Patrick Ohly + + + Merge branch 'meego-1.0' + 2010-07-16 Jussi Kukkonen * src/gtk-ui/sync-ui.c: @@ -62,11 +530,373 @@ config fix: operations on non-peer configs failed (MBC #3157) +2010-07-16 Jussi Kukkonen + + * src/gtk-ui/sync-ui.c: + + canonize new device config names (MBC #1194) + +2010-07-16 Jussi Kukkonen + + * src/gtk-ui/sync-config-widget.c: + * src/gtk-ui/sync-ui.c: + + prevent overwriting device configs by accident (MBC #3566,1194) + 2010-07-16 Patrick Ohly Merge commit 'syncevolution-1-0' into meego-1.0 +2010-07-16 Patrick Ohly + + * configure-pre.in: + + version bump: 1.1 based on 1.0.1 + +2010-07-16 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: fixed compile error with g++ in MeeGo + +2010-07-15 Patrick Ohly + + * src/backends/qtcontacts/configure-sub.in: + + QtContacts: find QtContacts properly + +2010-07-15 Patrick Ohly + + * configure-post.in: + + autotools: allow setting more AC_WITH_QT() options + +2010-07-14 Zhu, Yongsheng + + * src/syncevo/Cmdline.cpp: + + client-test: ignore comments for KCalExtended and QtContacts + +2010-05-26 Patrick Ohly + + * test/runtests.py: + + nightly testing: get sources from meego.gitorious.org + +2010-06-30 Patrick Ohly + + * README.rst: + * src/syncevo/Cmdline.cpp: + * src/syncevo/Cmdline.cpp.orig: + * src/syncevo/Cmdline.cpp.rej: + * src/syncevo/Makefile.am: + * src/syncevo/readme2c.pl: + + documentation + command line: unified source of usage information + (MBC #690) + +2010-07-08 Zhu, Yongsheng + + * src/syncevo/Cmdline.cpp: + + Testing: fix failure of evolution testing due to new backends + +2010-07-01 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSourceRegister.cpp: + + KCalExtended: fixed test registration + +2010-07-01 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSourceRegister.cpp: + + QtContacts: fixed test registration + +2010-06-30 Patrick Ohly + + * src/backends/qtcontacts/Makefile.am: + * src/backends/qtcontacts/configure-sub.in: + + QtContacts: fixed compile error when not enabling QtContacts + +2010-06-30 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + * src/syncevo/SyncConfig.cpp: + + ZYB.com: service goes away end of June 2010, template removed + (MBC #3310) + +2010-06-30 Patrick Ohly + + * src/syncevo-dbus-server.cpp: + + syncevo-dbus-server: accept 'application/vnd.syncml+xml; + charset=UTF-8' for starting an HTTP session (MBC #3554) + +2010-06-30 Patrick Ohly + + * configure-post.in: + * configure-pre.in: + + autotools: added --enable-gnome-keyring (MBC #3557) + +2010-06-28 Patrick Ohly + + * src/gdbus/Makefile.am: + + compile fix for FC 13 (and possibly others): use private copy of + gdbus (MBC #3556) + +2010-06-25 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: added error checking + +2010-06-25 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: enabled more efficient listing of all items + +2010-06-25 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: avoid adding incidence anew + +2010-06-23 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + * src/backends/qtcontacts/QtContactsSource.h: + + QtContacts: provide description from database + +2010-06-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + * src/backends/kcalextended/KCalExtendedSource.h: + + KCalExtended: provide description from database + +2010-06-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + * src/backends/kcalextended/KCalExtendedSource.h: + + KCalExtended: implement backup/restore using SyncSourceRevisions + +2010-06-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: sleep only if necessary + +2010-06-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: must preserve creation time during update + +2010-06-23 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + + KCalExtended: load incidences on demand + +2010-06-23 Patrick Ohly + + * test/ClientTest.cpp: + + client-test: added CLIENT_TEST_SIMPLE_UID + +2010-06-21 Patrick Ohly + + * src/backends/kcalextended/KCalExtendedSource.cpp: + * src/backends/kcalextended/KCalExtendedSource.h: + * src/backends/kcalextended/KCalExtendedSourceRegister.cpp: + * src/backends/kcalextended/Makefile.am: + * src/backends/kcalextended/configure-sub.in: + + KCalExtended: added initial SyncSource + +2010-06-21 Patrick Ohly + + * test/ClientTest.cpp: + + testing: avoid DTSTAMP issue in KCalExtended + +2010-06-16 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: be careful about which queries to use + +2010-06-16 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: added simpler removeItem() implementation + +2010-06-16 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: ignore artificial contact + +2010-06-04 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: use new save/fetch mechanism (supports time stamps, + but currently broken) + +2010-06-04 Patrick Ohly + + * src/backends/qtcontacts/QtContactsSource.cpp: + + QtContacts: use proper QContactTimestamp template member detail + function + +2010-06-02 Patrick Ohly + + * src/backends/qtcontacts/Makefile.am: + * src/backends/qtcontacts/QtContactsSource.cpp: + * src/backends/qtcontacts/configure-sub.in: + + QtContacts: first complete (but not usable) backend + +2010-05-26 Patrick Ohly + + * src/backends/qtcontacts/Makefile.am: + * src/backends/qtcontacts/QtContactsSource.cpp: + * src/backends/qtcontacts/QtContactsSource.h: + * src/backends/qtcontacts/QtContactsSourceRegister.cpp: + * src/backends/qtcontacts/configure-sub.in: + + QtContacts: initial, empty implementation + +2010-05-26 Patrick Ohly + + * configure-post.in: + * m4-repo/autotroll.m4: + * m4-repo/autotroll.mk: + + Qt support: use Autotroll to determine right compile flags + +2010-06-23 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + command line: fix --print-items description luid handling + +2010-06-23 Patrick Ohly + + * README.rst: + * src/syncevo/Cmdline.cpp: + + command line: allow temporary configs in import/export operations + +2010-06-25 Patrick Ohly + + * configure-pre.in: + + configure: fix for SoupTransportAgent without EDS and without + D-Bus + +2010-06-21 Patrick Ohly + + * test/ClientTest.cpp: + + testing: support sources which depend on anchors + +2010-06-21 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + command line: fix for new update/delete operations + +2010-06-17 Patrick Ohly + + * gen-autotools.sh: + + gen-autotools.sh: make order of files deterministic (MBC #2586) + +2010-06-16 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + * src/syncevo/SyncConfig.cpp: + * src/syncevo/SyncConfig.h: + + command line import/export: failed for non-peer configs + +2010-06-16 Patrick Ohly + + * src/syncevo/SyncConfig.cpp: + * src/syncevo/SyncConfig.h: + + config fix: operations on non-peer configs failed (MBC #3157) + +2010-06-11 Zhu, Yongsheng + + * test/generate-html.xsl: + * test/resultchecker.py: + + Testing: add 'known failure' support in nightly (MBC#2870) + +2010-06-11 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + command line --print-items: added short description + +2010-06-11 Patrick Ohly + + * README.rst: + * src/syncevo/Cmdline.cpp: + * src/syncevo/Cmdline.h: + + command line: added --delete-items + +2010-06-11 Patrick Ohly + + * README.rst: + * src/syncevo/Cmdline.cpp: + * src/syncevo/Cmdline.h: + + command line: added --import/export/update/print-items + +2010-06-11 Patrick Ohly + + * src/syncevo-dbus-server.cpp: + * src/syncevo/SyncContext.cpp: + * src/syncevo/SyncContext.h: + + SyncContext:readStdin(): a virtual method for reading input via + stdin + +2010-06-11 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + Cmdline::isSync(): cosmetic change + +2010-06-11 Patrick Ohly + + * src/syncevo/Cmdline.cpp: + + command line parsing: check for conflicting operations + +2010-06-11 Patrick Ohly + + * src/syncevo/util.cpp: + * src/syncevo/util.h: + + ReadFile(): added reading from open stream + 2010-06-10 Zhu, Yongsheng * test/evo.supp: diff --git a/Makefile.am b/Makefile.am index 9b3bc66..d2be9ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -179,7 +179,7 @@ clean-html: # Because backend-related variables need to be substituted in # Makefile-gen.am and configure.in we need an explicit rule to redo that work # so that "make" rebuilds derived files correctly. -CONFIG_SUBS = src/backends/addressbook/configure-sub.in src/backends/evolution/configure-sub.in src/backends/file/configure-sub.in src/backends/maemo/configure-sub.in src/backends/sqlite/configure-sub.in src/backends/xmlrpc/configure-sub.in +CONFIG_SUBS = src/backends/addressbook/configure-sub.in src/backends/evolution/configure-sub.in src/backends/file/configure-sub.in src/backends/kcalextended/configure-sub.in src/backends/maemo/configure-sub.in src/backends/qtcontacts/configure-sub.in src/backends/sqlite/configure-sub.in src/backends/xmlrpc/configure-sub.in $(srcdir)/configure.in: configure-pre.in configure-post.in $(CONFIG_SUBS) rm -f $@ cat $(srcdir)/configure-pre.in >>$@ diff --git a/Makefile.in b/Makefile.in index 480565b..106b2d6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,7 +43,8 @@ DIST_COMMON = README $(am__configure_deps) $(am__dist_doc_DATA_DIST) \ ChangeLog INSTALL NEWS config.guess config.sub depcomp \ install-sh ltmain.sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4-repo/ax_boost_base.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4-repo/autotroll.m4 \ + $(top_srcdir)/m4-repo/ax_boost_base.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) @@ -181,6 +182,8 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ INTLTOOL_MERGE = @INTLTOOL_MERGE@ INTLTOOL_PERL = @INTLTOOL_PERL@ INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +KCALEXTENDED_CFLAGS = @KCALEXTENDED_CFLAGS@ +KCALEXTENDED_LIBS = @KCALEXTENDED_LIBS@ KEYRING_2_20_CFLAGS = @KEYRING_2_20_CFLAGS@ KEYRING_2_20_LIBS = @KEYRING_2_20_LIBS@ KEYRING_CFLAGS = @KEYRING_CFLAGS@ @@ -205,6 +208,7 @@ MCALB_CFLAGS = @MCALB_CFLAGS@ MCALB_LIBS = @MCALB_LIBS@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MOC = @MOC@ MODIFY_SYNCCOMPARE = @MODIFY_SYNCCOMPARE@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ @@ -227,7 +231,20 @@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +QMAKE = @QMAKE@ +QT_CFLAGS = @QT_CFLAGS@ +QT_CONTACTS_LIBS = @QT_CONTACTS_LIBS@ +QT_CPPFLAGS = @QT_CPPFLAGS@ +QT_CXXFLAGS = @QT_CXXFLAGS@ +QT_DEFINES = @QT_DEFINES@ +QT_INCPATH = @QT_INCPATH@ +QT_LDFLAGS = @QT_LDFLAGS@ +QT_LFLAGS = @QT_LFLAGS@ +QT_LIBS = @QT_LIBS@ +QT_PATH = @QT_PATH@ +QT_VERSION_MAJOR = @QT_VERSION_MAJOR@ RANLIB = @RANLIB@ +RCC = @RCC@ RST2HTML = @RST2HTML@ RST2MAN = @RST2MAN@ SED = @SED@ @@ -253,6 +270,7 @@ SYNTHESIS_SUBDIR = @SYNTHESIS_SUBDIR@ SYNTHESIS_SUBDIR_INCLUDES = @SYNTHESIS_SUBDIR_INCLUDES@ TRANSPORT_CFLAGS = @TRANSPORT_CFLAGS@ TRANSPORT_LIBS = @TRANSPORT_LIBS@ +UIC = @UIC@ UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ UNIQUE_LIBS = @UNIQUE_LIBS@ USE_NLS = @USE_NLS@ @@ -358,7 +376,7 @@ PKGS = $(addprefix syncevolution-evolution-, 2.6 2.8 2.12) # Because backend-related variables need to be substituted in # Makefile-gen.am and configure.in we need an explicit rule to redo that work # so that "make" rebuilds derived files correctly. -CONFIG_SUBS = src/backends/addressbook/configure-sub.in src/backends/evolution/configure-sub.in src/backends/file/configure-sub.in src/backends/maemo/configure-sub.in src/backends/sqlite/configure-sub.in src/backends/xmlrpc/configure-sub.in +CONFIG_SUBS = src/backends/addressbook/configure-sub.in src/backends/evolution/configure-sub.in src/backends/file/configure-sub.in src/backends/kcalextended/configure-sub.in src/backends/maemo/configure-sub.in src/backends/qtcontacts/configure-sub.in src/backends/sqlite/configure-sub.in src/backends/xmlrpc/configure-sub.in # patch README.rst properties on-the-fly with sed expressions PATCH_README = -e "s/^:Version: .*/:Version: $(VERSION)/" -e "s/:Date: .*/:Date: `date +%Y-%m-%d`/" diff --git a/NEWS b/NEWS index c86d133..d6964c5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,30 @@ +SyncEvolution 1.0.1 -> 1.1, xxxxxxxxxx +====================================== + +An incremental update, resolving issues where the fixes would have +been too intrusive for a 1.0.x release. In particular compatibility +with Nokia phones was improved. Some new features were also included. + +Details: + +* Nokia phones: avoid data loss in two-way sync due to X-EVOLUTION-UI-SLOT (MBC #2566) +* Nokia phones: alarm times in UTC, sending PHOTO (BMC #1657, #5860) +* included all phone templates submitted to syncevolution.org Wiki (BMC #5727) +* syncevo-phone-config: set consumerReady in output, more useful for Wiki (BMC #3803) +* workaround for D-Bus timeouts in EDS libecal/libebook (MBC #4026) +* sync-ui (GTK version): app is now listed as "SyncEvolution (GTK)" under "Office" +* added generic command line options for importing, exporting, updating, listing + and deleting items in the different backends (http://syncevolution.org/blogs/pohly/2010/manipulate-evolution-kcalextendedmkcal-qtcontacts-pim-items-uniform-command-line) +* added backends for mKCal and QtContacts (MeeGo PIM storage), + meant to be used for manipulating this data on the command line +* enhanced D-Bus interface (BMC #3558, #3559, #3560, #3562, #3563) +* the command line tool now warns when running against a different D-Bus daemon (BMC #3563) +* creating and configuring sources in a context (without peer-specific + properties) is now supported +* improved documentation: README.rst, man page, and --help output +* fixed some compile issues (MBC #6367), improved nightly testing + + SyncEvolution 1.0 -> 1.0.1, 16.07.2010 ====================================== diff --git a/README b/README index 429ea07..62b29d8 100644 --- a/README +++ b/README @@ -7,8 +7,8 @@ synchronize personal information management data ------------------------------------------------ :Manual section: 1 -:Version: 1.0.1 -:Date: 2010-07-16 +:Version: 1.0.99.6+20100909+SE+3c7dca9+SYSYNC+47f51a5 +:Date: 2010-09-09 SYNOPSIS ======== @@ -38,7 +38,24 @@ Restore data from the automatic backups: syncevolution --restore --before|--after [--dry-run] ... Modify a configuration: - syncevolution --remove|--migrate|--configure + syncevolution --configure [ ...] + syncevolution --remove|--migrate + +List items: + syncevolution --print-items + +Export item(s): + syncevolution [--delimiter ] --export ||- [ ...] + +Add item(s): + syncevolution [--delimiter |none] --import ||- + +Update item(s) + syncevolution --update + syncevolution [--delimiter |none] --update |- ... + +Remove item(s): + syncevolution --delete-items ... DESCRIPTION =========== @@ -82,6 +99,11 @@ synchronized. In that sense, a configuration context can be seen as a set of local databases plus the peer configurations that are synchronized against those databases. +The peer-independent properties of a source can be configured by +giving the context name as parameter ("@default +addressbook"). Operations manipulating the local data also accept +the context name. + When different peers are meant to synchronize different local databases, then different contexts have to be used when setting up the peers by appending a context name after the `at` sign, as in @@ -103,7 +125,7 @@ set a different synchronization mode in its configuration file. :: syncevolution -Without the optional list of sources all sources which are enabled in +Without the optional list of sources, all sources which are enabled in their configuration file are synchronized. :: syncevolution ... @@ -111,8 +133,19 @@ their configuration file are synchronized. :: Otherwise only the ones mentioned on the command line are active. It is possible to configure sources without activating their synchronization: if the synchronization mode of a source is set to -`none`, the source will be ignored. Explicitly listing such a source -will synchronize it in `two-way` mode once. +`disabled`, the source will be ignored. Explicitly listing such a +source will synchronize it in `two-way` mode once. + +In SyncEvolution's predefined configuration templates, the following +names for sources are used. Different names can be chosen for sources +that are defined manually. :: + + * addressbook: a list of contacts + * calendar: calendar *events* + * memo: plain text notes + * todo: task list + * calendar+todo: a virtual source combining one local "calendar" and + one "todo" source (required for synchronizing with some phones) Progress and error messages are written into a log file that is preserved for each synchronization run. Details about that is found in @@ -183,13 +216,7 @@ These commands print information about existing configurations. When printing a configuration a short version without comments can be selected with --quiet. When sources are listed, only their configuration is shown. `Main` instead or in combination with sources -lists only the main peer configuration. - -With --print-session information about previous synchronization -sessions for the selected peer or context are printed. This depends on -the `logdir` option. The information includes the log directory name -(useful for --restore) and the synchronization report. In combination -with --quiet, only the paths are listed. :: +lists only the main peer configuration. :: syncevolution --restore --before|--after [--dry-run] ... @@ -210,8 +237,29 @@ A restore tries to minimize the number of item changes (see section identical before and after the change will not be transmitted anew to the server during the next synchronization. If the server somehow needs to get a clean copy of all items on the client then, use "--sync -refresh-from-client" in the next run. +refresh-from-client" in the next run. :: + syncevolution --print-items + syncevolution [--delimiter ] --export ||- [ ...] + syncevolution [--delimiter |none] --import ||- + syncevolution --update + syncevolution [--delimiter |none] --update |- ... + syncevolution --delete-items ... + +Restore depends on the specific format of the automatic backups +created by SyncEvolution. Arbitrary access to item data is provided +with additional options. here is the unique local identifier +assigned to each item in the source, transformed so that it contains +only alphanumeric characters, dash and underscore. + + and must be given, but they do not have to refer to +existing configurations. In that case, the desired backend and must be +give via "--source-property type=", like this:: + + syncevolution --print-items --source-property type=evolution-contacts dummy-config dummy-source + +The desired backend database can be chosen via "--source-property +evolutionsource". OPTIONS ======= @@ -230,7 +278,7 @@ a list of valid values. Prints the names of all configured peers to stdout. There is no difference between these options, the are just aliases. ---print-config|-p +--print-servers|--print-configs|--print-peers|-p Prints the complete configuration for the selected to stdout, including up-to-date comments for all properties. The format is the normal .ini format with source configurations in @@ -243,12 +291,20 @@ a list of valid values. When setting a --template, then the reference configuration for that peer is printed instead of an existing configuration. +\--print-sessions + Prints information about previous synchronization sessions for the + selected peer or context are printed. This depends on the `logdir` + option. The information includes the log directory name (useful for + --restore) and the synchronization report. In combination with + --quiet, only the paths are listed. + --configure|-c - Modify the configuration files for the selected peer. If no such - configuration exists, then a new one is created using one of the - template configurations (see --template option). When creating - a new configuration only the active sources will be set to active - in the new configuration, i.e. `syncevolution -c scheduleworld addressbook` + Modify the configuration files for the selected peer and/or sources. + If no such configuration exists, then a new one is created using one + of the template configurations (see --template option). When + creating a new configuration and listing sources explicitly on the + command line, only those sources will be set to active in the new + configuration, i.e. `syncevolution -c scheduleworld addressbook` followed by `syncevolution scheduleworld` will only synchronize the address book. The other sources are created in a disabled state. When modifying an existing configuration and sources are specified, @@ -267,22 +323,62 @@ a list of valid values. layout and rename the into .old to prevent accidental use of the old configuration. WARNING: old SyncEvolution releases cannot use the new configuration! - + The switch can also be used to migrate a configuration in the current configuration directory: this preserves all property values, discards obsolete properties and sets all comments exactly as if the configuration had been created from scratch. WARNING: custom comments in the configuration are not preserved. - + --migrate implies --configure and can be combined with modifying properties. +\--print-items + Shows all existing items using one line per item using + the format "[: ]". Whether the description + is available depends on the backend and the kind of data that it + stores. + +\--export + Writes all items in the source or all items whose is + given into a directory if the --export parameter exists and is a + directory. The of each item is used as file name. Otherwise it + creates a new file under that name and writes the selected items + separated by the chosen delimiter string. stdout can be selected with + a dash. + + The default delimiter are two newline characters for a blank line. This + works for vCard 3.0 and iCalendar 2.0, which never contain blank lines. + Because items may or may not end in a newline, as a special case the + initial newline of a delimiter is skipped if the item ends in a newline. + +\--import + Adds all items found in the directory or input file to the + source. When reading from a directory, each file is treated as one + item. Otherwise the input is split at the chosen delimiter. "none" as + delimiter disables splitting of the input. + +\--update + Overwrites the content of existing items. When updating from a + directory, the name of each file is taken as its luid. When updating + from file or stdin, the number of luids given on the command line + must match with the number of items in the input. + +\--delete-items + Removes the specified items from the source. Most backends print + some progress information about this, but besides that, no further + output is produced. Trying to remove an item which does not exist + typically leads to an ERROR message, but is not reflected in a + non-zero result of the command line invocation itself because the + situation is not reported as an error by backends (removal of + non-existent items is not an error in SyncML). + --sync-property|-y =|=?|? Overrides a source-independent configuration property for the current synchronization run or permanently when --configure is used to update the configuration. Can be used multiple times. Specifying an unused property will trigger an error message. - + When using the configuration layout introduced with 1.0, some of the sync properties are shared between peers, for example the directory where sessions are logged. Permanently changing such a shared @@ -295,10 +391,11 @@ a list of valid values. Same as --sync-property, but applies to the configuration of all active sources. `--sync ` is a shortcut for `--source-property sync=`. - When combined with `--configure`, the configuration of all sources is - modified. Properties cannot be specified differently for different - sources, so if you want to change a source property of just one specific - sync source, then use `--configure --source-property ... `. + When combined with `--configure`, the configuration of all sources + is modified. The value is applied to all sources unless sources are + listed explicitly on the command line. So if you want to change a + source property of just one specific sync source, then use + `--configure --source-property ... `. As with sync properties, some properties are shared between peers, in particular the selection of which local data to synchronize. @@ -311,11 +408,11 @@ a list of valid values. than the peer. `default` is an alias for `scheduleworld` and can be used as the starting point for servers which do not have a built-in template. - - Each template contains a pseudo-random device ID. Therefore setting the - `deviceId` sync property is only necessary when manually recreating a + + A pseudo-random device ID is generated automatically. Therefore setting + the `deviceId` sync property is only necessary when manually recreating a configuration or when a more descriptive name is desired. - + The available templates for different known SyncML servers are listed when using a single question mark instead of template name. When using the `?` format, a fuzzy search for a template that might be @@ -340,22 +437,30 @@ a list of valid values. applies to *all* passwords in a configuration, so setting a single password as follows moves the other passwords into the keyring, if they were not stored there already:: - + --keyring --configure --sync-property proxyPassword=foo - + When passwords were stored in the keyring, their value is set to a single hyphen ("-") in the configuration. This means that when running a synchronization without the --keyring argument, the password has to be entered interactively. The --print-config output always shows "-" instead of retrieving the password from the keyring. +--daemon[=yes/no] + By default, the SyncEvolution command line is executed inside the + syncevo-dbus-server process. This ensures that synchronization sessions + started by the command line do not conflict with sessions started + via some other means (GUI, automatically). For debugging purposes + or very special use cases (running a local sync against a server which + executes inside the daemon) it is possible to execute the operation + without the daemon (--daemon=no). + --help|-h Prints usage information. \--version Prints the SyncEvolution version. - EXAMPLES ======== @@ -370,6 +475,15 @@ Create a new configuration, using the existing ScheduleWorld template:: --sync-property "password=!@#ABcd1234" \ scheduleworld +Note that putting passwords into the command line, even for +short-lived processes as the one above, is a security risk in shared +environments, because the password is visible to everyone on the +machine. To avoid this, remove the password from the command above, +then add the password to the right config.ini file with a text editor. +This command shows the directory containing the file:: + + syncevolution --print-configs + Review configuration:: syncevolution --print-config scheduleworld @@ -417,8 +531,11 @@ clients, see `Exchanging Data`_:: syncevolution --configure \ --source-property evolutionsource= \ + @other addressbook + + syncevolution --configure \ --source-property sync=two-way \ - scheduleworld@other + scheduleworld@other addressbook syncevolution scheduleworld syncevolution scheduleworld@other @@ -443,7 +560,7 @@ needed. Calendar items and tasks can be sent and received in iCalendar 2.0 as well as vCalendar 1.0, but vCalendar 1.0 should be avoided if possible because it cannot represent all data that Evolution stores. -.. note:: The Evolution backends are mentioned are as examples; +.. note:: The Evolution backends are mentioned as examples; the same applies to other data sources. How the server stores the items depends on its implementation and diff --git a/README.html b/README.html index 2ef5734..26d38fd 100644 --- a/README.html +++ b/README.html @@ -5,7 +5,7 @@ SyncEvolution - +