sync - Federico

svn path=/trunk/; revision=11821

3 files changed, 38 insertions, 5 deletions

diff --git a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
index b6aeb89512..5511d9fb74 100644
--- a/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
+++ b/help/devel/calendar/cal-client/evolution-cal-client-decl.txt
@@ -128,6 +128,11 @@ CalClient *client, CalObjType type
 CalClient *client,const char *uid,CalComponent **comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_get_timezone</NAME>
+<RETURNS>CalClientGetStatus  </RETURNS>
+CalClient *client,const char *tzid,icaltimezone **zone
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_get_uids</NAME>
 <RETURNS>GList  *</RETURNS>
 CalClient *client, CalObjType type
@@ -173,6 +178,11 @@ CalClient *client, const char *uid,time_t start, time_t end,CalComponentAlarms *
 CalClient *client, CalComponent *comp
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_client_update_objects</NAME>
+<RETURNS>gboolean  </RETURNS>
+CalClient *client, icalcomponent *icalcomp
+</FUNCTION>
+<FUNCTION>
 <NAME>cal_client_remove_object</NAME>
 <RETURNS>gboolean  </RETURNS>
 CalClient *client, const char *uid
@@ -182,6 +192,11 @@ CalClient *client, const char *uid
 <RETURNS>CalQuery  *</RETURNS>
 CalClient *client, const char *sexp
 </FUNCTION>
+<FUNCTION>
+<NAME>cal_client_resolve_tzid_cb</NAME>
+<RETURNS>icaltimezone  *</RETURNS>
+const char *tzid, gpointer data
+</FUNCTION>
 <MACRO>
 <NAME>CAL_QUERY_TYPE</NAME>
 #define CAL_QUERY_TYPE            (cal_query_get_type ())
@@ -317,3 +332,8 @@ QueryListener *ql,QueryListenerObjUpdatedFn obj_updated_fn,QueryListenerObjRemov
 <RETURNS>QueryListener  *</RETURNS>
 QueryListenerObjUpdatedFn obj_updated_fn,QueryListenerObjRemovedFn obj_removed_fn,QueryListenerQueryDoneFn query_done_fn,QueryListenerEvalErrorFn eval_error_fn,gpointer fn_data
 </FUNCTION>
+<FUNCTION>
+<NAME>query_listener_stop_notification</NAME>
+<RETURNS>void  </RETURNS>
+QueryListener *ql
+</FUNCTION>
diff --git a/help/devel/calendar/cal-client/tmpl/cal-client.sgml b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
index 27b0c28f98..dac080cca1 100644
--- a/help/devel/calendar/cal-client/tmpl/cal-client.sgml
+++ b/help/devel/calendar/cal-client/tmpl/cal-client.sgml
@@ -311,6 +311,14 @@ sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "
 End:
 -->
 
+<!-- ##### SIGNAL CalClient::categories-changed ##### -->
+<para>
+
+</para>
+
+@calclient: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL CalClient::forget-password ##### -->
 <para>
 
diff --git a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
index 631a3ca267..34164aba0e 100644
--- a/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
+++ b/help/devel/calendar/cal-util/evolution-cal-util-decl.txt
@@ -585,11 +585,6 @@ CalComponent *comp, GSList *attendee_list
 CalComponent *comp1, CalComponent *comp2
 </FUNCTION>
 <FUNCTION>
-<NAME>cal_component_compare_event_timezone</NAME>
-<RETURNS>gboolean  </RETURNS>
-CalComponent *comp, icaltimezone *zone
-</FUNCTION>
-<FUNCTION>
 <NAME>cal_component_free_categories_list</NAME>
 <RETURNS>void  </RETURNS>
 GSList *categ_list
@@ -864,6 +859,11 @@ typedef enum {
 GList *list
 </FUNCTION>
 <FUNCTION>
+<NAME>cal_util_new_top_level</NAME>
+<RETURNS>icalcomponent  *</RETURNS>
+void
+</FUNCTION>
+<FUNCTION>
 <NAME>time_days_in_month</NAME>
 <RETURNS>int 	</RETURNS>
 int year, int month
@@ -978,3 +978,8 @@ time_t time, icaltimezone *zone
 <RETURNS>time_t 	</RETURNS>
 time_t time, icaltimezone *zone
 </FUNCTION>
+<FUNCTION>
+<NAME>time_to_gdate_with_zone</NAME>
+<RETURNS>void  </RETURNS>
+GDate *date, time_t time, icaltimezone *zone
+</FUNCTION>