Imported Upstream version 1.1.99.5b

diff --git a/ChangeLog b/ChangeLog
index d93bae7..f16b451 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,59 @@
 # Generated by configure.  Do no edit.
 
+2011-07-17  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * configure-pre.in:
+
+       bumped version to 1.1.99.5b
+
+2011-07-17  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * src/syncevo/eds_abi_wrapper.cpp:
+       * src/syncevo/eds_abi_wrapper.h:
+
+       --enable-eds-compatibility: added methods needed by WebDAV
+       backend (BMC #21284)
+
+2011-07-17  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * configure-post.in:
+
+       autotools: avoid linking against libs which are covered by
+       compatibility mode (part of BMC #21284)
+
+2011-07-17  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * Makefile.am:
+
+       autotools: more strict compatibility check (part of BMC #21284)
+
+2011-07-15  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * test/synccompare.pl:
+
+       testing: ignore X-GADUGADU|X-JABBER|X-MSN|X-SIP|X-SKYPE for
+       Mobical
+
+2011-07-15  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * test/synccompare.pl:
+
+       testing: ignore X-GADUGADU|X-JABBER|X-MSN|X-SIP|X-SKYPE for
+       Funambol
+
+2011-07-15  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * README.rst:
+
+       README: fixed formatting
+
+2011-07-15  Patrick Ohly  <patrick.ohly@intel.com>
+
+       * src/syncevo/eds_abi_wrapper.cpp:
+
+       EDS compatibility: accept Evolution 2.32 in syncevolution.org
+       binaries
+
 2011-07-14  Patrick Ohly  <patrick.ohly@intel.com>
 
        * configure-pre.in:

diff --git a/Makefile.am b/Makefile.am
index f4ec18d..d1242e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -207,13 +207,21 @@ dist-hook:
        fi
 
 if ENABLE_EVOLUTION_COMPATIBILITY
+# check .so (relevant for modular builds) and main syncevolution binary
+# (relevant in that case and for static builds) for dependencies on
+# problematic libraries and symbols
+#
+# ical_strdup is an exception because it is in SyncEvolution.
 installcheck-local:
-       for i in `find . -name *.so`; do \
-               if ldd $$i | grep -e libecal -e libebook -e libedata -e libical -e libbluetooth; then \
+       for i in `find $(DESTDIR)/$(libdir)/syncevolution $(DESTDIR)/$(libdir)/libsyncevo* $(DESTDIR)/$(libdir)/libsynthesis* -name *.so` $(DESTDIR)/$(bindir)/syncevolution; do \
+               if objdump -T -C $$i | grep -v :: | grep '\*UND\*' | sort | grep -v -w ical_strdup | grep -e ical -e " e_"; then \
                        echo "$$i should not depend on EDS, libical or libbluetooth"; \
-                       objdump -T -C $$i | grep -v :: | grep -e ical -e " e_"; \
                        exit 1; \
-               fi \
+               fi; \
+               if ldd $$i | grep -e libecal -e libebook -e libedata -e libical -e libbluetooth; then \
+                       echo "$$i should not be linked against EDS, libical or libbluetooth"; \
+                       exit 1; \
+               fi; \
        done
 endif
 

diff --git a/Makefile.in b/Makefile.in
index 93c535e..5ef1600 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1181,13 +1181,21 @@ dist-hook:
                echo A git checkout is required to generate a ChangeLog >&2; \
        fi
 
+# check .so (relevant for modular builds) and main syncevolution binary
+# (relevant in that case and for static builds) for dependencies on
+# problematic libraries and symbols
+#
+# ical_strdup is an exception because it is in SyncEvolution.
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@installcheck-local:
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  for i in `find . -name *.so`; do \
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          if ldd $$i | grep -e libecal -e libebook -e libedata -e libical -e libbluetooth; then \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  for i in `find $(DESTDIR)/$(libdir)/syncevolution $(DESTDIR)/$(libdir)/libsyncevo* $(DESTDIR)/$(libdir)/libsynthesis* -name *.so` $(DESTDIR)/$(bindir)/syncevolution; do \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          if objdump -T -C $$i | grep -v :: | grep '\*UND\*' | sort | grep -v -w ical_strdup | grep -e ical -e " e_"; then \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@                  echo "$$i should not depend on EDS, libical or libbluetooth"; \
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@                  objdump -T -C $$i | grep -v :: | grep -e ical -e " e_"; \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@                  exit 1; \
-@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          fi \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          fi; \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          if ldd $$i | grep -e libecal -e libebook -e libedata -e libical -e libbluetooth; then \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@                  echo "$$i should not be linked against EDS, libical or libbluetooth"; \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@                  exit 1; \
+@ENABLE_EVOLUTION_COMPATIBILITY_TRUE@          fi; \
 @ENABLE_EVOLUTION_COMPATIBILITY_TRUE@  done
 
 # produce man pages

diff --git a/README b/README
index 11d8185..41ce13a 100644 (file)
--- a/README
+++ b/README
@@ -7,8 +7,8 @@ synchronize personal information management data
 ------------------------------------------------
 
 :Manual section: 1
-:Version: 1.1.99.5a
-:Date: 2011-07-14
+:Version: 1.1.99.5b
+:Date: 2011-07-17
 
 SYNOPSIS
 ========
@@ -138,7 +138,7 @@ 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. ::
+that are defined manually.
 
  * addressbook: a list of contacts
  * calendar: calendar *events*

diff --git a/README.html b/README.html
index ba94bc5..f6727e8 100644 (file)
--- a/README.html
+++ b/README.html
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
 <title>SyncEvolution</title>
-<meta name="date" content="2011-07-14" />
+<meta name="date" content="2011-07-17" />
 <style type="text/css">
 
 /*
@@ -315,9 +315,9 @@ ul.auto-toc {
 <tr class="field"><th class="docinfo-name">Manual section:</th><td class="field-body">1</td>
 </tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.1.99.5a</td></tr>
+<td>1.1.99.5b</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2011-07-14</td></tr>
+<td>2011-07-17</td></tr>
 </tbody>
 </table>
 <div class="section" id="synopsis">
@@ -427,14 +427,16 @@ source will synchronize it in <cite>two-way</cite> mode once.</p>
 <p>In SyncEvolution's predefined configuration templates, the following
 names for sources are used. Different names can be chosen for sources
 that are defined manually.</p>
-<pre class="literal-block">
-* addressbook: a list of contacts
-* calendar: calendar *events*
-* memo: plain text notes
-* todo: task list
-* calendar+todo: a virtual source combining one local &quot;calendar&quot; and
-  one &quot;todo&quot; source (required for synchronizing with some phones)
-</pre>
+<blockquote>
+<ul class="simple">
+<li>addressbook: a list of contacts</li>
+<li>calendar: calendar <em>events</em></li>
+<li>memo: plain text notes</li>
+<li>todo: task list</li>
+<li>calendar+todo: a virtual source combining one local &quot;calendar&quot; and
+one &quot;todo&quot; source (required for synchronizing with some phones)</li>
+</ul>
+</blockquote>
 <p>Progress and error messages are written into a log file that is
 preserved for each synchronization run. Details about that is found in
 the <cite>Automatic Backups and Logging</cite> section below. All errors and

diff --git a/README.rst b/README.rst
index 6848e50..1d96581 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -138,7 +138,7 @@ 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. ::
+that are defined manually.
 
  * addressbook: a list of contacts
  * calendar: calendar *events*

diff --git a/configure b/configure
index 3235241..c9fc882 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for syncevolution 1.1.99.5a.
+# Generated by GNU Autoconf 2.65 for syncevolution 1.1.99.5b.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='syncevolution'
 PACKAGE_TARNAME='syncevolution'
-PACKAGE_VERSION='1.1.99.5a'
-PACKAGE_STRING='syncevolution 1.1.99.5a'
+PACKAGE_VERSION='1.1.99.5b'
+PACKAGE_STRING='syncevolution 1.1.99.5b'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1757,7 +1757,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures syncevolution 1.1.99.5a to adapt to many kinds of systems.
+\`configure' configures syncevolution 1.1.99.5b to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1827,7 +1827,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of syncevolution 1.1.99.5a:";;
+     short | recursive ) echo "Configuration of syncevolution 1.1.99.5b:";;
    esac
   cat <<\_ACEOF
 
@@ -2189,7 +2189,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-syncevolution configure 1.1.99.5a
+syncevolution configure 1.1.99.5b
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2762,7 +2762,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by syncevolution $as_me 1.1.99.5a, which was
+It was created by syncevolution $as_me 1.1.99.5b, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -3598,7 +3598,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='syncevolution'
- VERSION='1.1.99.5a'
+ VERSION='1.1.99.5b'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -22967,6 +22967,11 @@ if test "$enable_evolution_compatibility" = "yes"; then
 
 $as_echo "#define EVOLUTION_COMPATIBILITY 1" >>confdefs.h
 
+   # don't link against libs wrapped by eds_abi_wrapper (no longer limited to EDS alone...)
+   ECAL_LIBS=
+   EBOOK_LIBS=
+   EPACKAGE_LIBS=
+   BLUEZ_LIBS=
 fi
  if test "$enable_evolution_compatibility" = "yes"; then
   ENABLE_EVOLUTION_COMPATIBILITY_TRUE=
@@ -23742,7 +23747,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by syncevolution $as_me 1.1.99.5a, which was
+This file was extended by syncevolution $as_me 1.1.99.5b, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23808,7 +23813,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-syncevolution config.status 1.1.99.5a
+syncevolution config.status 1.1.99.5b
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure-post.in b/configure-post.in
index 78d9227..c51ab4b 100644 (file)
--- a/configure-post.in
+++ b/configure-post.in
@@ -94,6 +94,11 @@ fi
 dnl --enable-evolution-compatibility
 if test "$enable_evolution_compatibility" = "yes"; then
    AC_DEFINE(EVOLUTION_COMPATIBILITY, 1, [avoid hard dependency on Evolution shared objects])
+   # don't link against libs wrapped by eds_abi_wrapper (no longer limited to EDS alone...)
+   ECAL_LIBS=
+   EBOOK_LIBS=
+   EPACKAGE_LIBS=
+   BLUEZ_LIBS=
 fi
 AM_CONDITIONAL([ENABLE_EVOLUTION_COMPATIBILITY], [test "$enable_evolution_compatibility" = "yes"])
 PKG_CHECK_MODULES(LIBICAL_AVAILABLE,

diff --git a/configure-pre.in b/configure-pre.in
index 15dc236..a580fd0 100644 (file)
--- a/configure-pre.in
+++ b/configure-pre.in
@@ -8,7 +8,7 @@ dnl Invoke autogen.sh to produce a configure script.
 #
 # Starting with the 1.1 release cycle, the rpm-style
 # .99 pseudo-version number is used to mark a pre-release.
-AC_INIT([syncevolution], [1.1.99.5a])
+AC_INIT([syncevolution], [1.1.99.5b])
 # STABLE_VERSION=1.0.1+
 AC_SUBST(STABLE_VERSION)
 

diff --git a/configure.in b/configure.in
index 71c248c..1c3350c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl Invoke autogen.sh to produce a configure script.
 #
 # Starting with the 1.1 release cycle, the rpm-style
 # .99 pseudo-version number is used to mark a pre-release.
-AC_INIT([syncevolution], [1.1.99.5a])
+AC_INIT([syncevolution], [1.1.99.5b])
 # STABLE_VERSION=1.0.1+
 AC_SUBST(STABLE_VERSION)
 
@@ -1369,6 +1369,11 @@ fi
 dnl --enable-evolution-compatibility
 if test "$enable_evolution_compatibility" = "yes"; then
    AC_DEFINE(EVOLUTION_COMPATIBILITY, 1, [avoid hard dependency on Evolution shared objects])
+   # don't link against libs wrapped by eds_abi_wrapper (no longer limited to EDS alone...)
+   ECAL_LIBS=
+   EBOOK_LIBS=
+   EPACKAGE_LIBS=
+   BLUEZ_LIBS=
 fi
 AM_CONDITIONAL([ENABLE_EVOLUTION_COMPATIBILITY], [test "$enable_evolution_compatibility" = "yes"])
 PKG_CHECK_MODULES(LIBICAL_AVAILABLE,

diff --git a/src/syncevo/eds_abi_wrapper.cpp b/src/syncevo/eds_abi_wrapper.cpp
index 4a162c9..dc1d914 100644 (file)
--- a/src/syncevo/eds_abi_wrapper.cpp
+++ b/src/syncevo/eds_abi_wrapper.cpp
@@ -198,7 +198,7 @@ extern "C" void EDSAbiWrapperInit()
 
 # ifdef ENABLE_EBOOK
     ebookhandle =
-    findSymbols("libebook-1.2.so", 5, 9,
+    findSymbols("libebook-1.2.so", 5, 10,
                 FIND_SYMBOLS_NEED_ALL|FIND_SYMBOLS_LENIENT_MAX_VERSION, NULL,
                 &EDSAbiWrapperSingleton.e_book_add_contact, "e_book_add_contact",
                 &EDSAbiWrapperSingleton.e_book_authenticate_user, "e_book_authenticate_user",
@@ -232,7 +232,7 @@ extern "C" void EDSAbiWrapperInit()
 
 # ifdef ENABLE_ECAL
     ecalhandle =
-    findSymbols("libecal-1.2.so", 3, 7,
+    findSymbols("libecal-1.2.so", 3, 8,
                 FIND_SYMBOLS_NEED_ALL|FIND_SYMBOLS_LENIENT_MAX_VERSION, NULL,
                 &EDSAbiWrapperSingleton.e_cal_add_timezone, "e_cal_add_timezone",
                 &EDSAbiWrapperSingleton.e_cal_component_get_icalcomponent, "e_cal_component_get_icalcomponent",
@@ -271,6 +271,9 @@ extern "C" void EDSAbiWrapperInit()
                 &EDSAbiWrapperSingleton.icalcomponent_isa, "icalcomponent_isa",
                 &EDSAbiWrapperSingleton.icalcomponent_new_clone, "icalcomponent_new_clone",
                 &EDSAbiWrapperSingleton.icalcomponent_new_from_string, "icalcomponent_new_from_string",
+                &EDSAbiWrapperSingleton.icalcomponent_new, "icalcomponent_new",
+                &EDSAbiWrapperSingleton.icalcomponent_merge_component, "icalcomponent_merge_component",
+                &EDSAbiWrapperSingleton.icalcomponent_remove_component, "icalcomponent_remove_component",
                 &EDSAbiWrapperSingleton.icalcomponent_remove_property, "icalcomponent_remove_property",
                 &EDSAbiWrapperSingleton.icalcomponent_set_uid, "icalcomponent_set_uid",
                 &EDSAbiWrapperSingleton.icalcomponent_set_recurrenceid, "icalcomponent_set_recurrenceid",
@@ -280,17 +283,29 @@ extern "C" void EDSAbiWrapperInit()
                 &EDSAbiWrapperSingleton.icalproperty_new_clone, "icalproperty_new_clone",
                 &EDSAbiWrapperSingleton.icalproperty_free, "icalproperty_free",
                 &EDSAbiWrapperSingleton.icalproperty_get_description, "icalproperty_get_description",
+                &EDSAbiWrapperSingleton.icalproperty_get_uid, "icalproperty_get_uid",
+                &EDSAbiWrapperSingleton.icalproperty_get_sequence, "icalproperty_get_sequence",
+                &EDSAbiWrapperSingleton.icalproperty_get_property_name, "icalproperty_get_property_name",
                 &EDSAbiWrapperSingleton.icalproperty_get_first_parameter, "icalproperty_get_first_parameter",
                 &EDSAbiWrapperSingleton.icalproperty_get_lastmodified, "icalproperty_get_lastmodified",
                 &EDSAbiWrapperSingleton.icalproperty_get_next_parameter, "icalproperty_get_next_parameter",
                 &EDSAbiWrapperSingleton.icalproperty_get_summary, "icalproperty_get_summary",
                 &EDSAbiWrapperSingleton.icalproperty_new_description, "icalproperty_new_description",
                 &EDSAbiWrapperSingleton.icalproperty_new_summary, "icalproperty_new_summary",
+                &EDSAbiWrapperSingleton.icalproperty_new_uid, "icalproperty_new_uid",
+                &EDSAbiWrapperSingleton.icalproperty_new_sequence, "icalproperty_new_sequence",
                 &EDSAbiWrapperSingleton.icalproperty_set_value_from_string, "icalproperty_set_value_from_string",
+                &EDSAbiWrapperSingleton.icalproperty_set_dtstamp, "icalproperty_set_dtstamp",
+                &EDSAbiWrapperSingleton.icalproperty_set_lastmodified, "icalproperty_set_lastmodified",
+                &EDSAbiWrapperSingleton.icalproperty_set_sequence, "icalproperty_set_sequence",
+                &EDSAbiWrapperSingleton.icalproperty_set_uid, "icalproperty_set_uid",
                 &EDSAbiWrapperSingleton.icalproperty_remove_parameter_by_kind, "icalproperty_remove_parameter_by_kind",
                 &EDSAbiWrapperSingleton.icaltime_is_null_time, "icaltime_is_null_time",
                 &EDSAbiWrapperSingleton.icaltime_as_ical_string, "icaltime_as_ical_string",
                 &EDSAbiWrapperSingleton.icaltime_from_string, "icaltime_from_string",
+                &EDSAbiWrapperSingleton.icaltime_from_timet, "icaltime_from_timet",
+                &EDSAbiWrapperSingleton.icaltime_null_time, "icaltime_null_time",
+                &EDSAbiWrapperSingleton.icaltime_as_timet, "icaltime_as_timet",
                 &EDSAbiWrapperSingleton.icaltime_set_timezone, "icaltime_set_timezone",
                 &EDSAbiWrapperSingleton.icaltimezone_free, "icaltimezone_free",
                 &EDSAbiWrapperSingleton.icaltimezone_get_builtin_timezone, "icaltimezone_get_builtin_timezone",

diff --git a/src/syncevo/eds_abi_wrapper.h b/src/syncevo/eds_abi_wrapper.h
index e9c5f60..69d56b7 100644 (file)
--- a/src/syncevo/eds_abi_wrapper.h
+++ b/src/syncevo/eds_abi_wrapper.h
@@ -169,6 +169,9 @@ struct EDSAbiWrapper {
     icalcomponent_kind (*icalcomponent_isa) (const icalcomponent* component);
     icalcomponent* (*icalcomponent_new_clone) (icalcomponent* component);
     icalcomponent* (*icalcomponent_new_from_string) (char* str);
+    icalcomponent* (*icalcomponent_new) (icalcomponent_kind kind);
+    void (*icalcomponent_merge_component) (icalcomponent* component, icalcomponent *comp_to_merge);
+    void (*icalcomponent_remove_component) (icalcomponent* component, icalcomponent *comp_to_remove);
     void (*icalcomponent_remove_property) (icalcomponent* component, icalproperty* property);
     void (*icalcomponent_set_uid) (icalcomponent* comp, const char* v);
     void (*icalcomponent_set_recurrenceid)(icalcomponent* comp, struct icaltimetype v);
@@ -178,6 +181,9 @@ struct EDSAbiWrapper {
     icalproperty *(*icalproperty_new_clone)(icalproperty *prop);
     void (*icalproperty_free)(icalproperty *prop);
     const char* (*icalproperty_get_description) (const icalproperty* prop);
+    const char* (*icalproperty_get_property_name) (const icalproperty* prop);
+    const char* (*icalproperty_get_uid) (const icalproperty* prop);
+    int (*icalproperty_get_sequence) (const icalproperty* prop);
     icalparameter* (*icalproperty_get_first_parameter) (icalproperty* prop, icalparameter_kind kind);
     struct icaltimetype (*icalproperty_get_lastmodified) (const icalproperty* prop);
     icalproperty* (*icalproperty_vanew_lastmodified) (struct icaltimetype v, ...);
@@ -185,12 +191,21 @@ struct EDSAbiWrapper {
     const char* (*icalproperty_get_summary) (const icalproperty* prop);
     icalproperty* (*icalproperty_new_description) (const char* v);
     icalproperty* (*icalproperty_new_summary) (const char* v);
+    icalproperty* (*icalproperty_new_sequence) (int v);
+    icalproperty* (*icalproperty_new_uid) (const char* v);
     void (*icalproperty_set_value_from_string) (icalproperty* prop,const char* value, const char* kind);
+    void (*icalproperty_set_dtstamp) (icalproperty* prop, struct icaltimetype v);
+    void (*icalproperty_set_lastmodified) (icalproperty* prop, struct icaltimetype v);
+    void (*icalproperty_set_sequence) (icalproperty* prop, int v);
+    void (*icalproperty_set_uid) (icalproperty* prop, const char *v);
     void (*icalproperty_remove_parameter_by_kind)(icalproperty* prop,
                                                   icalparameter_kind kind);
     int (*icaltime_is_null_time)(const struct icaltimetype t);
     const char* (*icaltime_as_ical_string) (const struct icaltimetype tt);
     icaltimetype (*icaltime_from_string)(const char* str);
+    icaltimetype (*icaltime_from_timet)(const time_t v, const int is_date);
+    icaltimetype (*icaltime_null_time)();
+    time_t (*icaltime_as_timet)(const struct icaltimetype);
     void (*icaltime_set_timezone)(icaltimetype *tt, const icaltimezone *zone);
 
     void (*icaltimezone_free) (icaltimezone *zone, int free_struct);
@@ -314,6 +329,9 @@ extern struct EDSAbiWrapper EDSAbiWrapperSingleton;
 #   define icalcomponent_isa EDSAbiWrapperSingleton.icalcomponent_isa
 #   define icalcomponent_new_clone EDSAbiWrapperSingleton.icalcomponent_new_clone
 #   define icalcomponent_new_from_string EDSAbiWrapperSingleton.icalcomponent_new_from_string
+#   define icalcomponent_new EDSAbiWrapperSingleton.icalcomponent_new
+#   define icalcomponent_merge_component EDSAbiWrapperSingleton.icalcomponent_merge_component
+#   define icalcomponent_remove_component EDSAbiWrapperSingleton.icalcomponent_remove_component
 #   define icalcomponent_remove_property EDSAbiWrapperSingleton.icalcomponent_remove_property
 #   define icalcomponent_set_uid EDSAbiWrapperSingleton.icalcomponent_set_uid
 #   define icalcomponent_set_recurrenceid EDSAbiWrapperSingleton.icalcomponent_set_recurrenceid
@@ -323,17 +341,29 @@ extern struct EDSAbiWrapper EDSAbiWrapperSingleton;
 #   define icalproperty_new_clone EDSAbiWrapperSingleton.icalproperty_new_clone
 #   define icalproperty_free EDSAbiWrapperSingleton.icalproperty_free
 #   define icalproperty_get_description EDSAbiWrapperSingleton.icalproperty_get_description
+#   define icalproperty_get_uid EDSAbiWrapperSingleton.icalproperty_get_uid
+#   define icalproperty_get_sequence EDSAbiWrapperSingleton.icalproperty_get_sequence
+#   define icalproperty_get_property_name EDSAbiWrapperSingleton.icalproperty_get_property_name
 #   define icalproperty_get_first_parameter EDSAbiWrapperSingleton.icalproperty_get_first_parameter
 #   define icalproperty_get_lastmodified EDSAbiWrapperSingleton.icalproperty_get_lastmodified
 #   define icalproperty_get_next_parameter EDSAbiWrapperSingleton.icalproperty_get_next_parameter
 #   define icalproperty_get_summary EDSAbiWrapperSingleton.icalproperty_get_summary
 #   define icalproperty_new_description EDSAbiWrapperSingleton.icalproperty_new_description
 #   define icalproperty_new_summary EDSAbiWrapperSingleton.icalproperty_new_summary
+#   define icalproperty_new_uid EDSAbiWrapperSingleton.icalproperty_new_uid
+#   define icalproperty_new_sequence EDSAbiWrapperSingleton.icalproperty_new_sequence
 #   define icalproperty_set_value_from_string EDSAbiWrapperSingleton.icalproperty_set_value_from_string
+#   define icalproperty_set_dtstamp EDSAbiWrapperSingleton.icalproperty_set_dtstamp
+#   define icalproperty_set_lastmodified EDSAbiWrapperSingleton.icalproperty_set_lastmodified
+#   define icalproperty_set_sequence EDSAbiWrapperSingleton.icalproperty_set_sequence
+#   define icalproperty_set_uid EDSAbiWrapperSingleton.icalproperty_set_uid
 #   define icalproperty_remove_parameter_by_kind EDSAbiWrapperSingleton.icalproperty_remove_parameter_by_kind
 #   define icaltime_is_null_time EDSAbiWrapperSingleton.icaltime_is_null_time
 #   define icaltime_as_ical_string (EDSAbiWrapperSingleton.icaltime_as_ical_string_r ? EDSAbiWrapperSingleton.icaltime_as_ical_string_r : EDSAbiWrapperSingleton.icaltime_as_ical_string)
 #   define icaltime_from_string EDSAbiWrapperSingleton.icaltime_from_string
+#   define icaltime_from_timet EDSAbiWrapperSingleton.icaltime_from_timet
+#   define icaltime_null_time EDSAbiWrapperSingleton.icaltime_null_time
+#   define icaltime_as_timet EDSAbiWrapperSingleton.icaltime_as_timet
 #   define icaltime_set_timezone EDSAbiWrapperSingleton.icaltime_set_timezone
 #   define icaltimezone_free EDSAbiWrapperSingleton.icaltimezone_free
 #   define icaltimezone_get_builtin_timezone EDSAbiWrapperSingleton.icaltimezone_get_builtin_timezone

diff --git a/test/synccompare.pl b/test/synccompare.pl
index c35a493..5e7e291 100644 (file)
--- a/test/synccompare.pl
+++ b/test/synccompare.pl
@@ -424,7 +424,7 @@ sub NormalizeItem {
 
     if ($funambol) {
       # several properties are not preserved
-      s/^(CALURI|FBURL|X-MOZILLA-HTML|X-EVOLUTION-FILE-AS|X-AIM|X-EVOLUTION-BLOG-URL|X-EVOLUTION-VIDEO-URL|X-GROUPWISE|X-ICQ|X-YAHOO|X-ASSISTANT)(;[^:;\n]*)*:.*\r?\n?//gm;
+      s/^(CALURI|FBURL|X-MOZILLA-HTML|X-EVOLUTION-FILE-AS|X-AIM|X-EVOLUTION-BLOG-URL|X-EVOLUTION-VIDEO-URL|X-GROUPWISE|X-ICQ|X-YAHOO|X-GADUGADU|X-JABBER|X-MSN|X-SIP|X-SKYPE|X-ASSISTANT)(;[^:;\n]*)*:.*\r?\n?//gm;
 
       # quoted-printable line breaks are =0D=0A, not just single =0A
       s/(?<!=0D)=0A/=0D=0A/g;
@@ -562,7 +562,7 @@ sub NormalizeItem {
       }
     }
     if ($mobical) {
-      s/^(CALURI|CATEGORIES|FBURL|NICKNAME|X-MOZILLA-HTML|X-EVOLUTION-FILE-AS|X-ANNIVERSARY|X-ASSISTANT|X-EVOLUTION-BLOG-URL|X-EVOLUTION-VIDEO-URL|X-GROUPWISE|X-ICQ|X-MANAGER|X-SPOUSE|X-YAHOO|X-AIM)(;[^:;\n]*)*:.*\r?\n?//gm;
+      s/^(CALURI|CATEGORIES|FBURL|NICKNAME|X-MOZILLA-HTML|X-EVOLUTION-FILE-AS|X-ANNIVERSARY|X-ASSISTANT|X-EVOLUTION-BLOG-URL|X-EVOLUTION-VIDEO-URL|X-GROUPWISE|X-ICQ|X-GADUGADU|X-JABBER|X-MSN|X-SIP|X-SKYPE|X-MANAGER|X-SPOUSE|X-YAHOO|X-AIM)(;[^:;\n]*)*:.*\r?\n?//gm;
 
       # some workrounds here for mobical's bug 
       s/^(FN|BDAY)(;[^:;\n]*)*:.*\r?\n?//gm;