GNOME.org
 

[evolution-data-server] e-cal-util.h cleanups.

commit b88b28a64e72d4d7a348f1bd2b24a060c8b988c0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jan 28 15:23:44 2013 -0500

    e-cal-util.h cleanups.

 calendar/libecal/e-cal-util.h |  177 +++++++++++++++++++++-------------------
 1 files changed, 93 insertions(+), 84 deletions(-)
---
diff --git a/calendar/libecal/e-cal-util.h b/calendar/libecal/e-cal-util.h
index 9c1a61a..0d620f2 100644
--- a/calendar/libecal/e-cal-util.h
+++ b/calendar/libecal/e-cal-util.h
@@ -32,8 +32,6 @@
 
 G_BEGIN_DECLS
 
-
-
 /* Instance of a calendar object.  This can be an actual occurrence, a
  * recurrence, or an alarm trigger of a `real' calendar object.
  */
@@ -69,52 +67,62 @@ typedef enum {
 
 void cal_obj_uid_list_free (GList *list);
 
-icalcomponent *e_cal_util_new_top_level (void);
-icalcomponent *e_cal_util_new_component (icalcomponent_kind kind);
-
-icalcomponent *e_cal_util_parse_ics_string (const gchar *string);
-icalcomponent *e_cal_util_parse_ics_file (const gchar *filename);
-
-ECalComponentAlarms *e_cal_util_generate_alarms_for_comp (ECalComponent *comp,
-						       time_t start,
-						       time_t end,
-						       ECalComponentAlarmAction *omit,
-						       ECalRecurResolveTimezoneFn resolve_tzid,
-						       gpointer user_data,
-						       icaltimezone *default_timezone);
-gint e_cal_util_generate_alarms_for_list (GList *comps,
-				       time_t start,
-				       time_t end,
-				       ECalComponentAlarmAction *omit,
-				       GSList **comp_alarms,
-				       ECalRecurResolveTimezoneFn resolve_tzid,
-				       gpointer user_data,
-				       icaltimezone *default_timezone);
-
-const gchar *e_cal_util_priority_to_string (gint priority);
-gint e_cal_util_priority_from_string (const gchar *string);
-
-void e_cal_util_add_timezones_from_component (icalcomponent *vcal_comp,
-					    icalcomponent *icalcomp);
-
-gboolean e_cal_util_component_is_instance (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_alarms (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_organizer (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_recurrences (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_rdates (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_rrules (icalcomponent *icalcomp);
-gboolean e_cal_util_component_has_attendee (icalcomponent *icalcomp);
-gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *icalcomp2);
+icalcomponent *	e_cal_util_new_top_level	(void);
+icalcomponent *	e_cal_util_new_component	(icalcomponent_kind kind);
+
+icalcomponent *	e_cal_util_parse_ics_string	(const gchar *string);
+icalcomponent *	e_cal_util_parse_ics_file	(const gchar *filename);
+
+ECalComponentAlarms *
+		e_cal_util_generate_alarms_for_comp
+						(ECalComponent *comp,
+						 time_t start,
+						 time_t end,
+						 ECalComponentAlarmAction *omit,
+						 ECalRecurResolveTimezoneFn resolve_tzid,
+						 gpointer user_data,
+						 icaltimezone *default_timezone);
+gint		e_cal_util_generate_alarms_for_list
+						(GList *comps,
+						 time_t start,
+						 time_t end,
+						 ECalComponentAlarmAction *omit,
+						 GSList **comp_alarms,
+						 ECalRecurResolveTimezoneFn resolve_tzid,
+						 gpointer user_data,
+						 icaltimezone *default_timezone);
+
+const gchar *	e_cal_util_priority_to_string	(gint priority);
+gint		e_cal_util_priority_from_string	(const gchar *string);
+
+void		e_cal_util_add_timezones_from_component
+						(icalcomponent *vcal_comp,
+						 icalcomponent *icalcomp);
+
+gboolean	e_cal_util_component_is_instance
+						(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_alarms	(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_organizer
+						(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_recurrences
+						(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_rdates	(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_rrules	(icalcomponent *icalcomp);
+gboolean	e_cal_util_component_has_attendee
+						(icalcomponent *icalcomp);
+gboolean	e_cal_util_event_dates_match	(icalcomponent *icalcomp1,
+						 icalcomponent *icalcomp2);
+
 /* The static capabilities to be supported by backends */
-#define CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT             "no-alarm-repeat"
-#define CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS             "no-audio-alarms"
-#define CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS           "no-display-alarms"
-#define CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS             "no-email-alarms"
-#define CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS         "no-procedure-alarms"
-#define CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT          "no-task-assignment"
-#define CAL_STATIC_CAPABILITY_NO_THISANDFUTURE            "no-thisandfuture"
-#define CAL_STATIC_CAPABILITY_NO_THISANDPRIOR             "no-thisandprior"
-#define CAL_STATIC_CAPABILITY_NO_TRANSPARENCY             "no-transparency"
+#define CAL_STATIC_CAPABILITY_NO_ALARM_REPEAT		"no-alarm-repeat"
+#define CAL_STATIC_CAPABILITY_NO_AUDIO_ALARMS		"no-audio-alarms"
+#define CAL_STATIC_CAPABILITY_NO_DISPLAY_ALARMS		"no-display-alarms"
+#define CAL_STATIC_CAPABILITY_NO_EMAIL_ALARMS		"no-email-alarms"
+#define CAL_STATIC_CAPABILITY_NO_PROCEDURE_ALARMS	"no-procedure-alarms"
+#define CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT	"no-task-assignment"
+#define CAL_STATIC_CAPABILITY_NO_THISANDFUTURE		"no-thisandfuture"
+#define CAL_STATIC_CAPABILITY_NO_THISANDPRIOR		"no-thisandprior"
+#define CAL_STATIC_CAPABILITY_NO_TRANSPARENCY		"no-transparency"
 
 /**
  * CAL_STATIC_CAPABILITY_BULK_ADDS:
@@ -123,7 +131,7 @@ gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *
  *
  * Since: 3.6
  */
-#define CAL_STATIC_CAPABILITY_BULK_ADDS                   "bulk-adds"
+#define CAL_STATIC_CAPABILITY_BULK_ADDS			"bulk-adds"
 
 /**
  * CAL_STATIC_CAPABILITY_BULK_MODIFIES:
@@ -132,7 +140,7 @@ gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *
  *
  * Since: 3.6
  */
-#define CAL_STATIC_CAPABILITY_BULK_MODIFIES               "bulk-modifies"
+#define CAL_STATIC_CAPABILITY_BULK_MODIFIES		"bulk-modifies"
 
 /**
  * CAL_STATIC_CAPABILITY_BULK_REMOVES:
@@ -141,7 +149,7 @@ gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *
  *
  * Since: 3.6
  */
-#define CAL_STATIC_CAPABILITY_BULK_REMOVES                "bulk-removes"
+#define CAL_STATIC_CAPABILITY_BULK_REMOVES		"bulk-removes"
 
 /**
  * CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS:
@@ -150,31 +158,31 @@ gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *
  *
  * Since: 3.2
  **/
-#define CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS            "remove-only-this"
+#define CAL_STATIC_CAPABILITY_REMOVE_ONLY_THIS		"remove-only-this"
 
-#define CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY              "one-alarm-only"
-#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND       "organizer-must-attend"
-#define CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS "organizer-not-email-address"
-#define CAL_STATIC_CAPABILITY_REMOVE_ALARMS               "remove-alarms"
+#define CAL_STATIC_CAPABILITY_ONE_ALARM_ONLY		"one-alarm-only"
+#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ATTEND	"organizer-must-attend"
+#define CAL_STATIC_CAPABILITY_ORGANIZER_NOT_EMAIL_ADDRESS	"organizer-not-email-address"
+#define CAL_STATIC_CAPABILITY_REMOVE_ALARMS		"remove-alarms"
 
 /**
  * CAL_STATIC_CAPABILITY_CREATE_MESSAGES:
  *
  * Since: 2.26
  **/
-#define CAL_STATIC_CAPABILITY_CREATE_MESSAGES             "create-messages"
-
-#define CAL_STATIC_CAPABILITY_SAVE_SCHEDULES              "save-schedules"
-#define CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK	  "no-conv-to-assign-task"
-#define CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR		  "no-conv-to-recur"
-#define CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS		  "no-general-options"
-#define CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS		  "require-send-options"
-#define CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER       "recurrences-no-master-object"
-#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ACCEPT      "organizer-must-accept"
-#define CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED	 "delegate-support"
-#define CAL_STATIC_CAPABILITY_NO_ORGANIZER		 "no-organizer"
-#define CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY		 "delegate-to-many"
-#define CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING     "has-unaccepted-meeting"
+#define CAL_STATIC_CAPABILITY_CREATE_MESSAGES		"create-messages"
+
+#define CAL_STATIC_CAPABILITY_SAVE_SCHEDULES		"save-schedules"
+#define CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK	"no-conv-to-assign-task"
+#define CAL_STATIC_CAPABILITY_NO_CONV_TO_RECUR		"no-conv-to-recur"
+#define CAL_STATIC_CAPABILITY_NO_GEN_OPTIONS		"no-general-options"
+#define CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS		"require-send-options"
+#define CAL_STATIC_CAPABILITY_RECURRENCES_NO_MASTER	"recurrences-no-master-object"
+#define CAL_STATIC_CAPABILITY_ORGANIZER_MUST_ACCEPT	"organizer-must-accept"
+#define CAL_STATIC_CAPABILITY_DELEGATE_SUPPORTED	"delegate-support"
+#define CAL_STATIC_CAPABILITY_NO_ORGANIZER		"no-organizer"
+#define CAL_STATIC_CAPABILITY_DELEGATE_TO_MANY		"delegate-to-many"
+#define CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING	"has-unaccepted-meeting"
 
 /**
  * CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED:
@@ -184,22 +192,23 @@ gboolean e_cal_util_event_dates_match (icalcomponent *icalcomp1, icalcomponent *
 #define CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED		"refresh-supported"
 
 /* Recurrent events. Management for instances */
-icalcomponent *e_cal_util_construct_instance (icalcomponent *icalcomp,
-					    struct icaltimetype rid);
-void           e_cal_util_remove_instances (icalcomponent *icalcomp,
-					  struct icaltimetype rid,
-					  CalObjModType mod);
-
-gchar *e_cal_util_get_system_timezone_location (void);
-icaltimezone *e_cal_util_get_system_timezone (void);
-void e_cal_util_get_component_occur_times (ECalComponent *comp,
-				   time_t * start,
-				   time_t * end,
-				   ECalRecurResolveTimezoneFn tz_cb,
-				   gpointer tz_cb_data,
-				   const icaltimezone *default_timezone,
-				   icalcomponent_kind kind);
+icalcomponent *	e_cal_util_construct_instance	(icalcomponent *icalcomp,
+						 struct icaltimetype rid);
+void		e_cal_util_remove_instances	(icalcomponent *icalcomp,
+						 struct icaltimetype rid,
+						 CalObjModType mod);
+
+gchar *		e_cal_util_get_system_timezone_location (void);
+icaltimezone *	e_cal_util_get_system_timezone (void);
+void		e_cal_util_get_component_occur_times
+						(ECalComponent *comp,
+						 time_t * start,
+						 time_t * end,
+						 ECalRecurResolveTimezoneFn tz_cb,
+						 gpointer tz_cb_data,
+						 const icaltimezone *default_timezone,
+						 icalcomponent_kind kind);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_UTIL_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]