Fix excessive whitespace.

102 files changed, 0 insertions, 667 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 9e9aa003a4..e499e4332f 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -34,8 +34,6 @@
 #include "util.h"
 #include "e-util/e-util-private.h"
 
-
-
 enum {
 	ALARM_DISPLAY_COLUMN,
 	ALARM_SUMMARY_COLUMN,
@@ -331,7 +329,6 @@ notified_alarms_dialog_new (void)
 	g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed",
 			G_CALLBACK (an_update_hrs_label), an);
 
-
 	na = g_new0 (AlarmNotificationsDialog, 1);
 
 	na->treeview = an->treeview;
@@ -340,7 +337,6 @@ notified_alarms_dialog_new (void)
 	return na;
 }
 
-
 /**
  * add_alarm_to_notified_alarms_dialog:
  * @na: Pointer to the dialog-info
@@ -438,8 +434,6 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 	}
 }
 
-
-
 static void
 fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description,
 		const gchar *location, time_t occur_start, time_t occur_end)
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index e05c6e6571..62679bb2b6 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -53,7 +53,6 @@ static void alarm_notify_class_init (AlarmNotifyClass *klass);
 static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass);
 static void alarm_notify_finalize (GObject *object);
 
-
 static BonoboObjectClass *parent_class;
 
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 180542eb6e..e06b75ba50 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -39,7 +39,6 @@
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
 
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
@@ -1345,8 +1344,6 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 				g_source_remove (tray_blink_id);
 			tray_blink_id = -1;
 
-
-
 			gtk_status_icon_set_visible (tray_icon, FALSE);
 			g_object_unref (tray_icon);
 			tray_icon = NULL;
@@ -1407,7 +1404,6 @@ tray_icon_blink_cb (gpointer data)
 	return tray_blink_countdown > 0;
 }
 
-
 /* Add a new data to tray list */
 
 static void
@@ -1580,7 +1576,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	e_cal_component_get_summary (comp, &text);
 	e_cal_component_get_organizer (comp, &organiser);
 
-
 	if (text.value)
 		summary = text.value;
 	else
@@ -1623,7 +1618,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	g_free (time_str);
 	g_free (str);
 
-
 }
 #endif
 
@@ -2057,7 +2051,6 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
 	return TRUE;
 }
 
-
 /* Removes all the alarms queued for a particular calendar client */
 static void
 remove_client_alarms (ClientAlarms *ca)
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
index 9a2e11c472..c594e12a6b 100644
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ b/calendar/gui/alarm-notify/alarm-queue.h
@@ -28,12 +28,10 @@
 
 #include <libecal/e-cal.h>
 
-
 void alarm_queue_init (gpointer);
 void alarm_queue_done (void);
 
 void alarm_queue_add_client (ECal *client);
 void alarm_queue_remove_client (ECal *client, gboolean immediately);
 
-
 #endif
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 424db0d5e4..918338bf3f 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -57,7 +57,6 @@ static ESearchBarItem calendar_search_items[] = {
 	{NULL, -1, 0}
 };
 
-
 /* IDs and option items for the ESearchBar */
 enum {
 	SEARCH_SUMMARY_CONTAINS,
@@ -134,7 +133,6 @@ enum {
 
 static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
 
-
 G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_FILTER_BAR_TYPE)
 
 /* Class initialization function for the calendar search bar */
@@ -280,7 +278,6 @@ get_current_category (CalSearchBar *cal_search)
 		return NULL;
 }
 
-
 /* Returns a sexp for the selected category in the drop-down menu.  The "All"
  * option is returned as (const gchar *) 1, and the "Unfiled" option is returned
  * as NULL.
@@ -605,7 +602,6 @@ setup_category_options (CalSearchBar *cal_search, CALSearchBarItem *subitems, gi
 	subitems[index].image = NULL;
 }
 
-
 /* Creates the suboptions menu for the ESearchBar with the list of categories */
 static void
 make_suboptions (CalSearchBar *cal_search)
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 9b665ce44e..7edf38df65 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -76,7 +76,6 @@ file_open_event_cb (BonoboUIComponent *uic, gpointer data, const gchar *path)
 	e_calendar_view_open_event (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
 }
 
-
 /* Prints the calendar at its current view and time range */
 void
 calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action)
@@ -225,7 +224,6 @@ show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *pat
 	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW);
 }
 
-
 static void
 show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
@@ -236,7 +234,6 @@ show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path
 	gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
 }
 
-
 static void
 cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index b1c093fb9e..605230302e 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -41,5 +41,4 @@ void calendar_goto_today (GnomeCalendar *gcal);
 
 void calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action);
 
-
 #endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5fbf0313ab..625321a934 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -307,7 +307,6 @@ ensure_sources (CalendarComponent *component)
 	g_free (base_uri);
 }
 
-
 /* Utility functions.  */
 
 static gboolean
@@ -844,7 +843,6 @@ config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en
 	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_TODO);
 }
 
-
 static void
 config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -857,7 +855,6 @@ config_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en
 	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_JOURNAL);
 }
 
-
 static void
 config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -1025,7 +1022,6 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
 	}
 }
 
-
 static void
 config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -1421,7 +1417,6 @@ impl_createView (PortableServer_Servant servant,
 	return BONOBO_OBJREF(ecv);
 }
 
-
 static GNOME_Evolution_CreatableItemTypeList *
 impl__get_userCreatableItems (PortableServer_Servant servant,
 			      CORBA_Environment *ev)
@@ -1614,7 +1609,6 @@ calendar_component_init (CalendarComponent *component)
 	e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL);
 }
 
-
 /* Public API.  */
 
 CalendarComponent *
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 851c4c3237..480b0c4c93 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -23,20 +23,17 @@
 #ifndef _CALENDAR_COMPONENT_H_
 #define _CALENDAR_COMPONENT_H_
 
-
 #include <bonobo/bonobo-object.h>
 #include <libedataserver/e-source-list.h>
 #include <widgets/misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define CALENDAR_TYPE_COMPONENT			(calendar_component_get_type ())
 #define CALENDAR_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent))
 #define CALENDAR_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass))
 #define CALENDAR_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
 #define CALENDAR_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
 
-
 typedef struct _CalendarComponent        CalendarComponent;
 typedef struct _CalendarComponentPrivate CalendarComponentPrivate;
 typedef struct _CalendarComponentClass   CalendarComponentClass;
@@ -53,7 +50,6 @@ struct _CalendarComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType calendar_component_get_type  (void);
 
 CalendarComponent *calendar_component_peek  (void);
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 37724a53e9..9b2bd1c644 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -82,7 +82,6 @@ G_BEGIN_DECLS
 #define CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS CALENDAR_CONFIG_PREFIX "/memos/selected_memos"
 #define CALENDAR_CONFIG_PRIMARY_MEMOS CALENDAR_CONFIG_PREFIX "/memos/primary_memos"
 
-
 /* Prompt settings */
 #define CALENDAR_CONFIG_PROMPT_DELETE CALENDAR_CONFIG_PREFIX "/prompts/confirm_delete"
 #define CALENDAR_CONFIG_PROMPT_PURGE CALENDAR_CONFIG_PREFIX "/prompts/confirm_purge"
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 02b051a095..f1730d5bc7 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -167,7 +167,6 @@ calendar_config_set_primary_calendar (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data)
 {
@@ -288,7 +287,6 @@ calendar_config_get_24_hour_format	(void)
 	return TRUE;
 }
 
-
 void
 calendar_config_set_24_hour_format	(gboolean     use_24_hour)
 {
@@ -409,7 +407,6 @@ calendar_config_set_show_categories (gboolean	status)
 	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_CATEGORIES, status, NULL);
 }
 
-
 /* The start day of the week (0 = Sun to 6 = Mon). */
 gint
 calendar_config_get_week_start_day	(void)
@@ -419,7 +416,6 @@ calendar_config_get_week_start_day	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_WEEK_START, NULL);
 }
 
-
 void
 calendar_config_set_week_start_day	(gint	      week_start_day)
 {
@@ -449,7 +445,6 @@ calendar_config_get_day_start_hour	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_HOUR, NULL);
 }
 
-
 void
 calendar_config_set_day_start_hour	(gint	      day_start_hour)
 {
@@ -478,7 +473,6 @@ calendar_config_get_day_start_minute	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, NULL);
 }
 
-
 void
 calendar_config_set_day_start_minute	(gint	      day_start_min)
 {
@@ -507,7 +501,6 @@ calendar_config_get_day_end_hour	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_HOUR, NULL);
 }
 
-
 void
 calendar_config_set_day_end_hour	(gint	      day_end_hour)
 {
@@ -536,7 +529,6 @@ calendar_config_get_day_end_minute	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, NULL);
 }
 
-
 void
 calendar_config_set_day_end_minute	(gint	      day_end_min)
 {
@@ -566,7 +558,6 @@ calendar_config_get_time_divisions	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, NULL);
 }
 
-
 void
 calendar_config_set_time_divisions	(gint	      divisions)
 {
@@ -637,7 +628,6 @@ calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_col
 	*timebar_color = tcolor;
 }
 
-
 void
 calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor)
 {
@@ -657,7 +647,6 @@ calendar_config_get_dview_show_week_no (void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, NULL);
 }
 
-
 void
 calendar_config_set_dview_show_week_no (gboolean show_week_no)
 {
@@ -687,7 +676,6 @@ calendar_config_get_dnav_show_week_no	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL);
 }
 
-
 void
 calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
 {
@@ -717,7 +705,6 @@ calendar_config_get_hpane_pos		(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_HPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_hpane_pos		(gint	      hpane_pos)
 {
@@ -726,7 +713,6 @@ calendar_config_set_hpane_pos		(gint	      hpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL);
 }
 
-
 gint
 calendar_config_get_vpane_pos		(void)
 {
@@ -735,7 +721,6 @@ calendar_config_get_vpane_pos		(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_vpane_pos		(gint	      vpane_pos)
 {
@@ -752,7 +737,6 @@ calendar_config_get_preview_state		(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASK_PREVIEW, NULL);
 }
 
-
 void
 calendar_config_set_preview_state		(gboolean state)
 {
@@ -781,7 +765,6 @@ calendar_config_get_month_hpane_pos	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
 {
@@ -790,7 +773,6 @@ calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL);
 }
 
-
 gint
 calendar_config_get_month_vpane_pos	(void)
 {
@@ -799,7 +781,6 @@ calendar_config_get_month_vpane_pos	(void)
 	return  gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_month_vpane_pos	(gint	      vpane_pos)
 {
@@ -816,7 +797,6 @@ calendar_config_get_tag_vpane_pos	(void)
 	return  gconf_client_get_float (config, CALENDAR_CONFIG_TAG_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_tag_vpane_pos	(gfloat	      vpane_pos)
 {
@@ -871,7 +851,6 @@ calendar_config_set_primary_tasks (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data)
 {
@@ -892,7 +871,6 @@ calendar_config_get_task_vpane_pos	(void)
 	return  gconf_client_get_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_task_vpane_pos	(gint	      vpane_pos)
 {
@@ -949,7 +927,6 @@ calendar_config_set_primary_memos (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data)
 {
@@ -972,7 +949,6 @@ calendar_config_get_compress_weekend	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, NULL);
 }
 
-
 void
 calendar_config_set_compress_weekend	(gboolean     compress)
 {
@@ -1002,7 +978,6 @@ calendar_config_get_show_event_end	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, NULL);
 }
 
-
 void
 calendar_config_set_show_event_end	(gboolean     show_end)
 {
@@ -1032,7 +1007,6 @@ calendar_config_get_working_days	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL);
 }
 
-
 void
 calendar_config_set_working_days	(CalWeekdays  days)
 {
@@ -1062,7 +1036,6 @@ calendar_config_get_hide_completed_tasks	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, NULL);
 }
 
-
 void
 calendar_config_set_hide_completed_tasks	(gboolean	hide)
 {
@@ -1105,7 +1078,6 @@ calendar_config_get_hide_completed_tasks_units	(void)
 	return cu;
 }
 
-
 void
 calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
 {
@@ -1149,7 +1121,6 @@ calendar_config_get_hide_completed_tasks_value	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, NULL);
 }
 
-
 void
 calendar_config_set_hide_completed_tasks_value	(gint		value)
 {
@@ -1232,7 +1203,6 @@ calendar_config_set_confirm_purge (gboolean confirm)
 	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
 }
 
-
 /**
  * calendar_config_get_tasks_due_today_color:
  * @color: the location to store the color
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index c7f0556ac8..a009ed73d7 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -47,7 +47,6 @@ typedef enum
 	CAL_SATURDAY	= 1 << 6
 } CalWeekdays;
 
-
 /* Units for settings. */
 typedef enum
 {
@@ -56,7 +55,6 @@ typedef enum
 	CAL_MINUTES
 } CalUnits;
 
-
 void calendar_config_remove_notification (guint id);
 
 /*
@@ -135,7 +133,6 @@ void	  calendar_config_set_show_categories (gboolean	status);
 gboolean calendar_config_get_show_role	(void);
 void calendar_config_set_show_role	(gboolean state);
 
-
 /* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
 gint	  calendar_config_get_time_divisions	(void);
 void	  calendar_config_set_time_divisions	(gint	      divisions);
@@ -199,7 +196,6 @@ guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc fu
 gint      calendar_config_get_task_vpane_pos    (void);
 void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
 
-
 /* The current list of memo lists selected */
 GSList   *calendar_config_get_memos_selected (void);
 void	  calendar_config_set_memos_selected (GSList *selected);
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index 6a1c71740f..ee80a00ae5 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -263,7 +263,6 @@ edit_existing (OpenClient *oc, const gchar *uid)
 	if (itip_organizer_is_user (comp, oc->client))
 		flags |= COMP_EDITOR_USER_ORG;
 
-
 	switch (vtype) {
 	case E_CAL_COMPONENT_EVENT:
 		if (e_cal_component_has_attendees (comp))
@@ -641,4 +640,3 @@ comp_editor_factory_new (void)
 	return g_object_new (TYPE_COMP_EDITOR_FACTORY, NULL);
 }
 
-
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index cb3cf95def..30af43fd6d 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -66,8 +66,6 @@ cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone)
 	e_cal_component_free_exdate_list (list);
 }
 
-
-
 /* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
 static gboolean
 e_cal_component_compare_tzid (const gchar *tzid1, const gchar *tzid2)
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index de6595672f..d46fcb79e2 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -31,7 +31,6 @@
 
 void cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone);
 
-
 /* Returns TRUE if the component uses the given timezone for both DTSTART
    and DTEND, or if the UTC offsets of the start and end times are the same
    as in the given zone. */
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index b33753c42e..b303a763ce 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -25,7 +25,6 @@
  * specific to the calendar component have been flagged by some comments
  * fwiw */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index db3a5aef13..2c19acaadd 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -58,8 +58,6 @@ static GtkVBoxClass *parent_class = NULL;
 
 GtkWidget *cal_prefs_dialog_create_time_edit (void);
 
-
-
 static void
 calendar_prefs_dialog_finalize (GObject *obj)
 {
@@ -572,7 +570,6 @@ setup_changes (CalendarPrefsDialog *prefs)
 	g_signal_connect (G_OBJECT (prefs->notify_with_tray), "toggled", G_CALLBACK (notify_with_tray_toggled), prefs);
 	g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs);
 
-
 	g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs);
 }
 
@@ -712,7 +709,6 @@ show_config (CalendarPrefsDialog *prefs)
 	gtk_widget_set_sensitive (prefs->use_12_hour, sensitive);
 	gtk_widget_set_sensitive (prefs->use_24_hour, sensitive);
 
-
 	/* Time Divisions. */
 	time_divisions = calendar_config_get_time_divisions ();
 	e_dialog_combo_box_set (prefs->time_divisions, time_divisions, time_division_map);
@@ -852,7 +848,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 	prefs->tasks_hide_completed_interval = glade_xml_get_widget (gui, "tasks_hide_completed_interval");
 	prefs->tasks_hide_completed_units = glade_xml_get_widget (gui, "tasks_hide_completed_units");
 
-
 	/* Alarms tab */
 	prefs->notify_with_tray = glade_xml_get_widget (gui, "notify_with_tray");
 	prefs->scrolled_window = glade_xml_get_widget (gui, "calendar-source-scrolled-window");
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index e9661db372..e330a7f9d4 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -81,7 +81,6 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp)
 	e_cal_component_get_completed (comp, &dates->complete);
 }
 
-
 /* This frees the dates in the CompEditorPageDates struct. But it doesn't free
  * the struct (as that is usually static).
  */
@@ -109,7 +108,6 @@ comp_editor_free_dates (CompEditorPageDates *dates)
 		e_cal_component_free_icaltimetype (dates->complete);
 }
 
-
 /* dtstart is only passed in if tt is the dtend. */
 static void
 write_label_piece (struct icaltimetype *tt,
@@ -249,7 +247,6 @@ comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
 	return GTK_WIDGET (dedit);
 }
 
