Sync for 1.1.1.

svn path=/trunk/; revision=18024

3 files changed, 64 insertions, 5 deletions

diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
index 79d0fec3c6..28eeb19875 100644
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -46,6 +46,7 @@ typedef enum {
 	CAL_CLIENT_OPEN_SUCCESS,
 	CAL_CLIENT_OPEN_ERROR,
 	CAL_CLIENT_OPEN_NOT_FOUND,
+	CAL_CLIENT_OPEN_PERMISSION_DENIED,
 	CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED
 } CalClientOpenStatus;
 </ENUM>
@@ -66,6 +67,26 @@ typedef enum {
 } CalClientGetStatus;
 </ENUM>
 <ENUM>
+<NAME>CalClientResult</NAME>
+typedef enum {
+	CAL_CLIENT_RESULT_SUCCESS,
+	CAL_CLIENT_RESULT_CORBA_ERROR,
+	CAL_CLIENT_RESULT_INVALID_OBJECT,
+	CAL_CLIENT_RESULT_NOT_FOUND,
+	CAL_CLIENT_RESULT_PERMISSION_DENIED
+} CalClientResult;
+</ENUM>
+<ENUM>
+<NAME>CalClientSendResult</NAME>
+typedef enum {
+	CAL_CLIENT_SEND_SUCCESS,
+	CAL_CLIENT_SEND_CORBA_ERROR,
+	CAL_CLIENT_SEND_INVALID_OBJECT,
+	CAL_CLIENT_SEND_BUSY,
+	CAL_CLIENT_SEND_PERMISSION_DENIED
+} CalClientSendResult;
+</ENUM>
+<ENUM>
 <NAME>CalClientLoadState</NAME>
 typedef enum {
 	CAL_CLIENT_LOAD_NOT_LOADED,
@@ -207,20 +228,25 @@ CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms *
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_client_update_object</NAME>
-<RETURNS>gboolean  </RETURNS>
+<RETURNS>CalClientResult  </RETURNS>
 CalClient *client, CalComponent *comp
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_client_update_objects</NAME>
-<RETURNS>gboolean  </RETURNS>
+<RETURNS>CalClientResult  </RETURNS>
 CalClient *client, icalcomponent *icalcomp
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_client_remove_object</NAME>
-<RETURNS>gboolean  </RETURNS>
+<RETURNS>CalClientResult  </RETURNS>
 CalClient *client, const char *uid
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_send_object</NAME>
+<RETURNS>CalClientSendResult  </RETURNS>
+CalClient *client, icalcomponent *icalcomp,icalcomponent **new_icalcomp, GList **users,char error_msg[256]
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_get_query</NAME>
 <RETURNS>CalQuery  *</RETURNS>
 CalClient *client, const char *sexp
diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
index 4426d6c478..6c53f5adbc 100644
--- a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -57,6 +57,7 @@ GTK+ object for communication with personal calendar server.
 @CAL_CLIENT_OPEN_SUCCESS: 
 @CAL_CLIENT_OPEN_ERROR: 
 @CAL_CLIENT_OPEN_NOT_FOUND: 
+@CAL_CLIENT_OPEN_PERMISSION_DENIED: 
 @CAL_CLIENT_OPEN_METHOD_NOT_SUPPORTED: 
 
 <!-- ##### ENUM CalClientGetStatus ##### -->
@@ -336,3 +337,10 @@ End:
 @calclient: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL CalClient::backend-died ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+
diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
index 30a652765b..89cad7611e 100644
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -112,7 +112,7 @@ typedef enum {
 typedef struct {
 	CalComponentRangeType type;
 	
-	CalComponentDateTime *datetime;
+	CalComponentDateTime datetime;
 } CalComponentRange;
 </TYPEDEF>
 <TYPEDEF>
@@ -220,6 +220,11 @@ CalComponent *comp
 CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_strip_errors</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_vtype</NAME>
 <RETURNS>CalComponentVType  </RETURNS>
 CalComponent *comp
@@ -235,6 +240,11 @@ CalComponent *comp
 CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_abort_sequence</NAME>
+<RETURNS>void  </RETURNS>
+CalComponent *comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_uid</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, const char **uid
@@ -462,7 +472,7 @@ CalComponent *comp, int *priority
 <FUNCTION>
 <NAME>cal_component_get_recurid</NAME>
 <RETURNS>void  </RETURNS>
-CalComponent *comp, CalComponentRange **recur_id
+CalComponent *comp, CalComponentRange *recur_id
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_component_set_recurid</NAME>
@@ -822,6 +832,11 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger
 <RETURNS>void  </RETURNS>
 CalComponentAlarm *alarm, CalAlarmTrigger trigger
 </FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_get_icalcomponent</NAME>
+<RETURNS>icalcomponent  *</RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
 <USER_FUNCTION>
 <NAME>CalRecurInstanceFn</NAME>
 <RETURNS>gboolean </RETURNS>
@@ -908,6 +923,16 @@ int priority
 const char *string
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_util_expand_uri</NAME>
+<RETURNS>char  *</RETURNS>
+char *uri, gboolean tasks
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_util_add_timezones_from_component</NAME>
+<RETURNS>void  </RETURNS>
+icalcomponent *vcal_comp,CalComponent *comp
+</FUNCTION>
+<FUNCTION>
 <NAME>time_days_in_month</NAME>
 <RETURNS>int 	</RETURNS>
 int year, int month