Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-sharp/configure.in,v
retrieving revision 1.29
diff -u -B -p -r1.29 configure.in
--- configure.in	6 Dec 2005 20:36:00 -0000	1.29
+++ configure.in	26 Apr 2006 21:57:37 -0000
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(evolution-sharp, 0.10.2)
+AM_INIT_AUTOMAKE(evolution-sharp, 0.11.0)
 AM_MAINTAINER_MODE
 
 AC_PROG_INSTALL
@@ -12,23 +12,33 @@ if test "x$PKG_CONFIG" = "xno"; then
 	AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.3.5, eds13=yes, eds13=no)
-if test "x$eds13" = "xyes"; then
+PKG_CHECK_MODULES(EDS12, evolution-data-server-1.2 >= 1.2, edsver="1.2", foo=bar)
+PKG_CHECK_MODULES(EDS14, evolution-data-server-1.2 >= 1.4, edsver="1.4", foo=bar)
+PKG_CHECK_MODULES(EDS16, evolution-data-server-1.2 >= 1.6, edsver="1.6", foo=bar)
+
+if test "x$edsver" = "x"; then
+	AC_MSG_ERROR([You need evolution-data-server 1.2.x, 1.4.x, or 1.6.x])
+fi
+
+if test "x$edsver" = "x1.2"; then
+	EDS_VERSION=-1.2
+	EDS_SOVERSION=4
+	EBOOK_SOVERSION=3
+	ECAL_SOVERSION=2
+fi
+
+if test "x$edsver" = "x1.4"; then
 	EDS_VERSION=-1.2
 	EDS_SOVERSION=4
 	EBOOK_SOVERSION=5
 	ECAL_SOVERSION=3
-else
-	PKG_CHECK_MODULES(BASE_DEPENDENCIES, evolution-data-server-1.2 >= 1.2.0 evolution-data-server-1.2 < 1.3.0, eds12=yes, eds12=no)
+fi
 
-	if test "x$eds12" = "xyes"; then
-		EDS_VERSION=-1.2
-		EDS_SOVERSION=4
-		EBOOK_SOVERSION=3
-		ECAL_SOVERSION=2
-	else
-		AC_MSG_ERROR([You need evolution-data-server 1.2.x or 1.3.5 or newer])
-	fi
+if test "x$edsver" = "x1.6"; then
+	EDS_VERSION=-1.2
+	EDS_SOVERSION=7
+	EBOOK_SOVERSION=5
+	ECAL_SOVERSION=3
 fi
 
 AC_SUBST(EDS_VERSION)
@@ -36,7 +46,8 @@ AC_SUBST(EDS_SOVERSION)
 AC_SUBST(EBOOK_SOVERSION)
 AC_SUBST(ECAL_SOVERSION)
 
-AM_CONDITIONAL(USE_EVO12, test "x$eds12" = "xyes")
+AM_CONDITIONAL(USE_EVO12, test "x$edsver" = "x1.2")
+AM_CONDITIONAL(USE_EVO14, test "x$edsver" = "x1.4")
 
 PKG_CHECK_MODULES(MONO, mono >= 1.0.0)
 AC_PATH_PROG(CSC, mcs, no)