-
 /* Returns the current time, for EDateEdit widgets and ECalendar items in the
    dialogs.
    FIXME: Should probably use the timezone from somewhere in the component
@@ -278,8 +275,6 @@ comp_editor_get_current_time (GtkObject *object, gpointer data)
 	return tmp_tm;
 }
 
-
-
 /**
  * comp_editor_strip_categories:
  * @categories: A string of category names entered by the user.
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 3bf8921291..c2b5a052a3 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -38,7 +38,6 @@ GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
 
 struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
 
-
 gchar *comp_editor_strip_categories (const gchar *categories);
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ba43eaf98d..e620d54091 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -433,7 +433,6 @@ save_comp (CompEditor *editor)
 		if (e_cal_component_has_recurrences (priv->comp) && priv->mod == CALOBJ_MOD_ALL)
 			comp_util_sanitize_recurrence_master (priv->comp, priv->client);
 
-
 		if (priv->mod == CALOBJ_MOD_THIS) {
 			e_cal_component_set_rdate_list (priv->comp, NULL);
 			e_cal_component_set_rrule_list (priv->comp, NULL);
@@ -1740,7 +1739,6 @@ comp_editor_show_help (CompEditor *editor)
 	e_display_help (GTK_WINDOW (editor), class->help_section);
 }
 
-
 /* Closes the dialog box and emits the appropriate signals */
 static void
 close_dialog (CompEditor *editor)
@@ -1948,7 +1946,6 @@ comp_editor_set_flags (CompEditor *editor,
 	g_object_notify (G_OBJECT (editor), "flags");
 }
 
-
 CompEditorFlags
 comp_editor_get_flags (CompEditor *editor)
 {
@@ -2541,7 +2538,6 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 
 }
 
-
 /**
  * comp_editor_edit_comp:
  * @editor: A component editor
@@ -2678,7 +2674,6 @@ comp_editor_close (CompEditor *editor)
 	return close;
 }
 
-
 /* Utility function to get the mime-attachment list from the attachment
  * bar for sending the comp via itip. The list and its contents must
  * be freed by the caller.
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index ec1b991592..2106970386 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -134,7 +134,6 @@ gboolean	comp_editor_send_comp		(CompEditor *editor,
 GSList *	comp_editor_get_mime_attach_list(CompEditor *editor);
 gboolean	comp_editor_close		(CompEditor *editor);
 
-
 void		comp_editor_sensitize_attachment_bar
 						(CompEditor *editor,
 						 gboolean set);
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 87fb164e6a..284076a7bc 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -114,7 +114,6 @@ e_delegate_dialog_finalize (GObject *object)
 		(* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object);
 }
 
-
 EDelegateDialog *
 e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address)
 {
@@ -273,7 +272,6 @@ e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 	return g_strdup (priv->address);
 }
 
-
 gchar *
 e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
 {
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 6ff872e7e4..a70488a0ea 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -35,7 +35,6 @@
 #define E_IS_DELEGATE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))
 #define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))
 
-
 typedef struct _EDelegateDialog		EDelegateDialog;
 typedef struct _EDelegateDialogClass	EDelegateDialogClass;
 typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;
@@ -69,7 +68,6 @@ void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
 
 GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
 
-
 
 
 #endif /* __E_DELEGATE_DIALOG_H__ */
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 87f4584133..c4ed13f2cb 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -208,7 +208,6 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO");
 	icalcomponent_add_property (icalcomp, prop);
 
-
 	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->opened));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED");
 	icalcomponent_add_property (icalcomp, prop);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f43dcc1d41..55989a4818 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1269,7 +1269,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	e_cal_component_set_dtstart (comp, &start_date);
 	e_cal_component_set_dtend (comp, &end_date);
 
-
 	/* Categories */
 
 	cat = e_dialog_editable_get (priv->categories);
@@ -1453,7 +1452,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 			return FALSE;
 		}
 
-
 		if (flags & COMP_EDITOR_DELEGATE) {
 			GSList *attendee_list, *l;
 			gint i;
@@ -1986,7 +1984,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage)
 	return FALSE;
 }
 
-
 static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage)
 {
@@ -2251,7 +2248,6 @@ get_widgets (EventPage *epage)
 	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view));
 	gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0);
 
-
 	/* Glade's visibility flag doesn't seem to work for custom widgets */
 	priv->start_time = GW ("start-time");
 	gtk_widget_show (priv->start_time);
@@ -2298,7 +2294,6 @@ summary_changed_cb (GtkEditable *editable,
 	g_free (summary);
 }
 
-
 /* Note that this assumes that the start_tt and end_tt passed to it are the
    dates visible to the user. For DATE values, we have to add 1 day to the
    end_tt before emitting the signal. */
@@ -2339,7 +2334,6 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 					       &dates);
 }
 
-
 static gboolean
 check_start_before_end (struct icaltimetype *start_tt,
 			icaltimezone *start_zone,
@@ -2377,7 +2371,6 @@ check_start_before_end (struct icaltimetype *start_tt,
 	return FALSE;
 }
 
-
 /*
  * This is called whenever the start or end dates or timezones is changed.
  * It makes sure that the start date < end date. It also emits the notification
@@ -2455,7 +2448,6 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 		}
 	}
 
-
 	if (set_start_date) {
 		g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
 		e_date_edit_set_date (E_DATE_EDIT (priv->start_time),
@@ -2836,7 +2828,6 @@ init_widgets (EventPage *epage)
 	g_signal_connect((priv->summary), "changed",
 			    G_CALLBACK (summary_changed_cb), epage);
 
-
 	/* Description */
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
 
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 0b76d783c9..f110c28564 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -389,7 +389,6 @@ get_recipients (ECalComponent *comp)
 	return "";
 }
 
-
 static gboolean
 fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 {
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 1323755cb1..0d9197546b 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -68,7 +68,6 @@ recur_component_dialog (ECal *client,
 		return FALSE;
 	}
 
-
 	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
 	g_free (str);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5fbf69df74..092a44db15 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2387,7 +2387,6 @@ recurrence_page_new (CompEditor *editor)
 	return rpage;
 }
 
-
 GtkWidget *make_exdate_date_edit (void);
 
 GtkWidget *
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index c85ccbb4fe..712d2708b9 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -242,7 +242,6 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone
 
 }
 
-
 /* Fills the widgets with default values */
 static void
 clear_widgets (SchedulePage *spage)
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 71eec02763..59b97c754f 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -64,7 +64,6 @@ struct _SchedulePageClass {
 	CompEditorPageClass parent_class;
 };
 
-
 GType		schedule_page_get_type		(void);
 SchedulePage *	schedule_page_construct		(SchedulePage *mpage,
 						 EMeetingStore *ems);
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 23f4b1f840..8c63c4dd02 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -168,7 +168,6 @@ task_details_page_focus_main_widget (CompEditorPage *page)
 	gtk_widget_grab_focus (priv->status_combo);
 }
 
-
 static TaskEditorPriority
 priority_value_to_index (gint priority_value)
 {
@@ -492,7 +491,6 @@ get_widgets (TaskDetailsPage *tdpage)
 		&& priv->url);
 }
 
-
 static void
 complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
 {
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 9377e0970b..1e3afc95eb 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -434,7 +434,6 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 				e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
 		}
 
-
 		comp_editor_set_group_item (editor, TRUE);
 		priv->assignment_shown = TRUE;
 	}
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index faaba68317..f1b13df8f6 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -905,7 +905,6 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 			return FALSE;
 		}
 
-
 		if (flags & COMP_EDITOR_DELEGATE ) {
 			GSList *attendee_list, *l;
 			gint i;
@@ -977,7 +976,6 @@ static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
 	gtk_tree_path_free (path);
 }
 
-
 static gboolean
 existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 {
@@ -1296,7 +1294,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) {
 	return FALSE;
 }
 
-
 static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
 {
@@ -1694,7 +1691,6 @@ times_updated (TaskPage *tpage, gboolean adjust_end_time)
 			set_start_date = TRUE;
 	}
 
-
 	if (set_start_date) {
 		g_signal_handlers_block_matched (priv->start_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
 		e_date_edit_set_date (E_DATE_EDIT (priv->start_date), start_tt.year, start_tt.month, start_tt.day);
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 20190a8f80..f19141b61a 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -50,7 +50,6 @@ struct _ECalComponentMemoPreviewPrivate {
 
 G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_TABLE)
 
-
 static void
 on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
 {
@@ -93,7 +92,6 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *def
 		zone = NULL;
 	}
 
-
 	itt = *dt->value;
 	if (zone)
 		icaltimezone_convert_time (&itt, zone, default_zone);
@@ -134,7 +132,6 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 		GSList *node;
 		GString *string = g_string_new (NULL);
 
-
 		gtk_html_stream_printf(stream, "<H3>%s: ", _("Categories"));
 
 		for (node = l; node != NULL; node = node->next) {
diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h
index 2c697231aa..0f8c21c565 100644
--- a/calendar/gui/e-cal-component-memo-preview.h
+++ b/calendar/gui/e-cal-component-memo-preview.h
@@ -53,7 +53,6 @@ struct _ECalComponentMemoPreviewClass {
 	void (* selection_changed) (ECalComponentMemoPreview *preview, gint n_selected);
 };
 
-
 GType      e_cal_component_memo_preview_get_type        (void);
 GtkWidget *e_cal_component_memo_preview_new             (void);
 
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 0cee29614d..8a33d48c0b 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -133,7 +133,6 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *def
 		zone = NULL;
 	}
 
-
 	itt = *dt->value;
 	if (zone)
 		icaltimezone_convert_time (&itt, zone, default_zone);
@@ -170,7 +169,6 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 					"<HTML><BODY><H1><I>%s</I></H1>",
 					_("Untitled"));
 
-
 	/* write icons for the categories */
 	e_cal_component_get_categories_list (comp, &l);
 	if (l) {
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index dd355c01ce..f1d26a79f7 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -55,7 +55,6 @@ struct _ECalComponentPreviewClass {
 	void (* selection_changed) (ECalComponentPreview *preview, gint n_selected);
 };
 
-
 GType      e_cal_component_preview_get_type        (void);
 GtkWidget *e_cal_component_preview_new             (void);
 
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index f62db91985..0081dc1340 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -383,7 +383,6 @@ find_meeting (icalcomponent *icalcomp)
 	return prop ? TRUE: FALSE;
 }
 
-
 static gboolean
 e_cal_list_view_on_table_double_click (GtkWidget *table, gint row, gint col, GdkEvent *event,
 				      gpointer data)
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 656a58261b..df5b3dbeab 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 #define E_CAL_LIST_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass)
 #define E_IS_CAL_LIST_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cal_list_view_get_type ())
 
-
 typedef struct _ECalListView       ECalListView;
 typedef struct _ECalListViewClass  ECalListViewClass;
 
@@ -72,7 +71,6 @@ struct _ECalListViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_cal_list_view_get_type		(void);
 GtkWidget *e_cal_list_view_construct            (ECalListView *cal_list_view);
 
@@ -83,7 +81,6 @@ void e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename);
 gboolean   e_cal_list_view_get_range_shown      (ECalListView *cal_list_view, GDate *start_date,
 						 gint *days_shown);
 
-
 G_END_DECLS
 
 #endif /* _E_CAL_LIST_VIEW_H_ */
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 414a0698e3..45d3e140b0 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -135,7 +135,6 @@ ecmm_value_at (ETableModel *etm, gint col, gint row)
 	return (gpointer) "";
 }
 
-
 static void
 ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 63bc37af4e..27eae77074 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -199,7 +199,6 @@ ensure_task_partially_complete (ECalModelComponent *comp_data)
 		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_status (ICAL_STATUS_INPROCESS));
 }
 
-
 /* This makes sure a task is marked as incomplete. It clears the
    "Date Completed" property. If the percent is set to 100 it removes it,
    and if the status is "Completed" it sets it to "Needs Action".
@@ -410,7 +409,6 @@ typedef enum {
 	E_CAL_MODEL_TASKS_DUE_COMPLETE
 } ECalModelTasksDueStatus;
 
-
 static ECalModelTasksDueStatus
 get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 {
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index be61d1fd72..bd1913edab 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -257,7 +257,6 @@ e_cal_model_dispose (GObject *object)
 
 			priv->clients = g_list_remove (priv->clients, client_data);
 
-
 			g_object_unref (client_data->client);
 			if (client_data->query)
 				g_object_unref (client_data->query);
@@ -1798,7 +1797,6 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data)
 	update_e_cal_view_for_client (model, client_data);
 }
 
-
 static ECalModelClient *
 add_new_client (ECalModel *model, ECal *client, gboolean do_query)
 {
@@ -2318,7 +2316,6 @@ copy_ecdv (ECellDateEditValue *ecdv)
 	return new_ecdv;
 } */
 
-
 struct _ECalModelComponentPrivate {
 	gchar nouse;
 };
@@ -2340,7 +2337,6 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass)
 	object_class->finalize = e_cal_model_component_finalize;
 }
 
-
 static void
 e_cal_model_component_finalize (GObject *object)
 {
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index d6bf0ed4c5..cdbce07ac7 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -315,8 +315,6 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 	if (!read_only)
 		mask &= ~E_CAL_POPUP_SELECT_EDITABLE;
 
-
-
 	if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
 	    && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
 		mask &= ~E_CAL_POPUP_SELECT_ASSIGNABLE;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 9eb53d9006..180680d5a3 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -521,7 +521,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 
 	e_table_extras_add_cell (extras, "calstring", cell);
 
-
 	/*
 	 * Date fields.
 	 */
@@ -542,7 +541,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 						e_calendar_table_get_current_time,
 						cal_table, NULL);
 
-
 	/*
 	 * Combo fields.
 	 */
@@ -709,7 +707,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (table);
 
-
 	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
 	g_signal_connect (e_table, "double_click", G_CALLBACK (e_calendar_table_on_double_click), cal_table);
 	g_signal_connect (e_table, "right_click", G_CALLBACK (e_calendar_table_on_right_click), cal_table);
@@ -723,7 +720,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 		atk_object_set_name (a11y, _("Tasks"));
 }
 
-
 /**
  * e_calendar_table_new:
  * @Returns: a new #ECalendarTable.
@@ -740,7 +736,6 @@ e_calendar_table_new (void)
 	return cal_table;
 }
 
-
 /**
  * e_calendar_table_get_model:
  * @cal_table: A calendar table.
@@ -758,7 +753,6 @@ e_calendar_table_get_model (ECalendarTable *cal_table)
 	return cal_table->model;
 }
 
-
 static void
 e_calendar_table_destroy (GtkObject *object)
 {
@@ -1806,7 +1800,6 @@ e_calendar_table_load_state	(ECalendarTable *cal_table,
 	}
 }
 
-
 /* Saves the state of the table (headers shown etc.) to the given file. */
 void
 e_calendar_table_save_state (ECalendarTable	*cal_table,
@@ -1845,7 +1838,6 @@ e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)
 	return tmp_tm;
 }
 
-
 #ifdef TRANSLATORS_ONLY
 
 static gchar *test[] = {
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index e91886b5d4..0abcd4be0e 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -36,16 +36,13 @@ G_BEGIN_DECLS
  * Used for calendar events and tasks.
  */
 
-
 #define E_CALENDAR_TABLE(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
 #define E_CALENDAR_TABLE_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
 #define E_IS_CALENDAR_TABLE(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_table_get_type ())
 
-
 typedef struct _ECalendarTable       ECalendarTable;
 typedef struct _ECalendarTableClass  ECalendarTableClass;
 
-
 struct _ECalendarTable {
 	GtkTable table;
 
@@ -76,7 +73,6 @@ struct _ECalendarTableClass {
 	void (* user_created) (ECalendarTable *cal_table);
 };
 
-
 GType		   e_calendar_table_get_type (void);
 GtkWidget* e_calendar_table_new	(void);
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 8cab14b861..7e39f14a98 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -258,7 +258,6 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
 	e_cal_view_a11y_init ();
 }
 
-
 void
 e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart,
 		      icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas)
@@ -1194,13 +1193,11 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 		} else
 			zone = e_calendar_view_get_timezone (cal_view);
 
-
 		if (is_instance)
 			rid = e_cal_component_get_recurid_as_string (comp);
 
 		e_cal_component_free_datetime (&dt);
 
-
 		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
 				&& cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 					event->comp_data->client,
@@ -1384,7 +1381,6 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 	if (e_cal_get_object (dest_client, uid, NULL, &orig_icalcomp, NULL)) {
 		icalcomponent_free (orig_icalcomp);
 
-
 		if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL))
 			return;
 	} else {
@@ -1537,7 +1533,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 
 	address = itip_get_comp_attendee (comp, client);
 
-
 	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
 			prop;
 			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
@@ -1578,7 +1573,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 		g_free (temp);
 	}
 
-
 	g_free (address);
 	g_object_unref (comp);
 }
@@ -1707,7 +1701,6 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	id = e_cal_component_get_id (comp);
 
-
 	/* For the unrecurred instance we duplicate the original object,
 	   create a new uid for it, get rid of the recurrence rules, and set
 	   the start & end times to the instances times. */
@@ -2107,7 +2100,6 @@ e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, ic
 	const gchar *uid;
 	ECalComponent *comp;
 
-
 	uid = icalcomponent_get_uid (icalcomp);
 
 	ce = e_comp_editor_registry_find (comp_editor_registry, uid);
@@ -2163,7 +2155,6 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
 		g_object_unref (comp);
 	}
 
-
 	e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags);
 }
 
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index efe251aa0f..64dd48ddf1 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -48,7 +48,6 @@ e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
 	ecd->zone = zone;
 }
 
-
 void
 e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
 					      gboolean use_24_hour)
@@ -58,7 +57,6 @@ e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
 	ecd->use_24_hour_format = use_24_hour;
 }
 
-
 static gchar *
 ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
