ECalendar header cleanup.

2 files changed, 80 insertions, 81 deletions

diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 0ab34b3bdd..6a3b74fccb 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -263,107 +263,111 @@ struct _ECalendarItemClass
 	void (* selection_preview_changed)	(ECalendarItem *calitem);
 };
 
-GType    e_calendar_item_get_type		(void);
+GType	e_calendar_item_get_type		(void);
 
 /* FIXME: months are 0-11 throughout, but 1-12 may be better. */
 
-void	 e_calendar_item_get_first_month	(ECalendarItem	*calitem,
-						 gint		*year,
-						 gint		*month);
-void	 e_calendar_item_set_first_month	(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month);
+void	e_calendar_item_get_first_month		(ECalendarItem *calitem,
+						 gint *year,
+						 gint *month);
+void	e_calendar_item_set_first_month		(ECalendarItem *calitem,
+						 gint year,
+						 gint month);
 
 /* Get the maximum number of days selectable */
-gint     e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem);
+gint	e_calendar_item_get_max_days_sel	(ECalendarItem *calitem);
 
 /* Set the maximum number of days selectable */
-void	 e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
-						 gint            days);
+void	e_calendar_item_set_max_days_sel	(ECalendarItem *calitem,
+						 gint days);
 
 /* Get the maximum number of days selectable */
-gint     e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem);
+gint	e_calendar_item_get_days_start_week_sel	(ECalendarItem *calitem);
 
 /* Set the maximum number of days selectable */
-void	 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
-						 gint            days);
+void	e_calendar_item_set_days_start_week_sel	(ECalendarItem *calitem,
+						 gint days);
 
 /* Set the maximum number of days before whole weeks are selected */
-gboolean e_calendar_item_get_display_popup      (ECalendarItem	*calitem);
+gboolean
+	e_calendar_item_get_display_popup	(ECalendarItem *calitem);
 
 /* Get the maximum number of days before whole weeks are selected */
-void	 e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
-						 gboolean        display);
+void	e_calendar_item_set_display_popup	(ECalendarItem *calitem,
+						 gboolean display);
 
 /* Gets the range of dates actually shown. Months are 0 to 11.
    This also includes the last days of the previous month and the first days
    of the following month, which are normally shown in gray.
    It returns FALSE if no dates are currently shown. */
-gboolean e_calendar_item_get_date_range		(ECalendarItem	*calitem,
-						 gint		*start_year,
-						 gint		*start_month,
-						 gint		*start_day,
-						 gint		*end_year,
-						 gint		*end_month,
-						 gint		*end_day);
+gboolean
+	e_calendar_item_get_date_range		(ECalendarItem *calitem,
+						 gint *start_year,
+						 gint *start_month,
+						 gint *start_day,
+						 gint *end_year,
+						 gint *end_month,
+						 gint *end_day);
 
 /* Returns the selected date range. It returns FALSE if no days are currently
    selected. */
-gboolean e_calendar_item_get_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
+gboolean
+	e_calendar_item_get_selection		(ECalendarItem *calitem,
+						 GDate *start_date,
+						 GDate *end_date);
 /* Sets the selected date range, and changes the date range shown so at least
    the start of the selection is shown. If start_date is NULL it clears the
    selection. */
-void	 e_calendar_item_set_selection		(ECalendarItem	*calitem,
-						 GDate		*start_date,
-						 GDate		*end_date);
+void	e_calendar_item_set_selection		(ECalendarItem *calitem,
+						 GDate *start_date,
+						 GDate *end_date);
 
 /* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
    will result in the day being shown as bold by default. The style callback
    could support more day_styles, or the style callback could determine the
    colors itself, without needing to mark days. */
-void	 e_calendar_item_clear_marks		(ECalendarItem	*calitem);
-void	 e_calendar_item_mark_day		(ECalendarItem	*calitem,
-						 gint		 year,
-						 gint		 month,
-						 gint		 day,
-						 guint8		 day_style,
-						 gboolean        add_day_style);
+void	e_calendar_item_clear_marks		(ECalendarItem *calitem);
+void	e_calendar_item_mark_day		(ECalendarItem *calitem,
+						 gint year,
+						 gint month,
+						 gint day,
+						 guint8 day_style,
+						 gboolean add_day_style);
 
 /* Mark a range of days. Any days outside the currently shown range are
    ignored. */