@@ -107,11 +118,19 @@ IDL_INCLUDES="-I "`pkg-config --variable
 AC_MSG_RESULT($IDL_INCLUDES)
 AC_SUBST(IDL_INCLUDES)
 
-PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.4",, [PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-2.2")])
+PKG_CHECK_MODULES(ESHELL22, "evolution-shell-2.2", eshellver="2.2", foo=bar)
+PKG_CHECK_MODULES(ESHELL24, "evolution-shell-2.4", eshellver="2.4", foo=bar)
+PKG_CHECK_MODULES(ESHELL26, "evolution-shell-2.6", eshellver="2.6", foo=bar)
+
+if test "x$eshellver" = "x"; then
+	AC_MSG_ERROR([You need to install evolution-shell])
+fi
+
+PKG_CHECK_MODULES(EVO_SHELL, "evolution-shell-$eshellver")
 AC_SUBST(EVO_SHELL_CFLAGS)
 AC_SUBST(EVO_SHELL_LIBS)
 
-EVO_SHELL_LIBDIR=`$PKG_CONFIG --variable=privlibdir evolution-shell-2.4`
+EVO_SHELL_LIBDIR=`$PKG_CONFIG --variable=privlibdir evolution-shell-2.6`
 AC_SUBST(EVO_SHELL_LIBDIR)
 
 API_VERSION=2.0.0.0
@@ -130,10 +149,6 @@ Makefile
 echo "---"
 echo "Configuration successful."
 echo
-if test "x$eds12" = "xyes"; then
-echo "Using evolution-data-server 1.2.x API"
-else
-echo "Using evolution-data-server 1.3.x API"
-fi
+echo "Using evolution-data-server ${edsver}.x API"
 echo "---"
 
Index: evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-sharp/evolution/Makefile.am,v
retrieving revision 1.26
diff -u -B -p -r1.26 Makefile.am
--- evolution/Makefile.am	12 Sep 2005 20:55:35 -0000	1.26
+++ evolution/Makefile.am	26 Apr 2006 21:57:37 -0000
@@ -1,9 +1,13 @@
-RAW_APIS = evolution-api-1.2.raw evolution-api.raw
+RAW_APIS = evolution-api-1.4.raw evolution-api-1.2.raw evolution-api.raw
 
+if USE_EVO14
+RAW_API = evolution-api-1.4.raw
+else
 if USE_EVO12
 RAW_API = evolution-api-1.2.raw
 else
 RAW_API = evolution-api.raw
+endif
 endif
 
 API=evolution-api.xml
Index: evolution/evolution-api.raw
===================================================================
RCS file: /cvs/gnome/evolution-sharp/evolution/evolution-api.raw,v
retrieving revision 1.10
diff -u -B -p -r1.10 evolution-api.raw
--- evolution/evolution-api.raw	30 Aug 2005 21:14:16 -0000	1.10
+++ evolution/evolution-api.raw	26 Apr 2006 21:57:39 -0000
@@ -187,16 +187,16 @@
       <member cname="E_CONTACT_ANNIVERSARY" name="Anniversary" />
       <member cname="E_CONTACT_X509_CERT" name="X509Cert" />
       <member cname="E_CONTACT_FIELD_LAST" name="FieldLast" />
-      <member cname="E_CONTACT_FIELD_FIRST" name="FieldFirst" />
-      <member cname="E_CONTACT_LAST_SIMPLE_STRING" name="LastSimpleString" />
-      <member cname="E_CONTACT_FIRST_PHONE_ID" name="FirstPhoneId" />
-      <member cname="E_CONTACT_LAST_PHONE_ID" name="LastPhoneId" />
-      <member cname="E_CONTACT_FIRST_EMAIL_ID" name="FirstEmailId" />
-      <member cname="E_CONTACT_LAST_EMAIL_ID" name="LastEmailId" />
-      <member cname="E_CONTACT_FIRST_ADDRESS_ID" name="FirstAddressId" />
-      <member cname="E_CONTACT_LAST_ADDRESS_ID" name="LastAddressId" />
-      <member cname="E_CONTACT_FIRST_LABEL_ID" name="FirstLabelId" />
-      <member cname="E_CONTACT_LAST_LABEL_ID" name="LastLabelId" />
+      <member cname="E_CONTACT_FIELD_FIRST" name="FieldFirst" value="Uid" />
+      <member cname="E_CONTACT_LAST_SIMPLE_STRING" name="LastSimpleString" value="NameOrOrg" />
+      <member cname="E_CONTACT_FIRST_PHONE_ID" name="FirstPhoneId" value="PhoneAssistant" />
+      <member cname="E_CONTACT_LAST_PHONE_ID" name="LastPhoneId" value="PhoneTtytdd" />
+      <member cname="E_CONTACT_FIRST_EMAIL_ID" name="FirstEmailId" value="Email1" />
+      <member cname="E_CONTACT_LAST_EMAIL_ID" name="LastEmailId" value="Email4" />
+      <member cname="E_CONTACT_FIRST_ADDRESS_ID" name="FirstAddressId" value="AddressHome" />
+      <member cname="E_CONTACT_LAST_ADDRESS_ID" name="LastAddressId" value="AddressOther" />
+      <member cname="E_CONTACT_FIRST_LABEL_ID" name="FirstLabelId" value="AddressLabelHome" />
+      <member cname="E_CONTACT_LAST_LABEL_ID" name="LastLabelId" value="AddressLabelOther" />
     </enum>
     <enum name="VCardFormat" cname="EVCardFormat" type="enum">
       <member cname="EVC_FORMAT_VCARD_21" name="Two1" />
@@ -803,7 +803,7 @@
         </parameters>
       </signal>
       <method name="Copy" cname="e_destination_copy">
-        <return-type type="EDestination*" />
+        <return-type type="EDestination*" owned="true" />
       </method>
       <method name="Empty" cname="e_destination_empty">
         <return-type type="gboolean" />
@@ -883,6 +883,9 @@
       <method name="IsEvolutionList" cname="e_destination_is_evolution_list">
         <return-type type="gboolean" />
       </method>
+      <method name="IsIgnored" cname="e_destination_is_ignored">
+        <return-type type="gboolean" />
+      </method>
       <method name="ListGetDests" cname="e_destination_list_get_dests">
         <return-type type="const-GList*" />
       </method>
@@ -928,6 +931,12 @@
           <parameter type="gboolean" name="flag" />
         </parameters>
       </method>
+      <method name="SetIgnored" cname="e_destination_set_ignored">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gboolean" name="ignored" />
+        </parameters>
+      </method>
       <method name="SetName" cname="e_destination_set_name">
         <return-type type="void" />
         <parameters>
@@ -1073,7 +1082,7 @@
         </parameters>
       </method>
       <method name="Copy" cname="e_book_query_copy">
-        <return-type type="EBookQuery*" />
+        <return-type type="EBookQuery*" owned="true" />
       </method>
       <method name="FieldExists" cname="e_book_query_field_exists" shared="true">
         <return-type type="EBookQuery*" />
@@ -1161,10 +1170,10 @@
         <return-type type="GType" />
       </method>
     </boxed>
-    <boxed name="ContactDate" cname="EContactDate">
-      <field name="Year" cname="year" type="int" />
-      <field name="Month" cname="month" type="int" />
-      <field name="Day" cname="day" type="int" />
+    <boxed name="ContactDate" cname="EContactDate" opaque="true">
+      <field name="Year" cname="year" type="int" access="public" writeable="true" />
+      <field name="Month" cname="month" type="int" access="public" writeable="true" />
+      <field name="Day" cname="day" type="int" access="public" writeable="true" />
       <method name="Equal" cname="e_contact_date_equal">
         <return-type type="gboolean" />
         <parameters>
@@ -1188,14 +1197,14 @@
         <return-type type="char*" />
       </method>
     </boxed>
-    <boxed name="ContactName" cname="EContactName">
-      <field name="Family" cname="family" type="char*" />
-      <field name="Given" cname="given" type="char*" />
-      <field name="Additional" cname="additional" type="char*" />
-      <field name="Prefixes" cname="prefixes" type="char*" />
-      <field name="Suffixes" cname="suffixes" type="char*" />
+    <boxed name="ContactName" cname="EContactName" opaque="true">
+      <field name="Family" cname="family" type="char*" access="public" writeable="true" />
+      <field name="Given" cname="given" type="char*" access="public" writeable="true" />
+      <field name="Additional" cname="additional" type="char*" access="public" writeable="true" />
+      <field name="Prefixes" cname="prefixes" type="char*" access="public" writeable="true" />
+      <field name="Suffixes" cname="suffixes" type="char*" access="public" writeable="true" />
       <method name="Copy" cname="e_contact_name_copy">
-        <return-type type="EContactName*" />
+        <return-type type="EContactName*" owned="true" />
       </method>
       <method name="Free" cname="e_contact_name_free">
         <return-type type="void" />
@@ -1283,7 +1292,7 @@
         </parameters>
       </method>
       <method name="Copy" cname="e_vcard_attribute_copy">
-        <return-type type="EVCardAttribute*" />
+        <return-type type="EVCardAttribute*" owned="true" />
       </method>
       <method name="Free" cname="e_vcard_attribute_free">
         <return-type type="void" />
@@ -1345,7 +1354,7 @@
         </parameters>
       </method>
       <method name="Copy" cname="e_vcard_attribute_param_copy">
-        <return-type type="EVCardAttributeParam*" />
+        <return-type type="EVCardAttributeParam*" owned="true" />
       </method>
       <method name="Free" cname="e_vcard_attribute_param_free">
         <return-type type="void" />
@@ -1379,7 +1388,7 @@
         <return-type type="char*" />
       </method>
       <method name="Copy" cname="e_source_copy">
-        <return-type type="ESource*" />
+        <return-type type="ESource*" owned="true" />
       </method>
       <method name="DumpToXmlNode" cname="e_source_dump_to_xml_node">
         <return-type type="void" />
@@ -1682,6 +1691,9 @@
       <method name="GetType" cname="e_source_list_get_type" shared="true">
         <return-type type="GType" />
       </method>
+      <method name="IsGconfUpdated" cname="e_source_list_is_gconf_updated">
+        <return-type type="gboolean" />
+      </method>
       <constructor cname="e_source_list_new" />
       <constructor cname="e_source_list_new_for_gconf">
         <parameters>
@@ -1898,7 +1910,7 @@
       <method name="GetAlarmsForObject" cname="e_cal_get_alarms_for_object">
         <return-type type="gboolean" />
         <parameters>
-          <parameter type="const-char*" name="uid" />
+          <parameter type="const-ECalComponentId*" name="id" />
           <parameter type="time_t" name="start" />
           <parameter type="time_t" name="end" />
           <parameter type="ECalComponentAlarms**" name="alarms" />
@@ -2095,6 +2107,7 @@
         </parameters>
       </constructor>
       <constructor cname="e_cal_new_system_calendar" />
+      <constructor cname="e_cal_new_system_memos" />
       <constructor cname="e_cal_new_system_tasks" />
       <method name="Open" cname="e_cal_open">
         <return-type type="gboolean" />