@@ -82,14 +80,12 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 	return g_strdup (buffer);
 }
 
-
 static void
 ecd_free_text (ECellText *cell, gchar *text)
 {
 	g_free (text);
 }
 
-
 /* FIXME: We need to set the "transient_for" property for the dialog. */
 static void
 show_date_warning (ECellDateEditText *ecd)
@@ -123,7 +119,6 @@ show_date_warning (ECellDateEditText *ecd)
 	gtk_widget_destroy (dialog);
 }
 
-
 static void
 ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
 	       const gchar *text)
@@ -176,7 +171,6 @@ ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
 	e_table_model_set_value_at (model, col, row, value);
 }
 
-
 static void
 e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet)
 {
@@ -187,7 +181,6 @@ e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet)
 	ectc->set_value = ecd_set_value;
 }
 
-
 static void
 e_cell_date_edit_text_init (ECellDateEditText *ecd)
 {
@@ -195,7 +188,6 @@ e_cell_date_edit_text_init (ECellDateEditText *ecd)
 	ecd->use_24_hour_format = TRUE;
 }
 
-
 /**
  * e_cell_date_edit_text_new:
  *
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 0f557afade..5dc1f0c4bd 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -59,7 +59,6 @@ GType      e_cell_date_edit_text_get_type (void);
 ECell     *e_cell_date_edit_text_new      (const gchar *fontname,
 					   GtkJustification justify);
 
-
 void	   e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
 					       icaltimezone *zone);
 void	   e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 0b45a53cbc..3f9d195666 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -55,7 +55,6 @@ struct _ECompEditorRegistryClass {
 
 typedef void (* ECompEditorRegistryForeachFn) (CompEditor *editor, gpointer data);
 
-
 
 
 GType     e_comp_editor_registry_get_type  (void);
@@ -71,4 +70,3 @@ G_END_DECLS
 
 #endif /* _E_COMP_EDITOR_REGISTRY_H_ */
 
-
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 942f73933e..a193e7bfa0 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -281,7 +281,6 @@ day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin
 	set_day_end_hour (priv->view);
 }
 
-
 static void
 set_day_end_minute (EDayView *day_view)
 {
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index ab1f6c0fd0..51ced181b7 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -52,7 +52,6 @@ static void e_day_view_recalc_cols_per_row (gint           rows,
 					    guint8	  *cols_per_row,
 					    guint16       *group_starts);
 
-
 void
 e_day_view_layout_long_events (GArray	   *events,
 			       gint	   days_shown,
@@ -86,7 +85,6 @@ e_day_view_layout_long_events (GArray	   *events,
 	g_free (grid);
 }
 
-
 static void
 e_day_view_layout_long_event (EDayViewEvent *event,
 			      guint8	   *grid,
@@ -128,7 +126,6 @@ e_day_view_layout_long_event (EDayViewEvent *event,
 	*rows_in_top_display = MAX (*rows_in_top_display, free_row + 1);
 }
 
-
 /* returns maximum number of columns among all rows */
 gint
 e_day_view_layout_day_events (GArray	   *events,
@@ -197,7 +194,6 @@ e_day_view_layout_day_events (GArray	   *events,
 	return res;
 }
 
-
 /* Finds the first free position to place the event in.
    Increments the number of events in each of the rows it covers, and makes
    sure they are all in one group. */
@@ -275,7 +271,6 @@ e_day_view_layout_day_event (EDayViewEvent *event,
 	}
 }
 
-
 /* For each group of rows, find the max number of events in all the
    rows, and set the number of cols in each of the rows to that. */
 static void
@@ -299,7 +294,6 @@ e_day_view_recalc_cols_per_row (gint      rows,
 	}
 }
 
-
 /* Expands the event horizontally to fill any free space. */
 static void
 e_day_view_expand_day_event (EDayViewEvent *event,
@@ -333,7 +327,6 @@ e_day_view_expand_day_event (EDayViewEvent *event,
 	}
 }
 
-
 /* Find the start and end days for the event. */
 gboolean
 e_day_view_find_long_event_days (EDayViewEvent	*event,
@@ -369,4 +362,3 @@ e_day_view_find_long_event_days (EDayViewEvent	*event,
 	return TRUE;
 }
 
-
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 36f2e0c52d..c169a06b59 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -36,7 +36,6 @@ void e_day_view_layout_long_events	(GArray	   *events,
 					 time_t	   *day_starts,
 					 gint	   *rows_in_top_display);
 
-
 gint e_day_view_layout_day_events	(GArray	   *events,
 					 gint	    rows,
 					 gint	    mins_per_row,
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index f8b264f762..28091409ce 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -114,14 +114,12 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class)
 	e_day_view_main_item_a11y_init ();
 }
 
-
 static void
 e_day_view_main_item_init (EDayViewMainItem *dvtitem)
 {
 	dvtitem->day_view = NULL;
 }
 
-
 static void
 e_day_view_main_item_set_property (GObject *object,
                                    guint property_id,
@@ -141,7 +139,6 @@ e_day_view_main_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_day_view_main_item_update (GnomeCanvasItem *item,
 			    double *affine,
@@ -158,7 +155,6 @@ e_day_view_main_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -369,7 +365,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 						      day);
 	}
 
-
 	if (e_day_view_get_show_marcus_bains (day_view)) {
 		icaltimezone *zone;
 		struct icaltimetype time_now, day_start;
@@ -411,7 +406,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 					   GdkDrawable *drawable,
@@ -453,7 +447,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 				}
 		}
 
-
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -492,7 +485,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 						GdkDrawable *drawable,
@@ -581,7 +573,6 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
 				      GdkDrawable *drawable,
@@ -1011,7 +1002,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	else if (bar_y2 < scroll_flag)
 		event->end_minute -= day_view->mins_per_row;
 
-
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -1172,7 +1162,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_y += icon_y_inc;
 			}
 
-
 			if (draw_meeting_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
@@ -1340,7 +1329,6 @@ e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -1358,4 +1346,3 @@ e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index 3f28bde608..5204115e88 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -51,10 +51,8 @@ typedef struct {
 
 } EDayViewMainItemClass;
 
-
 GType    e_day_view_main_item_get_type      (void);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 232534d51a..36a7b49ae2 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -35,7 +35,6 @@
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <libedataserver/e-data-server-util.h>
 
-
 /* The spacing between items in the time column. GRID_X_PAD is the space down
    either side of the column, i.e. outside the main horizontal grid lines.
    HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the
@@ -127,7 +126,6 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
 {
@@ -197,7 +195,6 @@ e_day_view_time_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /* Returns the minimum width needed for the column, by adding up all the
    maximum widths of the strings. The string widths are all calculated in
    the style_set handlers of EDayView and EDayViewTimeCanvas. */
@@ -267,7 +264,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
 	return dvtmitem->column_width;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -642,7 +638,6 @@ e_day_view_time_item_increment_time	(gint	*hour,
 	}
 }
 
-
 static double
 e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
 			    gint cx, gint cy,
@@ -652,7 +647,6 @@ e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_time_item_event (GnomeCanvasItem *item,
 			    GdkEvent *event)
@@ -823,7 +817,6 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 			event->button.button, event->button.time);
 }
 
-
 static void
 e_day_view_time_item_on_set_divisions (GtkWidget *item,
 				       EDayViewTimeItem *dvtmitem)
@@ -842,7 +835,6 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item,
 	calendar_config_set_time_divisions (divisions);
 }
 
-
 static void
 e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
 				      GdkEvent *event)
@@ -874,7 +866,6 @@ e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
 	}
 }
 
-
 static void
 e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
 					GdkEvent *event)
@@ -921,7 +912,6 @@ e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
 	}
 }
 
-
 /* Returns the row corresponding to the y position, or -1. */
 static gint
 e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index 237b556df6..802ca50c3b 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -62,13 +62,10 @@ typedef struct {
 
 } EDayViewTimeItemClass;
 
-
 GType    e_day_view_time_item_get_type      (void);
 
-
 gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 31cce40a5a..180b3adb1c 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -74,7 +74,6 @@ static double e_day_view_top_item_point		(GnomeCanvasItem *item,
 static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
 						 GdkEvent	 *event);
 
-
 /* The arguments we take */
 enum {
 	PROP_0,
@@ -119,7 +118,6 @@ e_day_view_top_item_class_init (EDayViewTopItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_day_view_top_item_init (EDayViewTopItem *dvtitem)
 {
@@ -127,7 +125,6 @@ e_day_view_top_item_init (EDayViewTopItem *dvtitem)
 	dvtitem->show_dates = FALSE;
 }
 
-
 static void
 e_day_view_top_item_set_property (GObject *object,
                                   guint property_id,
@@ -150,7 +147,6 @@ e_day_view_top_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_day_view_top_item_update (GnomeCanvasItem *item,
 			    double	    *affine,
@@ -167,7 +163,6 @@ e_day_view_top_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -718,7 +713,6 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 	gdk_gc_set_clip_mask (gc, NULL);
 }
 
-
 /* This draws a little triangle to indicate that an event extends past
    the days visible on screen. */
 static void
@@ -807,7 +801,6 @@ e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index 61dfdceab8..e163e3eb81 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -54,12 +54,10 @@ typedef struct {
 
 } EDayViewTopItemClass;
 
-
 GType    e_day_view_top_item_get_type      (void);
 void e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
 					gchar *buffer, gint buffer_len);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index bcd6d42c23..5642bc7b02 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -227,7 +227,6 @@ static void e_day_view_finish_long_event_resize (EDayView *day_view);
 static void e_day_view_finish_resize (EDayView *day_view);
 static void e_day_view_abort_resize (EDayView *day_view);
 
-
 static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,
 						       gint		 event_num,
 						       GdkEventButton	*event,
@@ -266,7 +265,6 @@ static void e_day_view_show_popup_menu (EDayView *day_view,
 					gint day,
 					gint event_num);
 
-
 static void e_day_view_recalc_day_starts (EDayView *day_view,
 					  time_t start_time);
 static void e_day_view_recalc_num_rows	(EDayView	*day_view);
@@ -505,7 +503,6 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
 		e_day_view_ensure_rows_visible (day_view, day_view->selection_start_row, day_view->selection_start_row);
 }
 
-
 static void
 process_component (EDayView *day_view, ECalModelComponent *comp_data)
 {
@@ -681,7 +678,6 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
 
 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
 
-
 	if (!cal_view->in_focus)
 		return;
 
@@ -778,7 +774,6 @@ e_day_view_init (EDayView *day_view)
 
 	day_view->last_edited_comp_string = NULL;
 
-
 	day_view->selection_start_row = -1;
 	day_view->selection_start_day = -1;
 	day_view->selection_end_row = -1;
@@ -970,7 +965,6 @@ e_day_view_init (EDayView *day_view)
 				       NULL);
 	gnome_canvas_item_hide (day_view->drag_item);
 
-
 	/*
 	 * Times Canvas
 	 */
@@ -992,7 +986,6 @@ e_day_view_init (EDayView *day_view)
 				       "EDayViewTimeItem::day_view", day_view,
 				       NULL);
 
-
 	/*
 	 * Scrollbar.
 	 */
@@ -1028,13 +1021,11 @@ e_day_view_init (EDayView *day_view)
 			   target_table, n_targets,
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
 
-
 	/* connect to ECalendarView's signals */
 	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
 			  G_CALLBACK (timezone_changed_cb), NULL);
 }
 
-
 static void
 init_model (EDayView *day_view, ECalModel *model)
 {
@@ -1061,7 +1052,6 @@ e_day_view_on_canvas_realized (GtkWidget *widget,
 				    NULL, FALSE);
 }
 
-
 /**
  * e_day_view_new:
  * @Returns: a new #EDayView.
@@ -1167,7 +1157,6 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", GTK_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", GTK_ICON_SIZE_MENU);
 
-
 	/* Set the canvas item colors. */
 	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
 			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
@@ -1437,7 +1426,6 @@ e_day_view_style_set (GtkWidget *widget,
 		}
 	}
 
-
 	/* Calculate the widths of all the time strings necessary. */
 	day_view->max_small_hour_width = 0;
 	for (hour = 0; hour < 24; hour++) {
@@ -1624,7 +1612,6 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 	g_object_unref (layout);
 }
 
-
 static gint
 e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1644,7 +1631,6 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 static gint
 e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1701,7 +1687,6 @@ e_day_view_foreach_event		(EDayView	*day_view,
 	}
 }
 
-
 /* This calls a given function for each event instance that matches the given
    uid. If the callback returns FALSE the iteration is stopped.
    Note that it is safe for the callback to remove the event (since we
@@ -1745,7 +1730,6 @@ e_day_view_foreach_event_with_uid (EDayView *day_view,
 	}
 }
 
-
 static gboolean
 e_day_view_remove_event_cb (EDayView *day_view,
 			    gint day,
@@ -1916,7 +1900,6 @@ e_day_view_update_long_event_label (EDayView *day_view,
 		set_text_as_bold (event);
 }
 
-
 /* Finds the day and index of the event with the given canvas item.
    If is is a long event, -1 is returned as the day.
    Returns TRUE if the event was found. */
@@ -1956,7 +1939,6 @@ e_day_view_find_event_from_item (EDayView *day_view,
 	return FALSE;
 }
 
-
 /* Finds the day and index of the event with the given uid.
    If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.
    Returns TRUE if an event with the uid was found.
@@ -2131,7 +2113,6 @@ e_day_view_set_selected_time_range_visible	(EDayView	*day_view,
 	}
 }
 
-
 /* Finds the start of the working week which includes the given time. */
 static time_t
 e_day_view_find_work_week_start		(EDayView	*day_view,
@@ -2176,7 +2157,6 @@ e_day_view_find_work_week_start		(EDayView	*day_view,
 	return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 }
 
-
 /* This sets the selected time range. If the start_time & end_time are not equal
    and are both visible in the view, then the selection is set to those times,
    otherwise it is set to 1 hour from the start of the working day. */
@@ -2354,7 +2334,6 @@ e_day_view_get_work_week_view	(EDayView	*day_view)
 	return day_view->work_week_view;
 }
 
-
 void
 e_day_view_set_work_week_view	(EDayView	*day_view,
 				 gboolean	 work_week_view)
@@ -2370,7 +2349,6 @@ e_day_view_set_work_week_view	(EDayView	*day_view,
 		e_day_view_recalc_work_week (day_view);
 }
 
-
 gint
 e_day_view_get_days_shown	(EDayView	*day_view)
 {
@@ -2379,7 +2357,6 @@ e_day_view_get_days_shown	(EDayView	*day_view)
 	return day_view->days_shown;
 }
 
-
 void
 e_day_view_set_days_shown	(EDayView	*day_view,
 				 gint		 days_shown)
@@ -2403,7 +2380,6 @@ e_day_view_set_days_shown	(EDayView	*day_view,
 	e_day_view_update_query (day_view);
 }
 
-
 gint
 e_day_view_get_mins_per_row	(EDayView	*day_view)
 {
@@ -2412,7 +2388,6 @@ e_day_view_get_mins_per_row	(EDayView	*day_view)
 	return day_view->mins_per_row;
 }
 
-
 void
 e_day_view_set_mins_per_row	(EDayView	*day_view,
 				 gint		 mins_per_row)
@@ -2454,7 +2429,6 @@ e_day_view_set_mins_per_row	(EDayView	*day_view,
 	e_day_view_update_scroll_regions (day_view);
 }
 
-
 /* This specifies the working days in the week. The value is a bitwise
    combination of day flags. Defaults to Mon-Fri. */
 EDayViewDays
@@ -2465,7 +2439,6 @@ e_day_view_get_working_days	(EDayView	*day_view)
 	return day_view->working_days;
 }
 
-
 void
 e_day_view_set_working_days	(EDayView	*day_view,
 				 EDayViewDays	 days)
@@ -2485,7 +2458,6 @@ e_day_view_set_working_days	(EDayView	*day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
 {
@@ -2521,7 +2493,6 @@ e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
 	e_day_view_set_days_shown (day_view, days_shown);
 }
 
-
 /* The start and end time of the working day. This only affects the background
    colors. */
 void
@@ -2539,7 +2510,6 @@ e_day_view_get_working_day		(EDayView	*day_view,
 	*end_minute = day_view->work_day_end_minute;
 }
 
-
 void
 e_day_view_set_working_day		(EDayView	*day_view,
 					 gint		 start_hour,
@@ -2557,7 +2527,6 @@ e_day_view_set_working_day		(EDayView	*day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Whether we display the Marcus Bains Line in the main canvas and time canvas. */
 gboolean
 e_day_view_get_show_marcus_bains	(EDayView       *day_view)
@@ -2575,7 +2544,6 @@ e_day_view_update_marcus_bains		(EDayView *day_view)
 	gtk_widget_queue_draw (day_view->time_canvas);
 }
 
-
 /* Update the variables controlling the Marcus Bains Line (display toggle, and colors). */
 void
 e_day_view_set_marcus_bains		(EDayView       *day_view,
@@ -2609,7 +2577,6 @@ e_day_view_set_marcus_bains		(EDayView       *day_view,
 	}
 }
 
-
 /* Whether we display event end times in the main canvas. */
 gboolean
 e_day_view_get_show_event_end_times	(EDayView	*day_view)
@@ -2619,7 +2586,6 @@ e_day_view_get_show_event_end_times	(EDayView	*day_view)
 	return day_view->show_event_end_times;
 }
 
-
 void
 e_day_view_set_show_event_end_times	(EDayView	*day_view,
 					 gboolean	 show)
@@ -2647,7 +2613,6 @@ e_day_view_set_show_times_cb		(EDayView	*day_view,
 	return TRUE;
 }
 
-
 /* The first day of the week, 0 (Monday) to 6 (Sunday). */
 gint
 e_day_view_get_week_start_day	(EDayView	*day_view)
@@ -2657,7 +2622,6 @@ e_day_view_get_week_start_day	(EDayView	*day_view)
 	return day_view->week_start_day;
 }
 
