Deprecate CalMode and cal_mode_to_corba().

diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h
index 0d620f2..4067248 100644 (file)
--- a/calendar/libecal/e-cal-util.h
+++ b/calendar/libecal/e-cal-util.h
@@ -52,19 +52,6 @@ typedef enum {
        CALOBJ_MOD_ALL           = 0x07
 } CalObjModType;
 
-/* Used for mode stuff */
-typedef enum {
-       CAL_MODE_INVALID = -1,
-       CAL_MODE_LOCAL   = 1 << 0,
-       CAL_MODE_REMOTE  = 1 << 1,
-       CAL_MODE_ANY     = 0x07
-} CalMode;
-
-#define cal_mode_to_corba(mode) \
-       (mode == CAL_MODE_LOCAL   ? Local  : \
-        mode == CAL_MODE_REMOTE  ? Remote : \
-        AnyMode)
-
 void cal_obj_uid_list_free (GList *list);
 
 icalcomponent *        e_cal_util_new_top_level        (void);
@@ -209,6 +196,21 @@ void               e_cal_util_get_component_occur_times
                                                 const icaltimezone *default_timezone,
                                                 icalcomponent_kind kind);
 
+#ifndef EDS_DISABLE_DEPRECATED
+/* Used for mode stuff */
+typedef enum {
+       CAL_MODE_INVALID = -1,
+       CAL_MODE_LOCAL   = 1 << 0,
+       CAL_MODE_REMOTE  = 1 << 1,
+       CAL_MODE_ANY     = 0x07
+} CalMode;
+
+#define cal_mode_to_corba(mode) \
+       (mode == CAL_MODE_LOCAL   ? Local  : \
+        mode == CAL_MODE_REMOTE  ? Remote : \
+        AnyMode)
+#endif /* EDS_DISABLE_DEPRECATED */
+
 G_END_DECLS
 
 #endif /* E_CAL_UTIL_H */

diff --git a/docs/reference/calendar/libecal/libecal-sections.txt b/docs/reference/calendar/libecal/libecal-sections.txt
index 2365e76..21348bb 100644 (file)
--- a/docs/reference/calendar/libecal/libecal-sections.txt
+++ b/docs/reference/calendar/libecal/libecal-sections.txt
@@ -447,8 +447,6 @@ E_CALENDAR_STATUS_CORBA_EXCEPTION
 CalObjInstance
 cal_obj_instance_list_free
 CalObjModType
-CalMode
-cal_mode_to_corba
 cal_obj_uid_list_free
 e_cal_util_new_top_level
 e_cal_util_new_component
@@ -502,6 +500,9 @@ e_cal_util_remove_instances
 e_cal_util_get_system_timezone_location
 e_cal_util_get_system_timezone
 e_cal_util_get_component_occur_times
+<SUBSECTION Deprecated>
+CalMode
+cal_mode_to_corba
 </SECTION>
 
 <SECTION>