This commit was manufactured by cvs2svn to create tagEVOLUTION_1_2_4

'EVOLUTION_1_2_4'.

svn path=/tags/EVOLUTION_1_2_4/; revision=20614

4 files changed, 82 insertions, 17 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 68bfef1c1a..81a7935805 100644
--- a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -172,11 +172,41 @@ CalClient *client
 CalClient *client
 </FUNCTION>
 <FUNCTION>
-<NAME>cal_client_get_email_address</NAME>
+<NAME>cal_client_get_cal_address</NAME>
 <RETURNS>const char  *</RETURNS>
 CalClient *client
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_get_alarm_email_address</NAME>
+<RETURNS>const char  *</RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_ldap_attribute</NAME>
+<RETURNS>const char  *</RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_one_alarm_only</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_organizer_must_attend</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_save_schedules</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_client_get_static_capability</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client, const char *cap
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_set_mode</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, CalMode mode
@@ -187,6 +217,11 @@ CalClient *client, CalMode mode
 CalClient *client, CalObjType type
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_get_default_object</NAME>
+<RETURNS>CalClientGetStatus  </RETURNS>
+CalClient *client,CalObjType type,CalComponent **comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_get_object</NAME>
 <RETURNS>CalClientGetStatus  </RETURNS>
 CalClient *client,const char *uid,CalComponent **comp
@@ -242,6 +277,11 @@ CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms *
 CalClient *client, CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_update_object_with_mod</NAME>
+<RETURNS>CalClientResult  </RETURNS>
+CalClient *client, CalComponent *comp, CalObjModType mod
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_update_objects</NAME>
 <RETURNS>CalClientResult  </RETURNS>
 CalClient *client, icalcomponent *icalcomp
@@ -252,6 +292,11 @@ CalClient *client, icalcomponent *icalcomp
 CalClient *client, const char *uid
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_remove_object_with_mod</NAME>
+<RETURNS>CalClientResult  </RETURNS>
+CalClient *client, const char *uid, CalObjModType mod
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_send_object</NAME>
 <RETURNS>CalClientSendResult  </RETURNS>
 CalClient *client, icalcomponent *icalcomp,icalcomponent **new_icalcomp, GList **users,char error_msg[256]
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 af91e3f9cb..3e50cb0ee0 100644
--- a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -525,6 +525,11 @@ CalComponent *comp
 CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_is_instance</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalComponent *comp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_get_sequence</NAME>
 <RETURNS>void  </RETURNS>
 CalComponent *comp, int **sequence
@@ -615,6 +620,11 @@ GSList *categ_list
 CalComponentDateTime *dt
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_free_range</NAME>
+<RETURNS>void  </RETURNS>
+CalComponentRange *range
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_free_exdate_list</NAME>
 <RETURNS>void  </RETURNS>
 GSList *exdate_list
@@ -838,6 +848,21 @@ CalComponentAlarm *alarm, CalAlarmTrigger *trigger
 CalComponentAlarm *alarm, CalAlarmTrigger trigger
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_component_alarm_get_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponentAlarm *alarm, GSList **attendee_list
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_set_attendee_list</NAME>
+<RETURNS>void  </RETURNS>
+CalComponentAlarm *alarm, GSList *attendee_list
+</FUNCTION>
+<FUNCTION>
+<NAME>cal_component_alarm_has_attendees</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalComponentAlarm *alarm
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_component_alarm_get_icalcomponent</NAME>
 <RETURNS>icalcomponent  *</RETURNS>
 CalComponentAlarm *alarm
@@ -884,6 +909,15 @@ typedef enum {
 } CalObjType;
 </ENUM>
 <ENUM>
+<NAME>CalObjModType</NAME>
+typedef enum {
+	CALOBJ_MOD_THIS          = 1 << 0,
+	CALOBJ_MOD_THISANDPRIOR  = 1 << 1,
+	CALOBJ_MOD_THISANDFUTURE = 1 << 2,
+	CALOBJ_MOD_ALL           = 0x07
+} CalObjModType;
+</ENUM>
+<ENUM>
 <NAME>CalMode</NAME>
 typedef enum {
 	CAL_MODE_INVALID = -1,
@@ -905,12 +939,12 @@ void
 <FUNCTION>
 <NAME>cal_util_generate_alarms_for_comp</NAME>
 <RETURNS>CalComponentAlarms  *</RETURNS>
-CalComponent *comp,time_t start,time_t end,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone
+CalComponent *comp,time_t start,time_t end,CalAlarmAction *omit,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_util_generate_alarms_for_list</NAME>
 <RETURNS>int  </RETURNS>
-GList *comps,time_t start,time_t end,GSList **comp_alarms,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone
+GList *comps,time_t start,time_t end,CalAlarmAction *omit,GSList **comp_alarms,CalRecurResolveTimezoneFn resolve_tzid,gpointer user_data,icaltimezone *default_timezone
 </FUNCTION>
 <FUNCTION>
 <NAME>cal_util_resolve_tzid</NAME>
diff --git a/doc/devel/executive-summary/evolution-services.hierarchy b/doc/devel/executive-summary/evolution-services.hierarchy
deleted file mode 100644
index 37559d819d..0000000000
--- a/doc/devel/executive-summary/evolution-services.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    ExecutiveSummaryComponent
-    ExecutiveSummaryComponentFactory
-    Handle to remote Bonobo::Unknown
-      ExecutiveSummaryComponentFactoryClient
-    ExecutiveSummaryHtmlView
diff --git a/doc/devel/importer/evolution-shell-importer.hierarchy b/doc/devel/importer/evolution-shell-importer.hierarchy
deleted file mode 100644
index c46ebdf782..0000000000
--- a/doc/devel/importer/evolution-shell-importer.hierarchy
+++ /dev/null
@@ -1,7 +0,0 @@
-GtkObject
-  BonoboObject
-    BonoboXObject
-      EvolutionImporter
-      EvolutionImporterListener
-    Handle to remote Bonobo::Unknown
-      EvolutionImporterClient