-
 void
 e_day_view_set_week_start_day	(EDayView	*day_view,
 				 gint		 week_start_day)
@@ -2703,7 +2667,6 @@ e_day_view_recalc_work_week	(EDayView	*day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_update_scroll_regions (EDayView *day_view)
 {
@@ -2744,7 +2707,6 @@ e_day_view_update_scroll_regions (EDayView *day_view)
 	return need_reshape;
 }
 
-
 /* This recalculates the number of rows to display, based on the time range
    shown and the minutes per row. */
 static void
@@ -2759,7 +2721,6 @@ e_day_view_recalc_num_rows	(EDayView	*day_view)
 	day_view->rows = total_minutes / day_view->mins_per_row;
 }
 
-
 /* Converts an hour and minute to a row in the canvas. Note that if we aren't
    showing all 24 hours of the day, the returned row may be negative or
    greater than day_view->rows. */
@@ -2780,7 +2741,6 @@ e_day_view_convert_time_to_row	(EDayView	*day_view,
 		return offset / day_view->mins_per_row;
 }
 
-
 /* Converts an hour and minute to a y coordinate in the canvas. */
 gint
 e_day_view_convert_time_to_position (EDayView	*day_view,
@@ -2877,7 +2837,6 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_day_view_convert_event_coords (EDayView *day_view,
 				 GdkEvent *event,
@@ -2931,7 +2890,6 @@ e_day_view_convert_event_coords (EDayView *day_view,
 	return (event_window == window) ? TRUE : FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 					GdkEventButton *event,
@@ -3007,7 +2965,6 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-
 		if ((day < day_view->selection_start_day || day > day_view->selection_end_day)
 		    || (day == day_view->selection_start_day && row < day_view->selection_start_row)
 		    || (day == day_view->selection_end_day && row > day_view->selection_end_row)) {
@@ -3117,7 +3074,6 @@ e_day_view_on_long_event_button_press (EDayView		*day_view,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_event_button_press (EDayView	  *day_view,
 				  gint		   day,
@@ -3256,7 +3212,6 @@ e_day_view_on_event_click (EDayView *day_view,
 			return;
 		}
 
-
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
@@ -3330,7 +3285,6 @@ e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
 	y2 = item_y + item_h - 1;
 }
 
-
 static void
 e_day_view_reshape_resize_rect_item (EDayView *day_view)
 {
@@ -3506,7 +3460,6 @@ e_day_view_on_top_canvas_button_release (GtkWidget *widget,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_button_release (GtkWidget *widget,
 					  GdkEventButton *event,
@@ -3536,7 +3489,6 @@ e_day_view_on_main_canvas_button_release (GtkWidget *widget,
 	return FALSE;
 }
 
-
 void
 e_day_view_update_calendar_selection_time (EDayView *day_view)
 {
@@ -3653,7 +3605,6 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_motion (GtkWidget *widget,
 				  GdkEventMotion *mevent,
@@ -3787,7 +3738,6 @@ e_day_view_start_selection (EDayView *day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Updates the selection during a drag. If day is -1 the selection day is
    unchanged. */
 void
@@ -3833,7 +3783,6 @@ e_day_view_update_selection (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_normalize_selection (EDayView *day_view)
 {
@@ -3856,7 +3805,6 @@ e_day_view_normalize_selection (EDayView *day_view)
 	}
 }
 
-
 void
 e_day_view_finish_selection (EDayView *day_view)
 {
@@ -3904,7 +3852,6 @@ e_day_view_update_long_event_resize (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_update_resize (EDayView *day_view,
 			  gint row)
@@ -3955,7 +3902,6 @@ e_day_view_update_resize (EDayView *day_view,
 	}
 }
 
-
 /* This converts the resize start or end row back to a time and updates the
    event. */
 static void
@@ -4064,7 +4010,6 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 	g_object_unref (comp);
 }
 
-
 /* This converts the resize start or end row back to a time and updates the
    event. */
 static void
@@ -4126,7 +4071,6 @@ e_day_view_finish_resize (EDayView *day_view)
 
 	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
 
-
 	/* Hide the horizontal bars. */
 	day_view->resize_bars_event_day = -1;
 	day_view->resize_bars_event_num = -1;
@@ -4172,7 +4116,6 @@ e_day_view_finish_resize (EDayView *day_view)
 	g_object_unref (comp);
 }
 
-
 static void
 e_day_view_abort_resize (EDayView *day_view)
 {
@@ -4219,14 +4162,12 @@ e_day_view_free_events (EDayView *day_view)
 	day_view->editing_event_num = -1;
 	day_view->popup_event_num = -1;
 
-
 	e_day_view_free_event_array (day_view, day_view->long_events);
 
 	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
 		e_day_view_free_event_array (day_view, day_view->events[day]);
 }
 
-
 static void
 e_day_view_free_event_array (EDayView *day_view,
 			     GArray *array)
@@ -4245,7 +4186,6 @@ e_day_view_free_event_array (EDayView *day_view,
 	g_array_set_size (array, 0);
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gboolean
 e_day_view_add_event (ECalComponent *comp,
@@ -4415,7 +4355,6 @@ e_day_view_check_layout (EDayView *day_view)
 	}
 }
 
-
 static void
 e_day_view_reshape_long_events (EDayView *day_view)
 {
@@ -4438,7 +4377,6 @@ e_day_view_reshape_long_events (EDayView *day_view)
 	}
 }
 
-
 static void
 e_day_view_reshape_long_event (EDayView *day_view,
 			       gint	 event_num)
@@ -4597,7 +4535,6 @@ e_day_view_reshape_long_event (EDayView *day_view,
 	g_object_unref (comp);
 }
 
-
 /* This creates or updates the sizes of the canvas items for one day of the
    main canvas. */
 static void
@@ -4628,7 +4565,6 @@ e_day_view_reshape_day_events (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_reshape_day_event (EDayView *day_view,
 			      gint	day,
@@ -4732,7 +4668,6 @@ e_day_view_reshape_day_event (EDayView *day_view,
 	}
 }
 
-
 /* This creates or resizes the horizontal bars used to resize events in the
    main canvas. */
 static void
@@ -4799,7 +4734,6 @@ e_day_view_ensure_events_sorted (EDayView *day_view)
 	}
 }
 
-
 gint
 e_day_view_event_sort_func (gconstpointer arg1,
 			    gconstpointer arg2)
@@ -4973,7 +4907,6 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 		return TRUE;
 	}
 
-
 	/* Handle the cursor keys for moving & extending the selection. */
 	stop_emission = TRUE;
 	if (event->state & GDK_SHIFT_MASK) {
@@ -5078,7 +5011,6 @@ e_day_view_goto_start_of_work_day (EDayView *day_view)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Select the time that ends a work day*/
 static void
 e_day_view_goto_end_of_work_day (EDayView *day_view)
@@ -5179,7 +5111,6 @@ e_day_view_change_duration_to_end_of_work_day (EDayView *day_view)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5491,7 +5422,6 @@ e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5516,7 +5446,6 @@ e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5541,7 +5470,6 @@ e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
 {
@@ -5574,7 +5502,6 @@ e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
 {
@@ -5607,7 +5534,6 @@ e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 {
@@ -5626,7 +5552,6 @@ e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 	g_signal_emit_by_name (day_view, "selected_time_changed");
 }
 
-
 static void
 e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 {
@@ -5645,7 +5570,6 @@ e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 	g_signal_emit_by_name (day_view, "selected_time_changed");
 }
 
-
 /* Scrolls the main canvas up or down. The pages_to_scroll argument
    is multiplied with the adjustment's page size and added to the adjustment's
    value, while ensuring we stay within the bounds. A positive value will
@@ -5769,7 +5693,6 @@ e_day_view_start_editing_event (EDayView *day_view,
 	}
 }
 
-
 /* This stops the current edit. If accept is TRUE the event summary is updated,
    else the edit is cancelled. */
 static void
@@ -5787,7 +5710,6 @@ e_day_view_stop_editing_event (EDayView *day_view)
 		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
 }
 
-
 /* Cancels the current edition by resetting the appointment's text to its original value */
 static void
 cancel_editing (EDayView *day_view)
@@ -6205,7 +6127,6 @@ e_day_view_change_event_end_time_up (EDayView *day_view)
 	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
 }
 
-
 static void
 e_day_view_change_event_end_time_down (EDayView *day_view)
 {
@@ -6236,7 +6157,6 @@ e_day_view_change_event_end_time_down (EDayView *day_view)
 	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
 }
 
-
 static void
 e_day_view_on_editing_started (EDayView *day_view,
 			       GnomeCanvasItem *item)
@@ -6492,7 +6412,6 @@ e_day_view_convert_grid_position_to_time (EDayView *day_view,
 	return val;
 }
 
-
 static gboolean
 e_day_view_convert_time_to_grid_position (EDayView *day_view,
 					  time_t time,
@@ -6531,7 +6450,6 @@ e_day_view_convert_time_to_grid_position (EDayView *day_view,
 	return TRUE;
 }
 
-
 /* This starts or stops auto-scrolling when dragging a selection or resizing
    an event. */
 void
@@ -6559,7 +6477,6 @@ e_day_view_check_auto_scroll (EDayView *day_view,
 		e_day_view_stop_auto_scroll (day_view);
 }
 
-
 static void
 e_day_view_start_auto_scroll (EDayView *day_view,
 			      gboolean scroll_up)
@@ -6571,7 +6488,6 @@ e_day_view_start_auto_scroll (EDayView *day_view,
 	day_view->auto_scroll_up = scroll_up;
 }
 
-
 void
 e_day_view_stop_auto_scroll (EDayView *day_view)
 {
@@ -6581,7 +6497,6 @@ e_day_view_stop_auto_scroll (EDayView *day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_auto_scroll_handler (gpointer data)
 {
@@ -6717,7 +6632,6 @@ e_day_view_get_event_position (EDayView *day_view,
 			end_row = day_view->resize_end_row;
 	}
 
-
 	*item_x = day_view->day_offsets[day]
 		+ day_view->day_widths[day] * start_col / cols_in_row;
 	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
@@ -6734,7 +6648,6 @@ e_day_view_get_event_position (EDayView *day_view,
 	return TRUE;
 }
 
-
 gboolean
 e_day_view_get_long_event_position	(EDayView	*day_view,
 					 gint		 event_num,
@@ -6779,7 +6692,6 @@ e_day_view_get_long_event_position	(EDayView	*day_view,
 	return TRUE;
 }
 
-
 /* Converts a position within the entire top canvas to a day & event and
    a place within the event if appropriate. If event_num_return is NULL, it
    simply returns the grid position without trying to find the event. */
@@ -6855,7 +6767,6 @@ e_day_view_convert_position_in_top_canvas (EDayView *day_view,
 	return E_CALENDAR_VIEW_POS_NONE;
 }
 
-
 /* Converts a position within the entire main canvas to a day, row, event and
    a place within the event if appropriate. If event_num_return is NULL, it
    simply returns the grid position without trying to find the event. */
@@ -6956,7 +6867,6 @@ e_day_view_convert_position_in_main_canvas (EDayView *day_view,
 	return E_CALENDAR_VIEW_POS_NONE;
 }
 
-
 static gboolean
 e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
 				      GdkDragContext *context,
@@ -6977,7 +6887,6 @@ e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
 	return TRUE;
 }
 
-
 static void
 e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
 {
@@ -7001,7 +6910,6 @@ e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
 	e_day_view_update_top_canvas_drag (day_view, day);
 }
 
-
 static void
 e_day_view_update_top_canvas_drag (EDayView *day_view,
 				   gint day)
@@ -7046,14 +6954,12 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 
 	day_view->drag_last_day = day;
 
-
 	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
 	item_w = day_view->day_offsets[day + num_days] - item_x
 		- E_DAY_VIEW_GAP_WIDTH;
 	item_y = row * day_view->top_row_height;
 	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
 
-
 	/* Set the positions of the event & associated items. */
 	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
 			       "x1", item_x,
@@ -7099,7 +7005,6 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 	}
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
 				       GdkDragContext *context,
@@ -7124,7 +7029,6 @@ e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
 	return TRUE;
 }
 
-
 static void
 e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
 {
@@ -7149,7 +7053,6 @@ e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
 	e_day_view_update_main_canvas_drag (day_view, row, day);
 }
 
-
 static void
 e_day_view_update_main_canvas_drag (EDayView *day_view,
 				    gint row,
@@ -7261,7 +7164,6 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
 				     GdkDragContext *context,
@@ -7321,7 +7223,6 @@ e_day_view_on_drag_begin (GtkWidget      *widget,
 	gnome_canvas_item_hide (event->canvas_item);
 }
 
-
 static void
 e_day_view_on_drag_end (GtkWidget      *widget,
 			GdkDragContext *context,
@@ -7355,7 +7256,6 @@ e_day_view_on_drag_end (GtkWidget      *widget,
 	day_view->drag_event_num = -1;
 }
 
-
 static void
 e_day_view_on_drag_data_get (GtkWidget          *widget,
 			     GdkDragContext     *context,
@@ -7411,7 +7311,6 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 	}
 }
 
-
 static void
 e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 					      GdkDragContext     *context,
@@ -7637,7 +7536,6 @@ error:
 	gtk_drag_finish (context, FALSE, FALSE, time);
 }
 
-
 static void
 e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 					       GdkDragContext     *context,
@@ -7843,7 +7741,6 @@ error:
 	gtk_drag_finish (context, FALSE, FALSE, time);
 }
 
-
 /* Converts an hour from 0-23 to the preferred time format, and returns the
    suffix to add and the width of it in the normal font. */
 void
@@ -7875,7 +7772,6 @@ e_day_view_convert_time_to_display	(EDayView	*day_view,
 	}
 }
 
-
 gint
 e_day_view_get_time_string_width	(EDayView	*day_view)
 {
@@ -7899,7 +7795,6 @@ e_day_view_queue_layout (EDayView *day_view)
 	}
 }
 
-
 /* Removes any queued layout. */
 static void
 e_day_view_cancel_layout (EDayView *day_view)
@@ -7910,7 +7805,6 @@ e_day_view_cancel_layout (EDayView *day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_layout_timeout_cb (gpointer data)
 {
@@ -7925,7 +7819,6 @@ e_day_view_layout_timeout_cb (gpointer data)
 	return FALSE;
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 e_day_view_get_num_events_selected (EDayView *day_view)
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 31b894919c..d4f1ca680c 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -95,7 +95,6 @@ G_BEGIN_DECLS
 /* The gap between rows in the top canvas. */
 #define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
 
-
 /* These are used to get/set the working days in the week. The bit-flags are
    combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
    day values used by localtime etc. */
@@ -110,7 +109,6 @@ typedef enum
 	E_DAY_VIEW_SATURDAY	= 1 << 6
 } EDayViewDays;
 
-
 /* These are used to specify the type of an appointment. They match those
    used in EMeetingTimeSelector. */
 typedef enum
@@ -184,12 +182,10 @@ struct _EDayViewEvent {
 	guint8 num_columns;
 };
 
-
 #define E_DAY_VIEW(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_day_view_get_type (), EDayView)
 #define E_DAY_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
 #define E_IS_DAY_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_day_view_get_type ())
 
-
 typedef struct _EDayView       EDayView;
 typedef struct _EDayViewClass  EDayViewClass;
 
@@ -486,7 +482,6 @@ struct _EDayViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_day_view_get_type			(void);
 GtkWidget* e_day_view_new			(ECalModel *model);
 
@@ -600,7 +595,6 @@ void	   e_day_view_convert_time_to_display	(EDayView	*day_view,
 						 gint		*suffix_width);
 gint	   e_day_view_get_time_string_width	(EDayView	*day_view);
 
-
 gint	   e_day_view_event_sort_func		(const void	*arg1,
 						 const void	*arg2);
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index d3928d6c6a..ca99bb5dba 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -972,7 +972,6 @@ set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gb
 	if (message == NULL)
 		return;
 
-
 	if (err) {
 		gtk_html_stream_printf (html_stream, "<b><font color=\"#ff0000\">%s</font></b><br><br>", message);
 	} else {
@@ -1236,7 +1235,6 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
 }
 
-
 static gchar *
 get_publish_options (void)
 {
@@ -1284,7 +1282,6 @@ get_cancel_options (gboolean found, icalcomponent_kind kind)
 	return g_strdup_printf ("<object classid=\"itip:cancel_options\"></object>");
 }
 
-
 static ECalComponent *
 get_real_item (EItipControl *itip)
 {
@@ -1807,7 +1804,6 @@ e_itip_control_get_view_only (EItipControl *itip)
 	return priv->view_only;
 }
 
-
 void
 e_itip_control_set_delegator_address (EItipControl *itip, const gchar *address)
 {
@@ -1831,7 +1827,6 @@ e_itip_control_get_delegator_address (EItipControl *itip)
 	return priv->delegator_address;
 }
 
-
 void
 e_itip_control_set_delegator_name (EItipControl *itip, const gchar *name)
 {
@@ -1878,7 +1873,6 @@ e_itip_control_get_calendar_uid (EItipControl *itip)
 	return priv->calendar_uid;
 }
 
-
 static gboolean
 change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status)
 {
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 52d5860e29..fea2697344 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -615,7 +615,6 @@ e_meeting_attendee_get_atype (EMeetingAttendee *ia)
 	return E_MEETING_ATTENDEE_OPTIONAL_PERSON;
 }
 
-
 EMeetingAttendeeEditLevel
 e_meeting_attendee_get_edit_level (EMeetingAttendee *ia)
 {
@@ -642,7 +641,6 @@ e_meeting_attendee_set_edit_level (EMeetingAttendee *ia, EMeetingAttendeeEditLev
 	priv->edit_level = level;
 }
 
-
 static gint
 compare_times (EMeetingTime *time1,
 	       EMeetingTime *time2)
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 924ab6720d..55e3af816e 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -120,7 +120,6 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass)
 			      G_TYPE_POINTER);
 }
 
-
 static void
 add_section (ENameSelector *name_selector, const gchar *name)
 {
@@ -281,7 +280,6 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 		const gchar *attendee = NULL;
 		EDestination *des = l->data;
 
-
 		if (e_destination_is_evolution_list (des)) {
 			GList *l, *dl;
 
@@ -473,7 +471,6 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view)
 	gtk_tree_path_free (path);
 }
 
-
 static void
 type_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
 {
@@ -661,7 +658,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 
        priv = view->priv;
 
-
        if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model)))
                return;
        if (g_list_length (paths) > 1)
@@ -694,7 +690,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 
 }
 
-
 EMeetingListView *
 e_meeting_list_view_new (EMeetingStore *store)
 {
@@ -863,7 +858,6 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 			if (contact)
 				fburi = e_contact_get (contact, E_CONTACT_FREEBUSY_URL);
 
-
 			if (e_meeting_store_find_attendee (priv->store, attendee, NULL) == NULL) {
 				EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults (priv->store);
 
@@ -1003,4 +997,3 @@ e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *n
 	priv->name_selector = g_object_ref (name_selector);
 }
 
-
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index 50aad0c966..6a2dc55523 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define E_IS_MEETING_LIST_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
 #define E_IS_MEETING_LIST_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
 
-
 typedef struct _EMeetingListView        EMeetingListView;
 typedef struct _EMeetingListViewPrivate EMeetingListViewPrivate;
 typedef struct _EMeetingListViewClass   EMeetingListViewClass;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index da60b19f43..20bc6388da 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -76,7 +76,6 @@ struct _EMeetingStoreQueueData {
 	GPtrArray *data;
 };
 
-
 static GObjectClass *parent_class = NULL;
 
 static icalparameter_cutype
@@ -565,7 +564,6 @@ ems_class_init (GObjectClass *klass)
 	klass->finalize = ems_finalize;
 }
 
-
 static void
 ems_init (EMeetingStore *store)
 {
@@ -629,7 +627,6 @@ e_meeting_store_new (void)
 	return g_object_new (E_TYPE_MEETING_STORE, NULL);
 }
 
-
 ECal *
 e_meeting_store_get_e_cal (EMeetingStore *store)
 {
@@ -1203,7 +1200,6 @@ freebusy_async (gpointer data)
 #undef USER_SUB
 #undef DOMAIN_SUB
 
-
 static gboolean
 refresh_busy_periods (gpointer data)
 {
@@ -1278,8 +1274,6 @@ refresh_busy_periods (gpointer data)
 
 	}
 
-
-
 	g_mutex_lock (store->priv->mutex);
 	store->priv->num_threads++;
 	g_mutex_unlock (store->priv->mutex);
@@ -1292,7 +1286,6 @@ refresh_busy_periods (gpointer data)
 		g_free (fbd->email);
 		priv->refresh_idle_id = 0;
 
-
 		g_mutex_lock (store->priv->mutex);
 		store->priv->num_threads--;
 		g_mutex_unlock (store->priv->mutex);
@@ -1360,7 +1353,6 @@ refresh_queue_add (EMeetingStore *store, gint row,
 	}
 	g_mutex_unlock (priv->mutex);
 
-
 	g_object_ref (attendee);
 	g_ptr_array_add (priv->refresh_queue, attendee);
 
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 00efabe029..90a12b51df 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -126,7 +126,6 @@ e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
 {
@@ -149,7 +148,6 @@ e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
 	item->y2 = 0;
 }
 
-
 static void
 e_meeting_time_selector_item_dispose (GObject *object)
 {
@@ -173,7 +171,6 @@ e_meeting_time_selector_item_dispose (GObject *object)
 	G_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->dispose (object);
 }
 
-
 static void
 e_meeting_time_selector_item_set_property (GObject *object,
                                            guint property_id,
@@ -193,7 +190,6 @@ e_meeting_time_selector_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
 {
@@ -213,7 +209,6 @@ e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
 	mts_item->stipple_gc = gdk_gc_new (window);
 }
 
-
 static void
 e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 {
@@ -230,7 +225,6 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)(item);
 }
 
-
 static void
 e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
 {
@@ -244,7 +238,6 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtS
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -381,7 +374,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	else
 		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height);
 
-
 	/* Draw the currently-selected meeting time vertical bars. */
 	if (show_meeting_time) {
 		if (is_display_top) {
@@ -414,7 +406,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 					    GdkDrawable *drawable, GDate *date,
@@ -510,7 +501,6 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 	g_object_unref (layout);
 }
 
-
 /* This paints the colored bars representing busy periods for the combined
    list of attendees. For now we just paint the bars for each attendee of
    each other. If we want to speed it up we could optimise it later. */
@@ -561,7 +551,6 @@ e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelec
 	cairo_destroy (cr);
 }
 
-
 static void
 e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 					GdkDrawable *drawable, GDate *date,
@@ -632,10 +621,8 @@ e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 				    2, height - unused_y);
 	}
 
-
 }
 