-void	 e_calendar_item_mark_days		(ECalendarItem	*calitem,
-						 gint		 start_year,
-						 gint		 start_month,
-						 gint		 start_day,
-						 gint		 end_year,
-						 gint		 end_month,
-						 gint		 end_day,
-						 guint8		 day_style,
-						 gboolean        add_day_style);
+void	e_calendar_item_mark_days		(ECalendarItem *calitem,
+						 gint start_year,
+						 gint start_month,
+						 gint start_day,
+						 gint end_year,
+						 gint end_month,
+						 gint end_day,
+						 guint8 day_style,
+						 gboolean add_day_style);
 
 /* Sets the function to call to get the colors to use for a particular day. */
-void	 e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
+void	e_calendar_item_set_style_callback	(ECalendarItem *calitem,
 						 ECalendarItemStyleCallback cb,
-						 gpointer	 data,
+						 gpointer data,
 						 GDestroyNotify  destroy);
 
 /* Sets a callback to use to get the current time. This is useful if the
    application needs to use its own timezone data rather than rely on the
    Unix timezone. */
-void	 e_calendar_item_set_get_time_callback	(ECalendarItem	*calitem,
+void	e_calendar_item_set_get_time_callback	(ECalendarItem *calitem,
 						 ECalendarItemGetTimeCallback cb,
-						 gpointer	 data,
+						 gpointer data,
 						 GDestroyNotify  destroy);
-void e_calendar_item_normalize_date	(ECalendarItem	*calitem,
-					 gint		*year,
-					 gint		*month);
-gint e_calendar_item_get_week_number	(ECalendarItem *calitem,
-					 gint		day,
-					 gint		month,
-					 gint		year);
-void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem);
+void	e_calendar_item_normalize_date		(ECalendarItem *calitem,
+						 gint *year,
+						 gint *month);
+gint	e_calendar_item_get_week_number		(ECalendarItem *calitem,
+						 gint day,
+						 gint month,
+						 gint year);
+void	e_calendar_item_style_set		(GtkWidget *widget,
+						 ECalendarItem *calitem);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index d6b50209a7..83eb8df4ea 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -56,12 +56,11 @@ G_BEGIN_DECLS
 	(G_TYPE_INSTANCE_GET_CLASS \
 	((obj), E_TYPE_CALENDAR, ECalendarClass))
 
-typedef struct _ECalendar       ECalendar;
+typedef struct _ECalendar ECalendar;
 typedef struct _ECalendarClass  ECalendarClass;
 
-struct _ECalendar
-{
-	ECanvas canvas;
+struct _ECalendar {
+	ECanvas parent;
 
 	ECalendarItem *calitem;
 
@@ -82,29 +81,25 @@ struct _ECalendar
 	gboolean moving_forward;
 };
 
-struct _ECalendarClass
-{
+struct _ECalendarClass {
 	ECanvasClass parent_class;
 };
 
-GType		   e_calendar_get_type		(void);
-GtkWidget* e_calendar_new		(void);
-
-void	   e_calendar_set_minimum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-void	   e_calendar_set_maximum_size	(ECalendar	*cal,
-					 gint		 rows,
-					 gint		 cols);
-
-/* Returns the border size on each side of the month displays. */
-void	   e_calendar_get_border_size	(ECalendar	*cal,
-					 gint		*top,
-					 gint		*bottom,
-					 gint		*left,
-					 gint		*right);
-
-void       e_calendar_set_focusable (ECalendar *cal, gboolean focusable);
+GType		e_calendar_get_type		(void);
+GtkWidget *	e_calendar_new			(void);
+void		e_calendar_set_minimum_size	(ECalendar *cal,
+						 gint rows,
+						 gint cols);
+void		e_calendar_set_maximum_size	(ECalendar *cal,
+					 	 gint rows,
+						 gint cols);
+void		e_calendar_get_border_size	(ECalendar *cal,
+						 gint *top,
+						 gint *bottom,
+						 gint *left,
+						 gint *right);
+void		e_calendar_set_focusable	(ECalendar *cal,
+						 gboolean focusable);
 
 G_END_DECLS