-
 /* This paints the colored bars representing busy periods for the individual
    attendees. */
 static void
@@ -685,7 +672,6 @@ e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_i
 	cairo_destroy (cr);
 }
 
-
 /* This subtracts the attendees longest_period_in_days from the given date,
    and does a binary search of the attendee's busy periods array to find the
    first one which could possible end on the given day or later.
@@ -717,7 +703,6 @@ e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *m
 	return period_num;
 }
 
-
 /* This paints the visible busy periods for one attendee which are of a certain
    busy type, e.g out of office. It is passed the index of the first visible
    busy period of the attendee and continues until it runs off the screen. */
@@ -789,7 +774,6 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt
 	}
 }
 
-
 /*
  * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.
  */
@@ -806,7 +790,6 @@ e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -831,7 +814,6 @@ e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
 /* This handles all button press events for the item. If the cursor is over
    one of the meeting time vertical bars we start a drag. If not we set the
    meeting time to the nearest half-hour interval.
@@ -940,11 +922,9 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
 						  end_time.hour,
 						  end_time.minute);
 
-
 	return FALSE;
 }
 
-
 /* This handles all button release events for the item. If we were dragging,
    we finish the drag. */
 static gint
@@ -966,7 +946,6 @@ e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
 	return FALSE;
 }
 
-
 /* This handles all motion notify events for the item. If button1 is pressed
    we check if a drag is in progress. If not, we set the cursor if we are over
    the meeting time vertical bars. Note that GnomeCanvas doesn't use motion
@@ -1010,7 +989,6 @@ e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
 	return FALSE;
 }
 
-
 static EMeetingTimeSelectorPosition
 e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,
 						gint x, gint y)
@@ -1038,7 +1016,6 @@ e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_it
 	return E_MEETING_TIME_SELECTOR_POS_NONE;
 }
 
-
 static gboolean
 e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
 						   gint row,
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index e9daa3d56a..547f01aaf6 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -35,12 +35,10 @@
 
 G_BEGIN_DECLS
 
-
 #define E_MEETING_TIME_SELECTOR_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
 #define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
 #define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (G_TYPE_CHECK_INSTANCE_TYPE((o), e_meeting_time_selector_item_get_type ()))
 
-
 typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;
 typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;
 
@@ -65,7 +63,6 @@ struct _EMeetingTimeSelectorItem
 	GdkCursor *last_cursor_set;
 };
 
-
 struct _EMeetingTimeSelectorItemClass
 {
 	GnomeCanvasItemClass parent_class;
@@ -74,5 +71,4 @@ struct _EMeetingTimeSelectorItemClass
 GType e_meeting_time_selector_item_get_type (void);
 void e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item);
 
-
 #endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 1ea1c9082a..1f4f953c9c 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -82,7 +82,6 @@ enum {
 	LAST_SIGNAL
 };
 
-
 static gint mts_signals [LAST_SIGNAL] = { 0 };
 
 static void e_meeting_time_selector_destroy (GtkObject *object);
@@ -163,7 +162,6 @@ static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeeting
 									EMeetingTime *start_time,
 									EMeetingTime *end_time);
 
-
 static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
@@ -221,7 +219,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
 	widget_class->expose_event = e_meeting_time_selector_expose_event;
 }
 
-
 static void
 e_meeting_time_selector_init (EMeetingTimeSelector * mts)
 {
@@ -248,7 +245,6 @@ e_meeting_time_selector_init (EMeetingTimeSelector * mts)
 	mts->style_change_idle_id = 0;
 }
 
-
 void
 e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems)
 {
@@ -299,7 +295,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0);
 	gtk_widget_show (mts->attendees_vbox);
 
-
 	/* build the etable */
 	mts->model = ems;
 
@@ -318,7 +313,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	gtk_widget_show (GTK_WIDGET (mts->list_view));
 
-
 	sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
@@ -676,7 +670,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This adds a color to the color key beneath the main display. If color is
    NULL, it displays the No Info stipple instead. */
 static void
@@ -740,7 +733,6 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea,
 	return TRUE;
 }
 
-
 static void
 e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
 					   const gchar *name, GdkColor *c)
@@ -756,7 +748,6 @@ e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
 		g_warning ("Failed to allocate color: %s\n", name);
 }
 
-
 static void
 e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
 					       GtkMenu   *menu)
@@ -772,7 +763,6 @@ e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
 	mts->options_menu = NULL;
 }
 
-
 static void
 e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
 						GtkMenu   *menu)
@@ -788,7 +778,6 @@ e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
 	mts->autopick_menu = NULL;
 }
 
-
 GtkWidget *
 e_meeting_time_selector_new (EMeetingStore *ems)
 {
@@ -801,7 +790,6 @@ e_meeting_time_selector_new (EMeetingStore *ems)
 	return mts;
 }
 
-
 static void
 e_meeting_time_selector_destroy (GtkObject *object)
 {
@@ -843,7 +831,6 @@ e_meeting_time_selector_destroy (GtkObject *object)
 		(*GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)(object);
 }
 
-
 static void
 e_meeting_time_selector_realize (GtkWidget *widget)
 {
@@ -857,7 +844,6 @@ e_meeting_time_selector_realize (GtkWidget *widget)
 	mts->color_key_gc = gdk_gc_new (widget->window);
 }
 
-
 static void
 e_meeting_time_selector_unrealize (GtkWidget *widget)
 {
@@ -1002,7 +988,6 @@ e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
 			  GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h);
 }
 
-
 /* When the main canvas scrolls, we scroll the other canvases. */
 static void
 e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
@@ -1017,7 +1002,6 @@ e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
 	}
 }
 
-
 static void
 e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
 					     EMeetingTimeSelector *mts)
@@ -1057,7 +1041,6 @@ e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
 	*end_minute = mts->meeting_end_time.minute;
 }
 
-
 gboolean
 e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
 					  gint start_year,
@@ -1127,7 +1110,6 @@ e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
 						gboolean working_hours_only)
@@ -1150,7 +1132,6 @@ e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
 					   gint day_start_hour,
@@ -1189,7 +1170,6 @@ e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
 					gboolean zoomed_out)
@@ -1286,7 +1266,6 @@ e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
 	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
 }
 
-
 void
 e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
 					     EMeetingTimeSelectorAutopickOption autopick_option)
@@ -1392,7 +1371,6 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
 
 }
 
-
 /* This formats a EMeetingTimein a string and returns it.
    Note that it uses a static buffer. */
 gchar *
@@ -1412,7 +1390,6 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
 	return buffer;
 }
 
-
 /* This formats a GDate in a string and returns it.
    Note that it uses a static buffer. */
 gchar *
@@ -1434,7 +1411,6 @@ e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
 	e_meeting_list_view_invite_others_dialog (mts->list_view);
 }
 
-
 static void
 e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
 						   EMeetingTimeSelector *mts)
@@ -1444,7 +1420,6 @@ e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
 			mts, 1, GDK_CURRENT_TIME);
 }
 
-
 static void
 e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
 							gint *x,
@@ -1483,7 +1458,6 @@ e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
 	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
 }
 
-
 static void
 e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
 						    EMeetingTimeSelector *mts)
@@ -1493,7 +1467,6 @@ e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
 			mts, 1, GDK_CURRENT_TIME);
 }
 
-
 static void
 e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 							 gint *x,
@@ -1520,7 +1493,6 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 	*y = CLAMP (*y, 0, max_y);
 }
 
-
 static void
 e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
 						    EMeetingTimeSelector *mts)
@@ -1531,7 +1503,6 @@ e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
 		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
 }
 
-
 static void
 e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
 						EMeetingTimeSelector *mts)
@@ -1539,7 +1510,6 @@ e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
 	e_meeting_time_selector_autopick (mts, FALSE);
 }
 
-
 static void
 e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
 						EMeetingTimeSelector *mts)
@@ -1547,7 +1517,6 @@ e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
 	e_meeting_time_selector_autopick (mts, TRUE);
 }
 
-
 /* This tries to find the previous or next meeting time for which all
    attendees will be available. */
 static void
@@ -1672,7 +1641,6 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
 	}
 }
 
-
 static void
 e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
 						   EMeetingTime*end,
@@ -1693,7 +1661,6 @@ e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
 	}
 }
 
-
 /* This moves the given time forward to the next suitable start of a meeting.
    If zoomed_out is set, this means every hour. If not every half-hour. */
 static void
@@ -1770,7 +1737,6 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
 	}
 }
 
-
 /* This moves the given time backward to the next suitable start of a meeting.
    If zoomed_out is set, this means every hour. If not every half-hour. */
 static void
@@ -1855,7 +1821,6 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt
 	}
 }
 
-
 /* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime.
    It is used to calculate the end of a period given a start & duration.
    Days, hours & minutes can be negative, to move backwards, but they should
@@ -1887,7 +1852,6 @@ e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
 	e_meeting_time_selector_fix_time_overflows (mtstime);
 }
 
-
 /* This looks for any busy period of the given attendee which clashes with
    the start and end time. It uses a binary search. */
 static EMeetingFreeBusyPeriod *
@@ -1942,7 +1906,6 @@ e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
-
 static void
 e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
 						  EMeetingTimeSelector *mts)
@@ -1956,7 +1919,6 @@ e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
-
 /* This recalculates day_width, first_hour_shown and last_hour_shown. */
 static void
 e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
@@ -1995,7 +1957,6 @@ e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
 	mts->meeting_positions_valid = FALSE;
 }
 
-
 /* This saves the first visible time in the given EMeetingTimeSelectorTime. */
 static void
 e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
@@ -2008,7 +1969,6 @@ e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);
 }
 
-
 /* This restores a saved position. */
 static void
 e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
@@ -2024,7 +1984,6 @@ e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
 				new_scroll_x, scroll_y);
 }
 
-
 /* This returns the x pixel coords of the meeting time in the entire scroll
    region. It recalculates them if they have been marked as invalid.
    If it returns FALSE then no meeting time is set or the meeting time is
@@ -2060,7 +2019,6 @@ e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
 	return TRUE;
 }
 
-
 /* This recalculates the date format to used, by computing the width of the
    longest date strings in the widget's font and seeing if they fit. */
 static void
@@ -2170,7 +2128,6 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
 	g_object_unref (layout);
 }
 
-
 /* Turn off the background of the canvas windows. This reduces flicker
    considerably when scrolling. (Why isn't it in GnomeCanvas?). */
 static void
@@ -2181,7 +2138,6 @@ e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
 				    NULL, FALSE);
 }
 
-
 /* This is called when the meeting start time GnomeDateEdit is changed,
    either via the "date_changed". "time_changed" or "activate" signals on one
    of the GtkEntry widgets. So don't use the widget parameter since it may be
@@ -2228,7 +2184,6 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This is called when the meeting end time GnomeDateEdit is changed,
    either via the "date_changed", "time_changed" or "activate" signals on one
    of the GtkEntry widgets. So don't use the widget parameter since it may be
@@ -2278,7 +2233,6 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This updates the ranges shown in the GnomeDateEdit popup menus, according
    to working_hours_only etc. */
 static void
@@ -2302,7 +2256,6 @@ e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)
 	e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour);
 }
 
-
 static void
 e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
 						 GtkAllocation *allocation,
@@ -2343,7 +2296,6 @@ e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *
 					height);
 }
 
-
 /* This changes the meeting time based on the given x coordinate and whether
    we are dragging the start or end bar. It returns the new position, which
    will be swapped if the start bar is dragged past the end bar or vice versa.
@@ -2473,7 +2425,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 		set_both_times = TRUE;
 	}
 
-
 	/* Mark the calculated positions as invalid. */
 	mts->meeting_positions_valid = FALSE;
 
@@ -2496,7 +2447,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 		g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This is the timeout function which handles auto-scrolling when the user is
    dragging one of the meeting time vertical bars outside the left or right
    edge of the canvas. */
@@ -2649,7 +2599,6 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	return TRUE;
 }
 
-
 /* This removes our auto-scroll timeout function, if we have one installed. */
 void
 e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
@@ -2660,7 +2609,6 @@ e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
 	}
 }
 
-
 /* This updates the GnomeDateEdit widget displaying the meeting start time. */
 static void
 e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
@@ -2673,7 +2621,6 @@ e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
 					      mts->meeting_start_time.minute);
 }
 
-
 /* This updates the GnomeDateEdit widget displaying the meeting end time. */
 static void
 e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
@@ -2692,7 +2639,6 @@ e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
 					      mts->meeting_end_time.minute);
 }
 
-
 /* This ensures that the meeting time is shown on screen, by scrolling the
    canvas and possibly by changing the range of dates shown in the canvas. */
 static void
@@ -2732,7 +2678,6 @@ e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
 				new_scroll_x, scroll_y);
 }
 
-
 /* This updates the range of dates shown in the canvas, to make sure that the
    currently selected meeting time is in the range. */
 static void
@@ -2747,7 +2692,6 @@ e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)
 			 E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);
 }
 
-
 /* This checks if the time's hour is over 24 or its minute is over 60 and if
    so it updates the day/hour appropriately. Note that hours and minutes are
    stored in guint8's so they can't overflow by much. */
@@ -2803,7 +2747,6 @@ e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
 	}
 }
 
-
 /* This takes an x pixel coordinate within a day, and converts it to hours
    and minutes, depending on working_hours_only and zoomed_out. */
 void
@@ -2820,7 +2763,6 @@ e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSele
 	*hours += mts->first_hour_shown;
 }
 
-
 /* This takes an x pixel coordinate within the entire canvas scroll region and
    returns the time in which it falls. Note that it won't be extremely
    accurate since hours may only be a few pixels wide in the display.
@@ -2846,7 +2788,6 @@ e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute);
 }
 
-
 /* This takes a EMeetingTime and calculates the x pixel coordinate
    within the entire canvas scroll region. It is used to draw the selected
    meeting time and all the busy periods. */
@@ -2916,7 +2857,6 @@ row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
 	gtk_widget_queue_draw (mts->display_main);
 }
 
-
 #define REFRESH_PAUSE 5
 
 static gboolean
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 97be769917..b38dd98f74 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -48,7 +48,6 @@ G_BEGIN_DECLS
 #define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
 #define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
 
-
 /* This is used to specify the format used when displaying the dates.
    The full format is like 'Sunday, September 12, 1999'. The abbreviated format
    is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
@@ -61,7 +60,6 @@ typedef enum
 	E_MEETING_TIME_SELECTOR_DATE_SHORT
 } EMeetingTimeSelectorDateFormat;
 
-
 /* This is used to specify a position regarding the vertical bars around the
    current meeting time, so we know which one is being dragged. */
 typedef enum
@@ -71,7 +69,6 @@ typedef enum
 	E_MEETING_TIME_SELECTOR_POS_END
 } EMeetingTimeSelectorPosition;
 
-
 /* This is used to specify the autopick option, which determines how we choose
    the previous/next appropriate meeting time. */
 typedef enum
@@ -87,12 +84,10 @@ extern const gchar *EMeetingTimeSelectorHours[24];
 /* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
 extern const gchar *EMeetingTimeSelectorHours12[24];
 
-
 #define E_MEETING_TIME_SELECTOR(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
 #define E_MEETING_TIME_SELECTOR_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
 #define IS_E_MEETING_TIME_SELECTOR(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_meeting_time_selector_get_type ())
 
-
 typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
 typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
 
@@ -200,7 +195,6 @@ struct _EMeetingTimeSelector
 	   than every hour. Defaults to FALSE. */
 	gboolean zoomed_out;
 
-
 	/*
 	 * Internal Data.
 	 */
@@ -263,7 +257,6 @@ struct _EMeetingTimeSelector
 	guint style_change_idle_id;
 };
 
-
 struct _EMeetingTimeSelectorClass
 {
 	GtkTableClass parent_class;
@@ -271,7 +264,6 @@ struct _EMeetingTimeSelectorClass
 	void (* changed) (EMeetingTimeSelector *mts);
 };
 
-
 /*
  * PUBLIC INTERFACE - note that this interface will probably change, when I
  * know where the data is coming from. This is mainly just for testing for now.
@@ -351,8 +343,6 @@ gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector
 							   gint end_minute,
 							   EMeetingFreeBusyType busy_type);
 
-
-
 /*
  * INTERNAL ROUTINES - functions to communicate with the canvas items within
  *		       the EMeetingTimeSelector.
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index cd2e76df38..1777d2c7ff 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -42,4 +42,3 @@ G_END_DECLS
 
 #endif /* _E_MEETING_UTILS_H_ */
 
-
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index ea03097ca8..553f239a12 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -70,7 +70,6 @@ static GtkTargetEntry target_types[] = {
 
 static guint n_target_types = G_N_ELEMENTS (target_types);
 
-
 extern ECompEditorRegistry *comp_editor_registry;
 
 static void e_memo_table_destroy		(GtkObject	*object);
@@ -121,7 +120,6 @@ static GdkAtom clipboard_atom = GDK_NONE;
 
 G_DEFINE_TYPE (EMemoTable, e_memo_table, GTK_TYPE_TABLE)
 
-
 static void
 e_memo_table_class_init (EMemoTableClass *klass)
 {
@@ -277,7 +275,6 @@ e_memo_table_init (EMemoTable *memo_table)
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (table);
 
-
 	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
 	g_signal_connect (e_table, "double_click", G_CALLBACK (e_memo_table_on_double_click), memo_table);
 	g_signal_connect (e_table, "right_click", G_CALLBACK (e_memo_table_on_right_click), memo_table);
@@ -291,7 +288,6 @@ e_memo_table_init (EMemoTable *memo_table)
 		atk_object_set_name (a11y, _("Memos"));
 }
 
-
 /**
  * e_memo_table_new:
  * @Returns: a new #EMemoTable.
@@ -308,7 +304,6 @@ e_memo_table_new (void)
 	return memo_table;
 }
 
-
 /**
  * e_memo_table_get_model:
  * @memo_table: A calendar table.
@@ -326,7 +321,6 @@ e_memo_table_get_model (EMemoTable *memo_table)
 	return memo_table->model;
 }
 
-
 static void
 e_memo_table_destroy (GtkObject *object)
 {
@@ -741,7 +735,6 @@ e_memo_table_paste_clipboard (EMemoTable *memo_table)
 	GtkClipboard *clipboard;
 	g_return_if_fail (E_IS_MEMO_TABLE (memo_table));
 
-
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (memo_table), clipboard_atom);
 	g_object_ref (memo_table);
 
@@ -804,7 +797,6 @@ e_memo_table_on_double_click (ETable *table,
 	open_memo_by_row (memo_table, row);
 }
 
-
 static void
 e_memo_table_on_open_memo (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
@@ -1058,7 +1050,6 @@ e_memo_table_load_state	(EMemoTable *memo_table,
 	}
 }
 
-
 /* Saves the state of the table (headers shown etc.) to the given file. */
 void
 e_memo_table_save_state (EMemoTable	*memo_table,
@@ -1097,7 +1088,6 @@ e_memo_table_get_current_time (ECellDateEdit *ecde, gpointer data)
 	return tmp_tm;
 }
 
-
 #ifdef TRANSLATORS_ONLY
 
 static gchar *test[] = {
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index b593b9445b..7fbb7d0f3e 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -38,16 +38,13 @@ G_BEGIN_DECLS
  * Used for memo events and tasks.
  */
 
-
 #define E_MEMO_TABLE(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_memo_table_get_type (), EMemoTable)
 #define E_MEMO_TABLE_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_memo_table_get_type (), EMemoTableClass)
 #define E_IS_MEMO_TABLE(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_memo_table_get_type ())
 
-
 typedef struct _EMemoTable       EMemoTable;
 typedef struct _EMemoTableClass  EMemoTableClass;
 
-
 struct _EMemoTable {
 	GtkTable table;
 
@@ -78,7 +75,6 @@ struct _EMemoTableClass {
 	void (* user_created) (EMemoTable *memo_table);
 };
 
-
 GType		   e_memo_table_get_type (void);
 GtkWidget* e_memo_table_new	(void);
 
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 4b8d234cee..82f6d91c33 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -55,7 +55,6 @@
 #include "e-memos.h"
 #include "common/authentication.h"
 
-
 /* Private part of the GnomeCalendar structure */
 struct _EMemosPrivate {
 	/* The memo lists for display */
@@ -522,7 +521,6 @@ setup_widgets (EMemos *memos)
 	gtk_paned_add1 (GTK_PANED (priv->paned), priv->memos_view);
 	gtk_widget_show (priv->memos_view);
 
-
 	e_table_drag_source_set (etable, GDK_BUTTON1_MASK,
 				 list_drag_types, num_list_drag_types,
 				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
@@ -593,7 +591,6 @@ e_memos_class_init (EMemosClass *klass)
 	klass->source_removed = NULL;
 }
 
-
 static void
 categories_changed_cb (gpointer object, gpointer user_data)
 {
@@ -651,7 +648,6 @@ e_memos_new (void)
 	return GTK_WIDGET (memos);
 }
 
-
 void
 e_memos_set_ui_component (EMemos *memos,
 			  BonoboUIComponent *ui_component)
@@ -662,7 +658,6 @@ e_memos_set_ui_component (EMemos *memos,
 	e_search_bar_set_ui_component (E_SEARCH_BAR (memos->priv->search_bar), ui_component);
 }
 
-
 static void
 e_memos_destroy (GtkObject *object)
 {
@@ -993,7 +988,6 @@ e_memos_remove_memo_source (EMemos *memos, ESource *source)
 	if (!client)
 		return TRUE;
 
-
 	priv->clients_list = g_list_remove (priv->clients_list, client);
 	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
 					      0, 0, NULL, NULL, memos);
@@ -1003,7 +997,6 @@ e_memos_remove_memo_source (EMemos *memos, ESource *source)
 
 	g_hash_table_remove (priv->clients, uid);
 
-
 	g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
 
 	return TRUE;
@@ -1052,7 +1045,6 @@ e_memos_get_default_client (EMemos *memos)
 	return e_cal_model_get_default_client (e_memo_table_get_model (E_MEMO_TABLE (priv->memos_view)));
 }
 
-
 /**
  * e_memos_delete_selected:
  * @memos: A memos control widget.
@@ -1078,7 +1070,6 @@ e_memos_delete_selected (EMemos *memos)
 	e_cal_component_memo_preview_clear (E_CAL_COMPONENT_MEMO_PREVIEW (priv->preview));
 }
 
-
 /* Callback used from the view collection when we need to display a new view */
 static void
 display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index 12aeea858e..a03541c6d6 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -58,7 +58,6 @@ struct _EMemosClass {
         void (* source_removed)    (EMemos *memos, ESource *source);
 };
 
-
 GType      e_memos_get_type        (void);
 GtkWidget *e_memos_construct       (EMemos *memos);
 
@@ -77,7 +76,6 @@ void       e_memos_new_memo          (EMemos            *memos);
 void       e_memos_complete_selected (EMemos            *memos);
 void       e_memos_delete_selected   (EMemos            *memos);
 
-
 void e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic);
 void e_memos_discard_view_menus (EMemos *memos);
 
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index f1aa1ec45d..0f82c3237e 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -27,7 +27,6 @@
 #include "e-select-names-editable.h"
 #include "e-select-names-renderer.h"
 
-
 struct _ESelectNamesRendererPriv {
 	ESelectNamesEditable *editable;
 	gchar *path;
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 5acdcc0f65..bf400590a8 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -56,7 +56,6 @@
 #include "e-cal-menu.h"
 #include "e-cal-model-tasks.h"
 
-
 /* Private part of the GnomeCalendar structure */
 struct _ETasksPrivate {
 	/* The task lists for display */
@@ -171,7 +170,6 @@ e_tasks_get_tasks_menu (ETasks *tasks)
         return tasks->priv->tasks_menu;
 }
 
-
 /* Callback used when the selection changes in the table. */
 static void
 table_selection_change_cb (ETable *etable, gpointer data)
@@ -557,7 +555,6 @@ table_drag_begin (ETable         *table,
 
 }
 
-
 static void
 table_drag_end (ETable         *table,
 		gint             row,
@@ -643,7 +640,6 @@ setup_widgets (ETasks *tasks)
 	gtk_paned_add1 (GTK_PANED (priv->paned), priv->tasks_view);
 	gtk_widget_show (priv->tasks_view);
 
-
 	e_table_drag_source_set (etable, GDK_BUTTON1_MASK,
 				 list_drag_types, num_list_drag_types,
 				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
@@ -737,7 +733,6 @@ e_tasks_class_init (ETasksClass *class)
 	class->source_removed = NULL;
 }
 
-
 static void
 categories_changed_cb (gpointer object, gpointer user_data)
 {
@@ -796,7 +791,6 @@ e_tasks_new (void)
 	return GTK_WIDGET (tasks);
 }
 
-
 void
 e_tasks_set_ui_component (ETasks *tasks,
 			  BonoboUIComponent *ui_component)
@@ -807,7 +801,6 @@ e_tasks_set_ui_component (ETasks *tasks,
 	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
 }
 
-
 static void
 e_tasks_destroy (GtkObject *object)
 {
@@ -1056,7 +1049,6 @@ open_ecal (ETasks *tasks, ECal *cal, gboolean only_if_exists, open_func of)
 	zone = calendar_config_get_icaltimezone ();
 	e_cal_set_default_timezone (cal, zone, NULL);
 
-
 	set_status_message (tasks, _("Opening tasks at %s"), e_cal_get_uri (cal));
 
 	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), tasks);
@@ -1224,7 +1216,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
 	if (!client)
 		return TRUE;
 
-
 	priv->clients_list = g_list_remove (priv->clients_list, client);
 	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
 					      0, 0, NULL, NULL, tasks);
@@ -1234,7 +1225,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
 
 	g_hash_table_remove (priv->clients, uid);
 
-
 	g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
 
 	return TRUE;
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 47e38c8a5b..f9eacb7819 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -57,7 +57,6 @@ struct _ETasksClass {
         void (* source_removed)    (ETasks *tasks, ESource *source);
 };
 
-
 GType      e_tasks_get_type        (void);
 GtkWidget *e_tasks_construct       (ETasks *tasks);
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 28660fd3b9..f3e239aa63 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -49,7 +49,6 @@ struct _ETimezoneEntryPrivate {
 	GtkWidget *button;
 };
 
-
 enum {
   CHANGED,
   LAST_SIGNAL
@@ -70,7 +69,6 @@ static void add_relation		(ETimezoneEntry *tentry,
 
 static void e_timezone_entry_set_entry  (ETimezoneEntry *tentry);
 
-
 static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX)
@@ -99,7 +97,6 @@ e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
 	class->changed = NULL;
 }
 
-
 static void
 e_timezone_entry_init		(ETimezoneEntry	*tentry)
 {
@@ -128,7 +125,6 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	}
 }
 
-
 /**
  * e_timezone_entry_new:
  *
@@ -149,7 +145,6 @@ e_timezone_entry_new			(void)
 	return GTK_WIDGET (tentry);
 }
 
-
 static void
 e_timezone_entry_destroy		(GtkObject	*object)
 {
@@ -166,7 +161,6 @@ e_timezone_entry_destroy		(GtkObject	*object)
 		(* GTK_OBJECT_CLASS (e_timezone_entry_parent_class)->destroy) (object);
 }
 
-
 /* The arrow button beside the date field has been clicked, so we show the
    popup with the ECalendar in. */
 static void
@@ -193,7 +187,6 @@ on_button_clicked		(GtkWidget	*widget,
 	g_object_unref (timezone_dialog);
 }
 
-
 static void
 on_entry_changed			(GtkEntry	*entry,
 					 ETimezoneEntry *tentry)
@@ -201,7 +194,6 @@ on_entry_changed			(GtkEntry	*entry,
 	g_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED], 0);
 }
 
-
 icaltimezone*
 e_timezone_entry_get_timezone		(ETimezoneEntry	*tentry)
 {
@@ -272,7 +264,6 @@ e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,
 	add_relation (tentry, priv->entry);
 }
 
-
 /* Sets the default timezone. If the current timezone matches this, then the
    entry field is hidden. This is useful since most people do not use timezones
    so it makes the user interface simpler. */
@@ -291,7 +282,6 @@ e_timezone_entry_set_default_timezone	(ETimezoneEntry	*tentry,
 	e_timezone_entry_set_entry (tentry);
 }
 
-
 static void
 e_timezone_entry_set_entry (ETimezoneEntry *tentry)
 {
@@ -325,7 +315,6 @@ e_timezone_entry_set_entry (ETimezoneEntry *tentry)
 	g_free (name_buffer);
 }
 
-
 static gboolean
 e_timezone_entry_mnemonic_activate (GtkWidget *widget,
                                     gboolean   group_cycling)
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index 6c63fb8444..c1bf482aef 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -37,14 +37,12 @@
 
 G_BEGIN_DECLS
 
-
 #define E_TYPE_TIMEZONE_ENTRY            (e_timezone_entry_get_type ())
 #define E_TIMEZONE_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
 #define E_TIMEZONE_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
 #define E_IS_TIMEZONE_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
 #define E_IS_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
 
-
 typedef struct _ETimezoneEntry        ETimezoneEntry;
 typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;
 typedef struct _ETimezoneEntryClass   ETimezoneEntryClass;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 6ab551e6fc..8ad8b608a2 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -89,7 +89,6 @@ static ECalendarViewPosition e_week_view_event_item_get_position (EWeekViewEvent
 							      gdouble x,
 							      gdouble y);
 
-
 /* The arguments we take */
 enum {
 	PROP_0,
@@ -139,7 +138,6 @@ e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_week_view_event_item_init (EWeekViewEventItem *wveitem)
 {
@@ -147,7 +145,6 @@ e_week_view_event_item_init (EWeekViewEventItem *wveitem)
 	wveitem->span_num = -1;
 }
 
-
 static void
 e_week_view_event_item_set_property (GObject *object,
                                      guint property_id,
@@ -174,7 +171,6 @@ e_week_view_event_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_event_item_update (GnomeCanvasItem *item,
 			       double	       *affine,
@@ -720,7 +716,6 @@ e_week_view_draw_time	(EWeekView	*week_view,
 	g_object_unref (layout);
 }
 
-
 static void
 e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
 				   GdkDrawable        *drawable,
@@ -859,7 +854,6 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
 	gdk_gc_set_clip_mask (gc, NULL);
 }
 
-
 /* This draws a little triangle to indicate that an event extends past
    the days visible on screen. */
 static void
@@ -922,7 +916,6 @@ e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
 	cairo_save (cr);
 	gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
 
-
 	/* If the height is odd we can use the same central point for both
 	   lines. If it is even we use different end-points. */
 	c1 = c2 = y + (h / 2);
@@ -951,7 +944,6 @@ e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -975,7 +967,6 @@ e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
 static gboolean
 e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 				     GdkEvent		*bevent)
@@ -1045,7 +1036,6 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 	return FALSE;
 }
 
-
 static gboolean
 e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
 				       GdkEvent		  *event)
@@ -1109,7 +1099,6 @@ e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
 	return TRUE;
 }
 
-
 static ECalendarViewPosition
 e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
 				     gdouble x,
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index ebc5d07e07..6c077747f1 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -56,11 +56,8 @@ typedef struct {
 
 } EWeekViewEventItemClass;
 
-
 GType    e_week_view_event_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 8f0cb5ece8..f28f77a020 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -45,7 +45,6 @@ static gint e_week_view_find_span_end	(gboolean	 multi_week_view,
 					 gint		 display_start_day,
 					 gint		 day);
 
-
 GArray*
 e_week_view_layout_events	(GArray		*events,
 				 GArray		*old_spans,
@@ -108,7 +107,6 @@ e_week_view_layout_events	(GArray		*events,
 	return spans;
 }
 
-
 static void
 e_week_view_layout_event	(EWeekViewEvent	*event,
 				 guint8		*grid,
@@ -211,7 +209,6 @@ e_week_view_layout_event	(EWeekViewEvent	*event,
 	event->num_spans = num_spans;
 }
 
-
 /* Finds the day containing the given time.
    If include_midnight_in_prev_day is TRUE then if the time exactly
    matches the start of a day the previous day is returned. This is useful
@@ -241,7 +238,6 @@ e_week_view_find_day		(time_t		 time_to_find,
 	g_return_val_if_reached (days_shown);
 }
 
-
 /* This returns the last possible day in the same span as the given day.
    A span is all the days which are displayed next to each other from left to
    right. In the week view all spans are only 1 day, since Tuesday is below
@@ -279,7 +275,6 @@ e_week_view_find_span_end	(gboolean	 multi_week_view,
 	}
 }
 
-
 void
 e_week_view_layout_get_day_position	(gint		 day,
 					 gboolean	 multi_week_view,
@@ -403,7 +398,6 @@ e_week_view_layout_get_day_position	(gint		 day,
 	}
 }
 
-
 /* Returns TRUE if the event span is visible or FALSE if it isn't.
    It also returns the number of days of the span that are visible.
    Usually this can easily be determined by the start & end days and row of
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 47804cb4fa..21db0a8e27 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -96,14 +96,12 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
 	e_week_view_main_item_a11y_init ();
 }
 
-
 static void
 e_week_view_main_item_init (EWeekViewMainItem *wvmitem)
 {
 	wvmitem->week_view = NULL;
 }
 
-
 static void
 e_week_view_main_item_set_property (GObject *object,
                                     guint property_id,
@@ -123,7 +121,6 @@ e_week_view_main_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_main_item_update (GnomeCanvasItem *item,
 			      double	      *affine,
@@ -140,7 +137,6 @@ e_week_view_main_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -453,4 +449,3 @@ e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 135a25e662..3be9bbe5f3 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -52,11 +52,8 @@ typedef struct {
 
 } EWeekViewMainItemClass;
 
-
 GType    e_week_view_main_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index e9ff467b63..69108f43cb 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -82,14 +82,12 @@ e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
 {
 	wvtitem->week_view = NULL;
 }
 
-
 static void
 e_week_view_titles_item_set_property (GObject *object,
                                       guint property_id,
@@ -109,7 +107,6 @@ e_week_view_titles_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_titles_item_update (GnomeCanvasItem *item,
 				double	    *affine,
@@ -126,7 +123,6 @@ e_week_view_titles_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -263,7 +259,6 @@ e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
 	g_object_unref (layout);
 }
 
-
 /* This is supposed to return the nearest item the the point and the distance.
    Since we are the only item we just return ourself and 0 for the distance.
    This is needed so that we get button/motion events. */
@@ -276,4 +271,3 @@ e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 6ee6cdaa96..3b27034202 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -52,11 +52,8 @@ typedef struct {
 
 } EWeekViewTitlesItemClass;
 
-
 GType    e_week_view_titles_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index bcede69a60..5ff63a3450 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -372,7 +372,6 @@ model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data)
 		return;
 	}
 
-
 	update_row (week_view, row);
 }
 
@@ -663,7 +662,6 @@ e_week_view_new (ECalModel *model)
 	return week_view;
 }
 
-
 static void
 e_week_view_destroy (GtkObject *object)
 {
@@ -712,7 +710,6 @@ e_week_view_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (e_week_view_parent_class)->destroy (object);
 }
 
-
 static void
 e_week_view_realize (GtkWidget *widget)
 {
@@ -988,7 +985,6 @@ e_week_view_style_set (GtkWidget *widget,
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 /* This recalculates the sizes of each column. */
 static void
 e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
@@ -1011,7 +1007,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
 						0, 0, new_x2, new_y2);
 
-
 	/* Set the scroll region of the main canvas to its allocated width,
 	   but with the height depending on the number of rows needed. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
@@ -1029,7 +1024,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	}
 }
 
-
 static void
 e_week_view_recalc_cell_sizes (EWeekView *week_view)
 {
@@ -1084,7 +1078,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 			- week_view->row_offsets[row];
 	}
 
-
 	/* If the font hasn't been set yet just return. */
 	widget = GTK_WIDGET (week_view);
 	style = gtk_widget_get_style (widget);
@@ -1098,7 +1091,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 	font_metrics = pango_context_get_metrics (pango_context, font_desc,
 						  pango_context_get_language (pango_context));
 
-
 	/* Calculate the number of rows of events in each cell, for the large
 	   cells and the compressed weekend cells. */
 	if (week_view->multi_week_view) {
@@ -1150,7 +1142,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 static gint
 e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1169,7 +1160,6 @@ e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 static gint
 e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1188,7 +1178,6 @@ e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 /* This draws a shadow around the top display and main display. */
 static gint
 e_week_view_expose_event (GtkWidget *widget,
@@ -1506,7 +1495,6 @@ e_week_view_set_selected_time_range_visible	(EWeekView	*week_view,
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
 
-
 /* Returns the selected time range. */
 static gboolean
 e_week_view_get_selected_time_range	(ECalendarView	*cal_view,
@@ -1553,7 +1541,6 @@ e_week_view_get_visible_time_range	(ECalendarView	*cal_view,
 	return TRUE;
 }
 
-
 /* Note that the returned date may be invalid if no date has been set yet. */
 void
 e_week_view_get_first_day_shown		(EWeekView	*week_view,
@@ -1562,7 +1549,6 @@ e_week_view_get_first_day_shown		(EWeekView	*week_view,
 	*date = week_view->first_day_shown;
 }
 
-
 /* This sets the first day shown in the view. It will be rounded down to the
    nearest week. */
 void
@@ -1652,7 +1638,6 @@ e_week_view_set_first_day_shown		(EWeekView	*week_view,
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
 
-
 /* Recalculates the time_t corresponding to the start of each day. */
 static void
 e_week_view_recalc_day_starts (EWeekView *week_view,
@@ -1694,7 +1679,6 @@ e_week_view_get_multi_week_view	(EWeekView	*week_view)
 	return week_view->multi_week_view;
 }
 
-
 void
 e_week_view_set_multi_week_view	(EWeekView	*week_view,
 				 gboolean	 multi_week_view)
@@ -1753,7 +1737,6 @@ e_week_view_get_update_base_date (EWeekView *week_view)
 	return week_view->update_base_date;
 }
 
-
 void
 e_week_view_set_update_base_date (EWeekView *week_view, gboolean update_base_date)
 {
@@ -1770,7 +1753,6 @@ e_week_view_get_weeks_shown	(EWeekView	*week_view)
 	return week_view->weeks_shown;
 }
 
-
 void
 e_week_view_set_weeks_shown	(EWeekView	*week_view,
 				 gint		 weeks_shown)
@@ -1810,7 +1792,6 @@ e_week_view_set_weeks_shown	(EWeekView	*week_view,
 	}
 }
 
-
 gboolean
 e_week_view_get_compress_weekend	(EWeekView	*week_view)
 {
@@ -1819,7 +1800,6 @@ e_week_view_get_compress_weekend	(EWeekView	*week_view)
 	return week_view->compress_weekend;
 }
 
-
 void
 e_week_view_set_compress_weekend	(EWeekView	*week_view,
 					 gboolean	 compress)
@@ -1866,7 +1846,6 @@ e_week_view_get_show_event_end_times	(EWeekView	*week_view)
 	return week_view->show_event_end_times;
 }
 
-
 void
 e_week_view_set_show_event_end_times	(EWeekView	*week_view,
 					 gboolean	 show)
@@ -1881,7 +1860,6 @@ e_week_view_set_show_event_end_times	(EWeekView	*week_view,
 	}
 }
 
-
 /* The first day of the week, 0 (Monday) to 6 (Sunday). */
 gint
 e_week_view_get_week_start_day	(EWeekView	*week_view)
@@ -1891,7 +1869,6 @@ e_week_view_get_week_start_day	(EWeekView	*week_view)
 	return week_view->week_start_day;
 }
 
-
 void
 e_week_view_set_week_start_day	(EWeekView	*week_view,
 				 gint		 week_start_day)
@@ -2000,7 +1977,6 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view,
 	}
 }
 
-
 static gboolean
 e_week_view_remove_event_cb (EWeekView *week_view,
 			     gint event_num,
@@ -2062,7 +2038,6 @@ e_week_view_remove_event_cb (EWeekView *week_view,
 	return TRUE;
 }
 
-
 void
 e_week_view_get_day_position	(EWeekView	*week_view,
 				 gint		 day,
@@ -2093,7 +2068,6 @@ e_week_view_get_day_position	(EWeekView	*week_view,
 	}
 }
 
-
 /* Returns the bounding box for a span of an event. Usually this can easily
    be determined by the start & end days and row of the span, which are set in
    e_week_view_layout_event(). Though we need a special case for the weekends
@@ -2155,8 +2129,6 @@ e_week_view_get_span_position	(EWeekView	*week_view,
 	return TRUE;
 }
 
-
-
 static gboolean
 e_week_view_on_button_press (GtkWidget *widget,
 			     GdkEventButton *event,
@@ -2233,7 +2205,6 @@ e_week_view_on_button_press (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_week_view_on_button_release (GtkWidget *widget,
 			       GdkEventButton *event,
@@ -2289,7 +2260,6 @@ e_week_view_on_scroll (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_week_view_on_motion (GtkWidget *widget,
 		       GdkEventMotion *mevent,
@@ -2316,7 +2286,6 @@ e_week_view_on_motion (GtkWidget *widget,
 	return FALSE;
 }
 
-
 /* Converts a position in the canvas window to a day offset from the first
    day displayed. Returns -1 if the position is outside the grid. */
 static gint
@@ -2376,7 +2345,6 @@ e_week_view_convert_position_to_day (EWeekView *week_view,
 	return week * 7 + day;
 }
 
-
 static void
 e_week_view_update_selection (EWeekView *week_view,
 			      gint day)
@@ -2417,7 +2385,6 @@ e_week_view_update_selection (EWeekView *week_view,
 	}
 }
 
-
 static void
 e_week_view_free_events (EWeekView *week_view)
 {
@@ -2467,7 +2434,6 @@ e_week_view_free_events (EWeekView *week_view)
 	}
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gboolean
 e_week_view_add_event (ECalComponent *comp,
@@ -2542,7 +2508,6 @@ e_week_view_add_event (ECalComponent *comp,
 	return TRUE;
 }
 
-
 /* This lays out the events, or reshapes them, as necessary. */
 static void
 e_week_view_check_layout (EWeekView *week_view)
@@ -2571,7 +2536,6 @@ e_week_view_check_layout (EWeekView *week_view)
 	week_view->events_need_reshape = FALSE;
 }
 
-
 static void
 e_week_view_ensure_events_sorted (EWeekView *week_view)
 {
@@ -2584,7 +2548,6 @@ e_week_view_ensure_events_sorted (EWeekView *week_view)
 	}
 }
 
-
 gint
 e_week_view_event_sort_func (gconstpointer arg1,
 			     gconstpointer arg2)
@@ -2607,7 +2570,6 @@ e_week_view_event_sort_func (gconstpointer arg1,
 	return 0;
 }
 
-
 static void
 e_week_view_reshape_events (EWeekView *week_view)
 {
@@ -2896,7 +2858,6 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 	   the icons in the middle, but making sure we don't go over the times.
 	*/
 
-
 	/* Calculate the space necessary to display a time, e.g. "13:00". */
 	time_width = e_week_view_get_time_string_width (week_view);
 
@@ -3108,7 +3069,6 @@ e_week_view_start_editing_event (EWeekView *week_view,
 	return TRUE;
 }
 
-
 /* This stops any current edit. */
 void
 e_week_view_stop_editing_event (EWeekView *week_view)
@@ -3125,7 +3085,6 @@ e_week_view_stop_editing_event (EWeekView *week_view)
 		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
 }
 
-
 /* Cancels the current edition by resetting the appointment's text to its original value */
 static void
 cancel_editing (EWeekView *week_view)
@@ -3300,7 +3259,6 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 						       &nspan))
 			return FALSE;
 
-
 		g_object_set_data ((GObject *)item, "event-num", GINT_TO_POINTER (nevent));
 
 		pevent = tooltip_get_view_event (week_view, -1, nevent);
@@ -3506,7 +3464,6 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
 
 	week_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
 
-
 	if (e_cal_component_has_recurrences (comp)) {
 		if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
 			gtk_widget_queue_draw (week_view->main_canvas);
@@ -3561,7 +3518,6 @@ e_week_view_on_editing_started (EWeekView *week_view,
 	g_signal_emit_by_name (week_view, "selection_changed");
 }
 
-
 static void
 e_week_view_on_editing_stopped (EWeekView *week_view,
 				GnomeCanvasItem *item)
@@ -3719,7 +3675,6 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 	g_signal_emit_by_name (week_view, "selection_changed");
 }
 
-
 gboolean
 e_week_view_find_event_from_item (EWeekView	  *week_view,
 				  GnomeCanvasItem *item,
@@ -3749,7 +3704,6 @@ e_week_view_find_event_from_item (EWeekView	  *week_view,
 	return FALSE;
 }
 
-
 /* Finds the index of the event with the given uid.
    Returns TRUE if an event with the uid was found.
    Note that for recurring events there may be several EWeekViewEvents, one
@@ -3802,7 +3756,6 @@ e_week_view_find_event_from_uid (EWeekView	  *week_view,
 	return FALSE;
 }
 
-
 gboolean
 e_week_view_is_one_day_event	(EWeekView	*week_view,
 				 gint		 event_num)
@@ -4394,7 +4347,6 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item,
 	return FALSE;
 }
 
-
 /* Converts an hour from 0-23 to the preferred time format, and returns the
    suffix to add and the width of it in the normal font. */
 void
@@ -4426,7 +4378,6 @@ e_week_view_convert_time_to_display	(EWeekView	*week_view,
 	}
 }
 
-
 gint
 e_week_view_get_time_string_width	(EWeekView	*week_view)
 {
@@ -4455,7 +4406,6 @@ e_week_view_queue_layout (EWeekView *week_view)
 	}
 }
 
-
 /* Removes any queued layout. */
 static void
 e_week_view_cancel_layout (EWeekView *week_view)
@@ -4466,7 +4416,6 @@ e_week_view_cancel_layout (EWeekView *week_view)
 	}
 }
 
-
 static gboolean
 e_week_view_layout_timeout_cb (gpointer data)
 {
@@ -4479,7 +4428,6 @@ e_week_view_layout_timeout_cb (gpointer data)
 	return FALSE;
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 e_week_view_get_num_events_selected (EWeekView *week_view)
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index eff5466895..b536e5d5a3 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -147,12 +147,10 @@ struct _EWeekViewEvent {
 	guint8 num_spans;
 };
 
-
 #define E_WEEK_VIEW(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_week_view_get_type (), EWeekView)
 #define E_WEEK_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
 #define E_IS_WEEK_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_week_view_get_type ())
 
-
 typedef struct _EWeekView       EWeekView;
 typedef struct _EWeekViewClass  EWeekViewClass;
 
@@ -349,7 +347,6 @@ struct _EWeekViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_week_view_get_type			(void);
 GtkWidget* e_week_view_new			(ECalModel *model);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index e2fbd0f476..43f131fbe3 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -223,7 +223,6 @@ typedef enum {
 
 static guint gnome_calendar_signals[LAST_SIGNAL];
 
-
 
 
 static void gnome_calendar_destroy (GtkObject *object);
@@ -335,7 +334,6 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 				g_cclosure_marshal_VOID__VOID,
 				G_TYPE_NONE, 0);
 
-
 	gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =
 		g_signal_new ("calendar_focus_change",
 				G_TYPE_FROM_CLASS (object_class),
@@ -1080,7 +1078,6 @@ view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
 	g_signal_emit (gcal, gnome_calendar_signals[CALENDAR_SELECTION_CHANGED], 0);
 }
 
-
 /**
  * gnome_calendar_emit_user_created_signal
  * Emits "user_created" signal on a gcal and use calendar as a store where was event created.
@@ -1121,7 +1118,6 @@ user_created_cb (GtkWidget *view, GnomeCalendar *gcal)
 	gnome_calendar_add_source (gcal, E_CAL_SOURCE_TYPE_EVENT, e_cal_get_source (ecal));
 }
 
-
 /* Callback used when the taskpad receives a focus event.  We emit the
  * corresponding signal so that parents can change the menus as appropriate.
  */
@@ -1590,7 +1586,6 @@ categories_changed_cb (gpointer object, gpointer user_data)
 	g_ptr_array_free (cat_array, TRUE);
 }
 
-
 static void
 view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal)
 {
@@ -2203,7 +2198,6 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
 	}
 }
 
-
 static void
 update_view_times (GnomeCalendar *gcal, time_t start_time)
 {
@@ -2370,7 +2364,6 @@ set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_s
 	focus_current_view (gcal);
 }
 
-
 /**
  * gnome_calendar_set_view:
  * @gcal: A calendar.
@@ -2503,7 +2496,6 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
 		return;
 	}
 
-
 	display_view (gcal, view_type, TRUE);
 
 	if (!priv->base_view_time)
@@ -3453,7 +3445,6 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_ty
 			return FALSE;
 	}
 
-
 	open_ecal (gcal, priv->default_client[source_type], FALSE, default_client_cal_opened_cb);
 
 	return TRUE;
@@ -3557,7 +3548,6 @@ gnome_calendar_new_task		(GnomeCalendar *gcal, time_t *dtstart, time_t *dtend)
 	gtk_window_present (GTK_WINDOW (editor));
 }
 
-
 /* Returns the selected time range for the current view. Note that this may be
    different from the fields in the GnomeCalendar, since the view may clip
    this or choose a more appropriate time. */
@@ -3570,7 +3560,6 @@ gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
 					    start_time, end_time);
 }
 
-
 /* Gets the visible time range for the current view. Returns FALSE if no
    time range has been set yet. */
 gboolean
@@ -3779,7 +3768,6 @@ gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gc
 	else
 		gtk_widget_set_size_request (E_DAY_VIEW (priv->day_view)->time_canvas, priv->hpane_pos - 20, -1);
 
-
 	return FALSE;
 }
 static void
@@ -3868,7 +3856,6 @@ gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
 		e_memo_table_paste_clipboard (E_MEMO_TABLE (priv->memo));
 }
 
-
 /* Get the current timezone. */
 icaltimezone*
 gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
@@ -3879,7 +3866,6 @@ gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
 	return gcal->priv->zone;
 }
 
-
 static void
 gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
 {
@@ -3908,7 +3894,6 @@ gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
 	update_memo_view (gcal);
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)
@@ -3951,7 +3936,6 @@ gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)
 	return e_table_selected_count (etable);
 }
 
-
 void
 gnome_calendar_delete_selection		(GnomeCalendar  *gcal)
 {
@@ -4141,7 +4125,6 @@ ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal)
 	return gcal->priv->memopad_menu;
 }
 
-
 void
 gnome_calendar_edit_appointment (GnomeCalendar *gcal,
 				 const gchar * src_uid,
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 978bad4c0b..2a5e2f847d 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -103,7 +103,6 @@ struct _GnomeCalendarClass {
         void (* goto_date)              (GnomeCalendar *gcal, GnomeCalendarGotoDateType date);
 };
 
-
 GType      gnome_calendar_get_type		(void);
 GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
 
@@ -180,7 +179,6 @@ gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);
 /* Get the current timezone. */
 icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);
 
-
 /* Clipboard operations */
 void       gnome_calendar_cut_clipboard         (GnomeCalendar  *gcal);
 void       gnome_calendar_copy_clipboard        (GnomeCalendar  *gcal);
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index ab107ad29c..10599f2a17 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -223,7 +223,6 @@ set_prop ( BonoboPropertyBag *bag,
 	}
 }
 
-
 BonoboControl *
 itip_bonobo_control_new (void)
 {
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index cc290b2c3d..860edd7ffd 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -301,7 +301,6 @@ typedef struct {
 	icalcomponent *zones;
 } ItipUtilTZData;
 
-
 static void
 foreach_tzid_callback (icalparameter *param, gpointer data)
 {
@@ -412,7 +411,6 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp)
 		}
 		return g_strdup (itip_strip_mailto (organizer.value));
 
-
 	default:
 		if (!e_cal_component_has_attendees (comp))
 			return NULL;
@@ -1399,22 +1397,18 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 
 		e_cal_component_free_text_list (text_list);
 
-
 		e_cal_component_get_summary (comp, &text);
 		if (text.value)
 			subject = g_strdup (text.value);
 
-
 		e_cal_component_get_organizer (comp, &organizer);
 		if (organizer.value)
 			orig_from = g_strdup (itip_strip_mailto (organizer.value));
 
-
 		e_cal_component_get_location (comp, &location);
 		if (!location)
 			location = "Unspecified";
 
-
 		e_cal_component_get_dtstart (comp, &dtstart);
 		if (dtstart.value) {
 			start_zone = icaltimezone_get_builtin_timezone_from_tzid (dtstart.tzid);
@@ -1430,7 +1424,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 			time = g_strdup (ctime (&start));
 		}
 
-
 		body = g_string_new ("<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>");
 
 		if (orig_from && *orig_from)
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index a3a3a3339e..99245384ec 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -67,7 +67,6 @@ ECompEditorRegistry *comp_editor_registry = NULL;
 /* The component editor factory */
 static CompEditorFactory *comp_editor_factory = NULL;
 
-
 /* Factory function for the calendar component factory; just creates and
  * references a singleton service object.
  */
@@ -84,7 +83,6 @@ comp_editor_factory_fn (void)
 	return BONOBO_OBJECT (comp_editor_factory);
 }
 
-
 /* Does a simple activation and unreffing of the alarm notification service so
  * that the daemon will be launched if it is not running yet.
  */
@@ -138,7 +136,6 @@ initialize (void)
 
 	launch_alarm_daemon ();
 
-
 	/* Initialize plugin system */
 	e_plugin_hook_register_type (e_cal_popup_hook_get_type());
 	e_plugin_hook_register_type (e_cal_menu_hook_get_type());
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 1efc7e64ea..f4e3200e8c 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -79,7 +79,6 @@ static BonoboObjectClass *parent_class = NULL;
 /* Memos should have their own registry */
 extern ECompEditorRegistry *comp_editor_registry;
 
-
 typedef struct _MemosComponentView
 {
 	ESourceList *source_list;
@@ -366,7 +365,6 @@ update_primary_selection (MemosComponentView *component_view)
 
 }
 
-
 /* Callbacks.  */
 /* TODO: doesn't work! */
 static void
diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h
index bba81a44f2..54f522ba9c 100644
--- a/calendar/gui/memos-component.h
+++ b/calendar/gui/memos-component.h
@@ -29,14 +29,12 @@
 #include <widgets/misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define MEMOS_TYPE_COMPONENT			(memos_component_get_type ())
 #define MEMOS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MEMOS_TYPE_COMPONENT, MemosComponent))
 #define MEMOS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MEMOS_TYPE_COMPONENT, MemosComponentClass))
 #define MEMOS_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MEMOS_TYPE_COMPONENT))
 #define MEMOS_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), MEMOS_TYPE_COMPONENT))
 
-
 typedef struct _MemosComponent        MemosComponent;
 typedef struct _MemosComponentPrivate MemosComponentPrivate;
 typedef struct _MemosComponentClass   MemosComponentClass;
@@ -53,7 +51,6 @@ struct _MemosComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType             memos_component_get_type  (void);
 MemosComponent   *memos_component_peek  (void);
 
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 46719a55fe..a7983779a7 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -47,7 +47,6 @@
 
 #define FIXED_MARGIN                            .05
 
-
 static void memos_control_activate_cb		(BonoboControl		*control,
 						 gboolean		 activate,
 						 gpointer		 user_data);
@@ -116,7 +115,6 @@ memos_control_new (void)
 	return control;
 }
 
-
 static void
 memos_control_activate_cb		(BonoboControl		*control,
 					 gboolean		 activate,
@@ -275,7 +273,6 @@ memos_control_activate (BonoboControl *control, EMemos *memos)
 	bonobo_ui_component_thaw (uic, NULL);
 }
 
-
 void
 memos_control_deactivate (BonoboControl *control, EMemos *memos)
 {
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 6ebf17fd6c..1597b96ebc 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -261,7 +261,6 @@ get_source_name (ESourceGroup *group, const gchar *path)
 
 		conflict = check_for_conflict (group, s->str);
 
-
 		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
 		if (conflict)
 			starting_index -= 2;
@@ -1148,7 +1147,6 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar
 	const gchar *poa_address;
 	const gchar *offline_sync;
 
-
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index eced381faa..48be727e40 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -164,7 +164,6 @@ static const gint sept_1752[42] = {
 #define SEPT_1752_START 2		/* Start day within month */
 #define SEPT_1752_END 20		/* End day within month */
 
-
 struct pdinfo
 {
 	gint days_shown;
@@ -227,7 +226,6 @@ convert_timet_to_struct_tm (time_t time, icaltimezone *zone)
 	return &my_tm;
 }
 
-
 /* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
  * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
  * returned in the start and end arguments.
@@ -362,7 +360,6 @@ print_border_with_triangles (GtkPrintContext *pc,
 	cairo_restore (cr);
 }
 
-
 /* Prints a rectangle, with or without a border, and filled or outline.
    width      = width of border, -ve means no border.
    fillcolor = shade of fill,   -ve means no fill. */
@@ -761,7 +758,6 @@ bound_text (GtkPrintContext *context,
 	return y1 + pango_units_to_double (layout_height);
 }
 
-
 /* Draw the borders, lines, and times down the left of the day view. */
 static void
 print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
@@ -865,7 +861,6 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	pango_font_description_free (font_minute);
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gint
 print_day_add_event (ECalModelComponent *comp_data,
@@ -940,7 +935,6 @@ print_day_add_event (ECalModelComponent *comp_data,
 	return E_DAY_VIEW_LONG_EVENT;
 }
 
-
 static gboolean
 print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend,
 		      gpointer data)
@@ -955,7 +949,6 @@ print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend,
 	return TRUE;
 }
 
-
 static void
 free_event_array (GArray *array)
 {
@@ -1164,7 +1157,6 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		 double left, double right, double top, double bottom,
@@ -1243,7 +1235,6 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		   double left, double right, double top, double bottom)
@@ -1341,7 +1332,6 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 	/* Now adjust to get rid of the time column. */
 	left += DAY_VIEW_TIME_COLUMN_WIDTH;
 
-
 	/* lay out the short events, within the day. */
 	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,
 				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row, -1);
@@ -1386,7 +1376,6 @@ print_is_one_day_week_event (EWeekViewEvent *event,
 	return FALSE;
 }
 
-
 static void
 print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		       struct psinfo *psi,
@@ -1453,7 +1442,6 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 	print_text_size (context, text, PANGO_ALIGN_CENTER, x1, x2, y1, y2);
 }
 
-
 static void
 print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		      struct psinfo *psi,
@@ -1492,7 +1480,6 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3);
 }
 
-
 static void
 print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 		  struct psinfo *psi,
@@ -1553,7 +1540,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 				 + span->row * psi->row_height;
 			y2 = y1 + psi->row_height * 0.5;
 
-
 			red = .9;
 			green = .9;
 			blue = .9;
@@ -1618,7 +1604,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_week_view_background (GtkPrintContext *context,
                             PangoFontDescription *font,
@@ -1802,7 +1787,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 		cell_height = (bottom - top) / 6;
 	}
 
-
 	/* Calculate the row height, using the normal font and with room for
 	   space or a rectangle around it. */
 	psi.row_height = font_size * 1.2;
@@ -1836,7 +1820,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	g_array_free (spans, TRUE);
 }
 
-
 /* XXX Evolution doesn't have a "year" view. */
 #if 0
 static void
@@ -1959,7 +1942,6 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc
 			    left, right, top, bottom);
 }
 
-
 static void
 print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		    time_t start, time_t end,
@@ -2042,7 +2024,6 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		y = bound_text (context, font_summary, summary.value, -1,
 				x + 14, y + 4, xend, yend, FALSE, NULL, NULL);
 
-
 		y += get_font_size (font_summary)-5;
 		cr = gtk_print_context_get_cairo_context (context);
 		cairo_move_to (cr, x, y);
@@ -2098,14 +2079,12 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 				   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4,
 				   DATE_MONTH | DATE_YEAR, date, date, FALSE);
 
-
 		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
 		print_month_small (context, gcal,
 				   time_add_month_with_zone (date, 1, zone),
 				   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4,
 				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
 
-
 		/* Print the date, e.g. '8th May, 2001'. */
 		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
 			     buf, 100);
@@ -2161,7 +2140,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 			    0.0, width,
 			    HEADER_HEIGHT + 20, height);
 
-
 	/* Print the border around the main view. */
 	print_border (context, 0.0, width, HEADER_HEIGHT ,
 		      height, 1.0, -1.0);
@@ -2199,7 +2177,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 			      24 + 3, 24 + 3 + 24);
 }
 
-
 static void
 print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
@@ -2612,7 +2589,6 @@ print_comp_draw_real (GtkPrintOperation *operation,
 			top += get_font_size (font) - 6;
 		}
 
-
 		/* URL */
 		e_cal_component_get_url (comp, &url);
 		if (url && url[0]) {
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 7d98e7c305..f7934742d2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -78,7 +78,6 @@ static BonoboObjectClass *parent_class = NULL;
 /* Tasks should have their own registry */
 extern ECompEditorRegistry *comp_editor_registry;
 
-
 typedef struct
 {
 	ESourceList *source_list;
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index 2a48209896..9824797640 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -28,14 +28,12 @@
 #include <misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define TASKS_TYPE_COMPONENT			(tasks_component_get_type ())
 #define TASKS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), TASKS_TYPE_COMPONENT, TasksComponent))
 #define TASKS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), TASKS_TYPE_COMPONENT, TasksComponentClass))
 #define TASKS_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TASKS_TYPE_COMPONENT))
 #define TASKS_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), TASKS_TYPE_COMPONENT))
 
-
 typedef struct _TasksComponent        TasksComponent;
 typedef struct _TasksComponentPrivate TasksComponentPrivate;
 typedef struct _TasksComponentClass   TasksComponentClass;
@@ -52,7 +50,6 @@ struct _TasksComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType             tasks_component_get_type  (void);
 TasksComponent   *tasks_component_peek  (void);
 
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e5109da7a0..a7134e9421 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -49,7 +49,6 @@
 
 #define FIXED_MARGIN                            .05
 
-
 static void tasks_control_activate_cb		(BonoboControl		*control,
 						 gboolean		 activate,
 						 gpointer		 user_data);
@@ -137,7 +136,6 @@ tasks_control_new (void)
 	return control;
 }
 
-
 static void
 tasks_control_activate_cb		(BonoboControl		*control,
 					 gboolean		 activate,
@@ -355,7 +353,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 	bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
 }
 
-
 void
 tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
 {
@@ -420,7 +417,6 @@ tasks_control_copy_cmd                  (BonoboUIComponent      *uic,
 
 	tasks = E_TASKS (data);
 
-
 	preview = e_cal_component_preview_get_html (E_CAL_COMPONENT_PREVIEW (e_tasks_get_preview (tasks)));
 	if (preview && GTK_WIDGET_VISIBLE (preview) && GTK_WIDGET_HAS_FOCUS (preview)) {
 		/* copy selected text in a preview when that's shown and focused */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 913144d4a7..12c09b43c5 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -201,7 +201,6 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 	return TRUE;
 }
 
-
 /* Creates the canvas items for the weekday picker.  The items are empty until
  * they are configured elsewhere.
  */