Coding style and whitespace cleanup.

23 files changed, 328 insertions, 183 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index ae523cb1ad..ad7db99432 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -27,8 +27,6 @@
 #include <gtk/gtk.h>
 #include <libecal/e-cal-component.h>
 
-
-
 typedef enum {
 	ALARM_NOTIFY_CLOSE,
 	ALARM_NOTIFY_SNOOZE,
@@ -37,24 +35,28 @@ typedef enum {
 } AlarmNotifyResult;
 
 typedef struct _AlarmNotificationsDialog AlarmNotificationsDialog;
-struct _AlarmNotificationsDialog
-{
+
+struct _AlarmNotificationsDialog {
 	GtkWidget *dialog;
 	GtkWidget *treeview;
 };
 
-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, gint snooze_mins, gpointer data);
+typedef void	(*AlarmNotifyFunc)		(AlarmNotifyResult result,
+						 gint snooze_mins,
+						 gpointer data);
 
 AlarmNotificationsDialog *
-notified_alarms_dialog_new (void);
-
-GtkTreeIter
-add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigger,
-				time_t occur_start, time_t occur_end,
-				ECalComponentVType vtype, const gchar *summary,
-				const gchar *description, const gchar *location,
-				AlarmNotifyFunc func, gpointer func_data);
-
-
-
-#endif
+		notified_alarms_dialog_new	(void);
+GtkTreeIter	add_alarm_to_notified_alarms_dialog
+						(AlarmNotificationsDialog *na,
+						 time_t trigger,
+						 time_t occur_start,
+						 time_t occur_end,
+						 ECalComponentVType vtype,
+						 const gchar *summary,
+						 const gchar *description,
+						 const gchar *location,
+						 AlarmNotifyFunc func,
+						 gpointer func_data);
+
+#endif /* ALARM_NOTIFY_DIALOG_H */
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index fd79d1f80c..816183dc4a 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -187,10 +187,11 @@ create_thread_pool (void)
 static void
 message_push (Message *msg)
 {
-	/* This used be pushed through the thread pool. This fix is made to work-around
-	the crashers in dbus due to threading. The threading is not completely removed as
-	its better to have alarm daemon running in a thread rather than blocking main thread.
-	 This is the reason the creation of thread pool is commented out */
+	/* This used be pushed through the thread pool. This fix is made to
+	 * work-around the crashers in dbus due to threading. The threading
+	 * is not completely removed as its better to have alarm daemon
+	 * running in a thread rather than blocking main thread.  This is
+	 * the reason the creation of thread pool is commented out. */
 	msg->func (msg);
 }
 
@@ -784,7 +785,8 @@ query_objects_changed_async (struct _query_msg *msg)
 		 * remove it after updating the cqa structure. */
 		if (alarms == NULL || alarms->alarms == NULL) {
 
-			/* update the cqa and its queued alarms for changes in summary and alarm_uid  */
+			/* Update the cqa and its queued alarms
+			 * for changes in summary and alarm_uid.  */
 			update_cqa (cqa, comp);
 
 			if (alarms)
@@ -805,16 +807,12 @@ query_objects_changed_async (struct _query_msg *msg)
 
 			instance = sl->data;
 
-			if (!has_known_notification (cqa->alarms->comp, instance->auid)) {
-				g_debug ("Could not recognize alarm's notification type, discarding.");
+			if (!has_known_notification (cqa->alarms->comp, instance->auid))
 				continue;
-			}
 
 			alarm_id = alarm_add (instance->trigger, alarm_trigger_cb, cqa, NULL);
-			if (!alarm_id) {
-				debug (("Unable to schedule trigger for %s", e_ctime (&(instance->trigger))));
+			if (!alarm_id)
 				continue;
-			}
 
 			qa = g_new (QueuedAlarm, 1);
 			qa->alarm_id = alarm_id;
@@ -1149,7 +1147,9 @@ tray_list_remove_async (Message *msg)
 			gboolean status;
 
 			tray_icons_list = g_list_remove_link (tray_icons_list, list);
-			status = remove_queued_alarm (tray_data->cqa, tray_data->alarm_id, FALSE, TRUE);
+			status = remove_queued_alarm (
+				tray_data->cqa,
+				tray_data->alarm_id, FALSE, TRUE);
 			if (status) {
 				g_hash_table_remove (
 					tray_data->cqa->parent_client->uid_alarms_hash,
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 2765c25183..a19f363460 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -104,7 +104,9 @@ alarm_ready_cb (gpointer data)
 		ar_copy = *ar;
 		ar = &ar_copy;
 
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
+		/* This will free the original AlarmRecord;
+		 * that's why we copy it. */
+		pop_alarm ();
 
 		(* ar->alarm_fn) (notify_id, ar->trigger, ar->data);
 
@@ -260,7 +262,10 @@ alarm_remove (gpointer alarm)
 	if (old_head == ar) {
 		ar_copy = *ar;
 		ar = &ar_copy;
-		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
+
+		/* This will free the original AlarmRecord;
+		 * that's why we copy it. */
+		pop_alarm ();
 	} else {
 		alarms = g_list_delete_link (alarms, l);
 	}
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 2a40950a00..3e09220102 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -32,21 +32,27 @@
 #include <gconf/gconf-client.h>
 #include <libedataserver/e-source-list.h>
 
-GConfClient  *config_data_get_conf_client (void);
+GConfClient *	config_data_get_conf_client	(void);
+icaltimezone *	config_data_get_timezone	(void);
+gboolean	config_data_get_24_hour_format	(void);
+gboolean	config_data_get_notify_with_tray
+						(void);
+void		config_data_set_last_notification_time
+						(ECal *cal,
+						 time_t t);
+time_t		config_data_get_last_notification_time
+						(ECal *cal);
+void		config_data_save_blessed_program
+						(const gchar *program);
+gboolean	config_data_is_blessed_program	(const gchar *program);
+ESourceList *	config_data_get_calendars	(const gchar *);
+void		config_data_replace_string_list	(const gchar *,
+						 const gchar *,
+						 const gchar *);
 
-icaltimezone *config_data_get_timezone (void);
-gboolean      config_data_get_24_hour_format (void);
-gboolean      config_data_get_notify_with_tray (void);
-void          config_data_set_last_notification_time (ECal *cal, time_t t);
-time_t        config_data_get_last_notification_time (ECal *cal);
-void          config_data_save_blessed_program (const gchar *program);
-gboolean      config_data_is_blessed_program (const gchar *program);
-ESourceList  *config_data_get_calendars (const gchar *);
-void	      config_data_replace_string_list (const gchar *, const gchar *, const gchar *);
-
-void config_data_init_debugging (void);
-gboolean config_data_start_debugging (void);
-void config_data_stop_debugging (void);
+void		config_data_init_debugging	(void);
+gboolean	config_data_start_debugging	(void);
+void		config_data_stop_debugging	(void);
 
 #define debug(x) G_STMT_START {					\
 	if (config_data_start_debugging ()) {			\
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 4476bc4c62..1990e076df 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -177,6 +177,7 @@ delete_clicked_cb (GtkButton *button, gpointer data)
 {
 	Dialog *dialog = data;
 	GtkTreeSelection *selection;
+	GtkTreeModel *model;
 	GtkTreeIter iter;
 	GtkTreePath *path;
 	gboolean valid_iter;
@@ -187,14 +188,15 @@ delete_clicked_cb (GtkButton *button, gpointer data)
 		return;
 	}
 
-	path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog->list_store), &iter);
+	model = GTK_TREE_MODEL (dialog->list_store);
+	path = gtk_tree_model_get_path (model, &iter);
 	e_alarm_list_remove (dialog->list_store, &iter);
 
 	/* Select closest item after removal */
-	valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->list_store), &iter, path);
+	valid_iter = gtk_tree_model_get_iter (model, &iter, path);
 	if (!valid_iter) {
 		gtk_tree_path_prev (path);
-		valid_iter = gtk_tree_model_get_iter (GTK_TREE_MODEL (dialog->list_store), &iter, path);
+		valid_iter = gtk_tree_model_get_iter (model, &iter, path);
 	}
 
 	if (valid_iter)
@@ -235,26 +237,33 @@ init_widgets (Dialog *dialog)
 	GtkCellRenderer *cell_renderer;
 
 	/* View */
-	gtk_tree_view_set_model (GTK_TREE_VIEW (dialog->list),
-				 GTK_TREE_MODEL (dialog->list_store));
+	gtk_tree_view_set_model (
+		GTK_TREE_VIEW (dialog->list),
+		GTK_TREE_MODEL (dialog->list_store));
 
 	column = gtk_tree_view_column_new ();
 	gtk_tree_view_column_set_title (column, _("Action/Trigger"));
 	cell_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
 	gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
-	gtk_tree_view_column_add_attribute (column, cell_renderer, "text", E_ALARM_LIST_COLUMN_DESCRIPTION);
+	gtk_tree_view_column_add_attribute (
+		column, cell_renderer,
+		"text", E_ALARM_LIST_COLUMN_DESCRIPTION);
 	gtk_tree_view_append_column (GTK_TREE_VIEW (dialog->list), column);
 
 	/* Reminder buttons */
-	g_signal_connect (dialog->add, "clicked",
-			  G_CALLBACK (add_clicked_cb), dialog);
-	g_signal_connect (dialog->delete, "clicked",
-			  G_CALLBACK (delete_clicked_cb), dialog);
-	g_signal_connect (dialog->edit, "clicked",
-			  G_CALLBACK (edit_clicked_cb), dialog);
-
-	g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list)), "changed",
-			  G_CALLBACK (selection_changed_cb), dialog);
+	g_signal_connect (
+		dialog->add, "clicked",
+		G_CALLBACK (add_clicked_cb), dialog);
+	g_signal_connect (
+		dialog->delete, "clicked",
+		G_CALLBACK (delete_clicked_cb), dialog);
+	g_signal_connect (
+		dialog->edit, "clicked",
+		G_CALLBACK (edit_clicked_cb), dialog);
+
+	g_signal_connect (
+		gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->list)),
+		"changed", G_CALLBACK (selection_changed_cb), dialog);
 }
 
 gboolean
@@ -327,8 +336,13 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 	g_object_unref (dialog->builder);
 
 	/* Free the other stuff when the parent really gets destroyed. */
-	g_object_set_data_full (G_OBJECT (dialog->box), "toplevel", dialog->toplevel, (GDestroyNotify) gtk_widget_destroy);
-	g_object_set_data_full (G_OBJECT (dialog->box), "dialog", dialog, g_free);
+	g_object_set_data_full (
+		G_OBJECT (dialog->box),
+		"toplevel", dialog->toplevel,
+		(GDestroyNotify) gtk_widget_destroy);
+	g_object_set_data_full (
+		G_OBJECT (dialog->box), "dialog",
+		dialog, (GDestroyNotify) g_free);
 
 	return dialog->box;
 }
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index fe85119dae..4482d4d7ab 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -47,9 +47,10 @@ is_past_event (ECalComponent *comp)
 	if (!comp) return TRUE;
 
 	e_cal_component_get_dtend (comp, &end_date);
-	res = icaltime_compare_date_only (*end_date.value,
-					  icaltime_current_time_with_zone (icaltime_get_timezone (*end_date.value))
-					 ) == -1;
+	res = icaltime_compare_date_only (
+		*end_date.value,
+		icaltime_current_time_with_zone (
+		icaltime_get_timezone (*end_date.value))) == -1;
 	e_cal_component_free_datetime (&end_date);
 
 	return res;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 983b42cdee..c8640b608a 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -3461,6 +3461,7 @@ obj_removed_cb (ECal *client,
 {
 	CompEditorPrivate *priv = editor->priv;
 
-	if (changed_component_dialog ((GtkWindow *) editor, priv->comp, TRUE, priv->changed))
+	if (changed_component_dialog (
+		GTK_WINDOW (editor), priv->comp, TRUE, priv->changed))
 		close_dialog (editor);
 }
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 55d44a7694..7f72dd3e38 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -404,11 +404,14 @@ task_details_page_fill_timezones (CompEditorPage *page,
 {
 	icaltimezone *zone;
 
-	/* add UTC timezone, which is the one used for the DATE-COMPLETED property */
+	/* Add UTC timezone, which is the one
+	 * used for the DATE-COMPLETED property. */
 	zone = icaltimezone_get_utc_timezone ();
-	if (zone) {
-		if (!g_hash_table_lookup (timezones, icaltimezone_get_tzid (zone)))
-			g_hash_table_insert (timezones, (gpointer) icaltimezone_get_tzid (zone), zone);
+	if (zone != NULL) {
+		gconstpointer tzid = icaltimezone_get_tzid (zone);
+
+		if (!g_hash_table_lookup (timezones, tzid))
+			g_hash_table_insert (timezones, (gpointer) tzid, zone);
 	}
 
 	return TRUE;
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index e1204f39b7..804af17e91 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -51,7 +51,8 @@ ecp_target_free (EConfig *ec, EConfigTarget *t)
 			ECalConfigTargetSource *s = (ECalConfigTargetSource *) t;
 
 			if (p->source_changed_id) {
-				g_signal_handler_disconnect (s->source, p->source_changed_id);
+				g_signal_handler_disconnect (
+					s->source, p->source_changed_id);
 				p->source_changed_id = 0;
 			}
 			break; }
@@ -94,7 +95,9 @@ ecp_set_target (EConfig *ec, EConfigTarget *t)
 		case EC_CONFIG_TARGET_SOURCE: {
 			ECalConfigTargetSource *s = (ECalConfigTargetSource *) t;
 
-			p->source_changed_id = g_signal_connect (s->source, "changed", G_CALLBACK (ecp_source_changed), ec);
+			p->source_changed_id = g_signal_connect (
+				s->source, "changed",
+				G_CALLBACK (ecp_source_changed), ec);
 			break; }
 		case EC_CONFIG_TARGET_PREFS: {
 			/* ECalConfigTargetPrefs *s = (ECalConfigTargetPrefs *)t; */
@@ -128,7 +131,8 @@ e_cal_config_get_type (void)
 		};
 
 		ecp_parent_class = g_type_class_ref (e_config_get_type ());
-		type = g_type_register_static (e_config_get_type (), "ECalConfig", &info, 0);
+		type = g_type_register_static (
+			e_config_get_type (), "ECalConfig", &info, 0);
 	}
 
 	return type;
@@ -143,12 +147,14 @@ e_cal_config_new (gint type, const gchar *menuid)
 }
 
 ECalConfigTargetSource *
-e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source)
+e_cal_config_target_new_source (ECalConfig *ecp, ESource *source)
 {
-	ECalConfigTargetSource *t = e_config_target_new (&ecp->config, EC_CONFIG_TARGET_SOURCE, sizeof (*t));
+	ECalConfigTargetSource *t;
 
-	t->source = source;
-	g_object_ref (source);
+	t = e_config_target_new (
+		&ecp->config, EC_CONFIG_TARGET_SOURCE, sizeof (*t));
+
+	t->source = g_object_ref (source);
 
 	return t;
 }
@@ -156,7 +162,10 @@ e_cal_config_target_new_source (ECalConfig *ecp, struct _ESource *source)
 ECalConfigTargetPrefs *
 e_cal_config_target_new_prefs (ECalConfig *ecp)
 {
-	ECalConfigTargetPrefs *t = e_config_target_new (&ecp->config, EC_CONFIG_TARGET_PREFS, sizeof (*t));
+	ECalConfigTargetPrefs *t;
+
+	t = e_config_target_new (
+		&ecp->config, EC_CONFIG_TARGET_PREFS, sizeof (*t));
 
 	t->gconf = gconf_client_get_default ();
 
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index 813b0b799f..af84e9e865 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -77,7 +77,8 @@ e_cal_event_get_type (void)
 			(GInstanceInitFunc) ece_init
 		};
 		ece_parent = g_type_class_ref (e_event_get_type ());
-		type = g_type_register_static (e_event_get_type (), "ECalEvent", &info, 0);
+		type = g_type_register_static (
+			e_event_get_type (), "ECalEvent", &info, 0);
 	}
 
 	return type;
@@ -89,15 +90,23 @@ e_cal_event_peek (void)
 	static ECalEvent *e_cal_event = NULL;
 	if (!e_cal_event) {
 		e_cal_event = g_object_new (e_cal_event_get_type (), NULL);
-		e_event_construct (&e_cal_event->event, "org.gnome.evolution.calendar.events");
+		e_event_construct (
+			&e_cal_event->event,
+			"org.gnome.evolution.calendar.events");
 	}
 	return e_cal_event;
 }
 
 ECalEventTargetBackend *
-e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, ESourceList *source_list, guint32 flags)
+e_cal_event_target_new_module (ECalEvent *ece,
+                               EShellBackend *shell_backend,
+                               ESourceList *source_list,
+                               guint32 flags)
 {
-	ECalEventTargetBackend *t = e_event_target_new (&ece->event, E_CAL_EVENT_TARGET_BACKEND, sizeof (*t));
+	ECalEventTargetBackend *t;
+
+	t = e_event_target_new (
+		&ece->event, E_CAL_EVENT_TARGET_BACKEND, sizeof (*t));
 
 	t->shell_backend = g_object_ref (shell_backend);
 	t->source_list = g_object_ref (source_list);
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index 8d72a93fa5..ada03b7bca 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -62,9 +62,13 @@ struct _ECalEventClass {
 	EEventClass event_class;
 };
 
-GType                     e_cal_event_get_type (void);
-ECalEvent*                e_cal_event_peek (void);
-ECalEventTargetBackend* e_cal_event_target_new_module (ECalEvent *ece, EShellBackend *shell_backend, ESourceList *source_list, guint32 flags);
+GType		e_cal_event_get_type		(void);
+ECalEvent *	e_cal_event_peek		(void);
+ECalEventTargetBackend *
+		e_cal_event_target_new_module	(ECalEvent *ece,
+						 EShellBackend *shell_backend,
+						 ESourceList *source_list,
+						 guint32 flags);
 
 G_END_DECLS
 
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index e0087da61f..88ebbeea66 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -87,13 +87,20 @@ typedef struct {
 	E_CALENDAR_VIEW_EVENT_FIELDS
 } ECalendarViewEvent;
 
-/* checks if event->comp_data is not NULL, returns FALSE when it is and prints a warning on a console */
-gboolean is_comp_data_valid_func (ECalendarViewEvent *event, const gchar *location);
-#define is_comp_data_valid(_event) is_comp_data_valid_func ((ECalendarViewEvent *) (_event), G_STRFUNC)
+/* checks if event->comp_data is not NULL, returns FALSE
+ * when it is and prints a warning on a console */
+gboolean	is_comp_data_valid_func		(ECalendarViewEvent *event,
+						 const gchar *location);
+#define is_comp_data_valid(_event) \
+	is_comp_data_valid_func ((ECalendarViewEvent *) (_event), G_STRFUNC)
 
-/* checks if index is within bounds for the array; returns FALSE when not, and prints a warning on a console */
-gboolean is_array_index_in_bounds_func (GArray *array, gint index, const gchar *location);
-#define is_array_index_in_bounds(_array, _index) is_array_index_in_bounds_func (_array, _index, G_STRFUNC)
+/* checks if index is within bounds for the array; returns
+ * FALSE when not, and prints a warning on a console */
+gboolean	is_array_index_in_bounds_func	(GArray *array,
+						 gint index,
+						 const gchar *location);
+#define is_array_index_in_bounds(_array, _index) \
+	is_array_index_in_bounds_func (_array, _index, G_STRFUNC)
 
 typedef struct _ECalendarView ECalendarView;
 typedef struct _ECalendarViewClass ECalendarViewClass;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 30efc13e74..7d87f6a02d 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -69,35 +69,50 @@ struct _EDayViewTimeItemPrivate {
 	icaltimezone *second_zone;
 };
 
-static void e_day_view_time_item_update (GnomeCanvasItem *item,
-					 const cairo_matrix_t *i2c,
-					 gint flags);
-static void e_day_view_time_item_draw (GnomeCanvasItem *item,
-				       cairo_t *cr,
-				       gint x, gint y,
-				       gint width, gint height);
-static GnomeCanvasItem *e_day_view_time_item_point (GnomeCanvasItem *item,
-                                                    double x, double y,
-                                                    gint cx, gint cy);
-static gint e_day_view_time_item_event (GnomeCanvasItem *item,
-					GdkEvent *event);
-static void e_day_view_time_item_increment_time	(gint	*hour,
-						 gint	*minute,
-						 gint	 time_divisions);
-static void e_day_view_time_item_show_popup_menu (EDayViewTimeItem *time_item,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_set_divisions (GtkWidget *item,
-						   EDayViewTimeItem *time_item);
-static void e_day_view_time_item_on_button_press (EDayViewTimeItem *time_item,
-						  GdkEvent *event);
-static void e_day_view_time_item_on_button_release (EDayViewTimeItem *time_item,
-						    GdkEvent *event);
-static void e_day_view_time_item_on_motion_notify (EDayViewTimeItem *time_item,
-						   GdkEvent *event);
-static gint e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *time_item,
-							  gint y);
-
-static void  edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data);
+static void	e_day_view_time_item_update	(GnomeCanvasItem *item,
+						 const cairo_matrix_t *i2c,
+						 gint flags);
+static void	e_day_view_time_item_draw	(GnomeCanvasItem *item,
+						 cairo_t *cr,
+						 gint x,
+						 gint y,
+						 gint width,
+						 gint height);
+static GnomeCanvasItem *
+		e_day_view_time_item_point	(GnomeCanvasItem *item,
+						 gdouble x,
+						 gdouble y,
+						 gint cx,
+						 gint cy);
+static gint	e_day_view_time_item_event	(GnomeCanvasItem *item,
+						 GdkEvent *event);
+static void	e_day_view_time_item_increment_time
+						(gint *hour,
+						 gint *minute,
+						 gint time_divisions);
+static void	e_day_view_time_item_show_popup_menu
+						(EDayViewTimeItem *time_item,
+						 GdkEvent *event);
+static void	e_day_view_time_item_on_set_divisions
+						(GtkWidget *item,
+						 EDayViewTimeItem *time_item);
+static void	e_day_view_time_item_on_button_press
+						(EDayViewTimeItem *time_item,
+						 GdkEvent *event);
+static void	e_day_view_time_item_on_button_release
+						(EDayViewTimeItem *time_item,
+						 GdkEvent *event);
+static void	e_day_view_time_item_on_motion_notify
+						(EDayViewTimeItem *time_item,
+						 GdkEvent *event);
+static gint	e_day_view_time_item_convert_position_to_row
+						(EDayViewTimeItem *time_item,
+						 gint y);
+
+static void	edvti_second_zone_changed_cb	(GConfClient *client,
+						 guint cnxn_id,
+						 GConfEntry *entry,
+						 gpointer user_data);
 
 enum {
 	PROP_0,
@@ -218,11 +233,14 @@ day_view_time_item_init (EDayViewTimeItem *time_item)
 
 	if (last) {
 		if (*last)
-			time_item->priv->second_zone = icaltimezone_get_builtin_timezone (last);
+			time_item->priv->second_zone =
+				icaltimezone_get_builtin_timezone (last);
 		g_free (last);
 	}
 
-	time_item->priv->second_zone_changed_id = calendar_config_add_notification_day_second_zone (edvti_second_zone_changed_cb, time_item);
+	time_item->priv->second_zone_changed_id =
+		calendar_config_add_notification_day_second_zone (
+		edvti_second_zone_changed_cb, time_item);
 }
 
 GType
@@ -323,7 +341,10 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 
 	/* The start and end of the long horizontal line between hours. */
 	long_line_x1 = (use_zone ? 0 : E_DVTMI_TIME_GRID_X_PAD) - x + x_offset;
-	long_line_x2 = time_item->priv->column_width - E_DVTMI_TIME_GRID_X_PAD - x - (use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0) + x_offset;
+	long_line_x2 =
+		time_item->priv->column_width -
+		E_DVTMI_TIME_GRID_X_PAD - x -
+		(use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0) + x_offset;
 
 	if (time_divisions == 60) {
 		/* The right edge of the complete time string in 60-min
@@ -358,13 +379,17 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 	minute = day_view->first_minute_shown;
 
 	if (use_zone) {
-		/* shift time with a difference between local time and the other timezone */
-		icaltimezone *cal_zone = e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view));
+		/* shift time with a difference between
+		 * local time and the other timezone */
+		icaltimezone *cal_zone;
 		struct icaltimetype tt;
 		gint diff;
 		struct tm mn;
 
-		tt = icaltime_from_timet_with_zone (day_view->day_starts[0], 0, cal_zone);
+		cal_zone = e_calendar_view_get_timezone (
+			E_CALENDAR_VIEW (day_view));
+		tt = icaltime_from_timet_with_zone (
+			day_view->day_starts[0], 0, cal_zone);
 
 		/* diff is number of minutes */
 		diff = (icaltimezone_get_utc_offset (use_zone, &tt, NULL) -
@@ -422,25 +447,38 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 		gint marcus_bains_y;
 
 		cairo_save (cr);
-		gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE]);
-
-		if (day_view->marcus_bains_time_bar_color && gdk_color_parse (day_view->marcus_bains_time_bar_color, &mb_color)) {
+		gdk_cairo_set_source_color (
+			cr, &day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE]);
 
+		if (day_view->marcus_bains_time_bar_color &&
+			gdk_color_parse (
+				day_view->marcus_bains_time_bar_color,
+				&mb_color)) {
 			gdk_cairo_set_source_color (cr, &mb_color);
 		} else
 			mb_color = day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE];
 
-		time_now = icaltime_current_time_with_zone (e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
-		marcus_bains_y = (time_now.hour * 60 + time_now.minute) * day_view->row_height / time_divisions - y;
+		time_now = icaltime_current_time_with_zone (
+			e_calendar_view_get_timezone (
+			E_CALENDAR_VIEW (day_view)));
+		marcus_bains_y =
+			(time_now.hour * 60 + time_now.minute) *
+			day_view->row_height / time_divisions - y;
 		cairo_set_line_width (cr, 1.5);
-		cairo_move_to (cr, long_line_x1 - (use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0), marcus_bains_y);
+		cairo_move_to (
+			cr, long_line_x1 -
+			(use_zone ? E_DVTMI_TIME_GRID_X_PAD : 0),
+			marcus_bains_y);
 		cairo_line_to (cr, long_line_x2, marcus_bains_y);
 		cairo_stroke (cr);
 		cairo_restore (cr);
 	} else {
 		mb_color = day_view->colors[E_DAY_VIEW_COLOR_MARCUS_BAINS_LINE];
 
-		if (day_view->marcus_bains_time_bar_color && gdk_color_parse (day_view->marcus_bains_time_bar_color, &mb_color)) {
+		if (day_view->marcus_bains_time_bar_color &&
+			gdk_color_parse (
+				day_view->marcus_bains_time_bar_color,
+				&mb_color)) {
 			gdk_cairo_set_source_color (cr, &mb_color);
 		}
 	}
@@ -450,13 +488,18 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 	for (row = 0, row_y = 0 - y;
 	     row < day_view->rows && row_y < height;
 	     row++, row_y += day_view->row_height) {
-		gboolean show_midnight_date = use_zone && hour == 0 && (minute == 0 || time_divisions == 60) && midnight_day && midnight_month;
+		gboolean show_midnight_date;
+
+		show_midnight_date =
+			use_zone && hour == 0 &&
+			(minute == 0 || time_divisions == 60) &&
+			midnight_day && midnight_month;
 
 		/* If the row is above the first row we want to draw just
 		   increment the time and skip to the next row. */
 		if (row_y < start_y) {
-			e_day_view_time_item_increment_time (&hour, &minute,
-							     time_divisions);
+			e_day_view_time_item_increment_time (
+				&hour, &minute, time_divisions);
 			continue;
 		}
 
@@ -536,7 +579,9 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 				pango_layout_set_text (layout, buffer, -1);
 				pango_layout_set_font_description (layout, day_view->large_font_desc);
 				pango_layout_get_pixel_size (layout, &hour_width, NULL);
-				cairo_translate (cr, large_hour_x2 - hour_width, row_y + large_hour_y_offset);
+				cairo_translate (
+					cr, large_hour_x2 - hour_width,
+					row_y + large_hour_y_offset);
 				pango_cairo_update_layout (cr, layout);
 				pango_cairo_show_layout (cr, layout);
 				cairo_restore (cr);
@@ -579,7 +624,9 @@ edvti_draw_zone (GnomeCanvasItem *canvas_item,
 				pango_layout_set_text (layout, buffer, -1);
 				pango_layout_set_font_description (layout, day_view->small_font_desc);
 				pango_layout_get_pixel_size (layout, &minute_width, NULL);
-				cairo_translate (cr, minute_x2 - minute_width, row_y + small_font_y_offset);
+				cairo_translate (
+					cr, minute_x2 - minute_width,
+					row_y + small_font_y_offset);
 				pango_cairo_update_layout (cr, layout);
 				pango_cairo_show_layout (cr, layout);
 				cairo_restore (cr);
@@ -615,7 +662,10 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	edvti_draw_zone (canvas_item, cr, x, y, width, height, 0, NULL);
 
 	if (time_item->priv->second_zone)
-		edvti_draw_zone (canvas_item, cr, x, y, width, height, time_item->priv->column_width, time_item->priv->second_zone);
+		edvti_draw_zone (
+			canvas_item, cr, x, y, width, height,
+			time_item->priv->column_width,
+			time_item->priv->second_zone);
 }
 
 /* Increment the time by the 5/10/15/30/60 minute interval.
@@ -677,7 +727,10 @@ e_day_view_time_item_event (GnomeCanvasItem *item,
 }
 
 static void
-edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer user_data)
+edvti_second_zone_changed_cb (GConfClient *client,
+                              guint cnxn_id,
+                              GConfEntry *entry,
+                              gpointer user_data)
 {
 	EDayViewTimeItem *time_item = user_data;
 	EDayView *day_view;
@@ -687,32 +740,38 @@ edvti_second_zone_changed_cb (GConfClient *client, guint cnxn_id, GConfEntry *en
 	g_return_if_fail (E_IS_DAY_VIEW_TIME_ITEM (time_item));
 
 	location = calendar_config_get_day_second_zone ();
-	time_item->priv->second_zone = location ? icaltimezone_get_builtin_timezone (location) : NULL;
+	time_item->priv->second_zone =
+		location ? icaltimezone_get_builtin_timezone (location) : NULL;
 	g_free (location);
 
 	day_view = e_day_view_time_item_get_day_view (time_item);
-	gtk_widget_set_size_request (day_view->time_canvas, e_day_view_time_item_get_column_width (time_item), -1);
+	gtk_widget_set_size_request (
+		day_view->time_canvas,
+		e_day_view_time_item_get_column_width (time_item), -1);
 	gtk_widget_queue_draw (day_view->time_canvas);
 }
 
 static void
-edvti_on_select_zone (GtkWidget *item, EDayViewTimeItem *time_item)
+edvti_on_select_zone (GtkWidget *item,
+                      EDayViewTimeItem *time_item)
 {
 	calendar_config_select_day_second_zone ();
 }
 
 static void
-edvti_on_set_zone (GtkWidget *item, EDayViewTimeItem *time_item)
+edvti_on_set_zone (GtkWidget *item,
+                   EDayViewTimeItem *time_item)
 {
 	if (!gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (item)))
 		return;
 
-	calendar_config_set_day_second_zone (g_object_get_data (G_OBJECT (item), "timezone"));
+	calendar_config_set_day_second_zone (
+		g_object_get_data (G_OBJECT (item), "timezone"));
 }
 
 static void
 e_day_view_time_item_show_popup_menu (EDayViewTimeItem *time_item,
-				      GdkEvent *event)
+                                      GdkEvent *event)
 {
 	static gint divisions[] = { 60, 30, 15, 10, 5 };
 	EDayView *day_view;
@@ -793,7 +852,8 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *time_item,
 		if (!zone)
 			continue;
 
-		item = gtk_radio_menu_item_new_with_label (group, icaltimezone_get_display_name (zone));
+		item = gtk_radio_menu_item_new_with_label (
+			group, icaltimezone_get_display_name (zone));
 		group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
 		/* both comes from builtin, thus no problem to compare pointers */
 		if (zone == time_item->priv->second_zone)
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index c3a3a07c4d..5193267411 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -621,7 +621,8 @@ day_view_top_item_draw (GnomeCanvasItem *canvas_item,
 	if (!show_dates) {
 		/* Clear the main area background. */
 		cairo_save (cr);
-		gdk_cairo_set_source_color (cr, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS]);
+		gdk_cairo_set_source_color (
+			cr, &day_view->colors[E_DAY_VIEW_COLOR_BG_TOP_CANVAS]);
 		cairo_rectangle (cr, left_edge - x, - y,
 				 canvas_width - left_edge,
 				 canvas_height);
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 9054f92f77..1ac83c8e0e 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1474,8 +1474,9 @@ freebusy_async (gpointer data)
 	EMeetingStorePrivate *priv = fbd->store->priv;
 
 	if (fbd->client) {
-		/* FIXME this a work around for getting all th free busy information for the users
-		 we should be able to get free busy asynchronously */
+		/* FIXME This a workaround for getting all the free busy
+		 *       information for the users.  We should be able to
+		 *       get free busy asynchronously. */
 		g_static_mutex_lock (&mutex);
 		priv->num_queries++;
 		e_cal_get_free_busy (
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 0bffb6cef9..5084aa0c62 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -160,9 +160,11 @@ week_view_main_item_draw_day (EWeekViewMainItem *main_item,
 		selected = FALSE;
 	if (selected) {
 		if (gtk_widget_has_focus (GTK_WIDGET (week_view))) {
-			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
+			gdk_cairo_set_source_color (
+				cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
 		} else {
-			gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
+			gdk_cairo_set_source_color (
+				cr, &week_view->colors[E_WEEK_VIEW_COLOR_SELECTED]);
 		}
 
 		if (week_view->multi_week_view) {
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 44b63a9c0b..577a2230fc 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -66,8 +66,10 @@ gnome_calendar_a11y_init (void)
 		pixbuf_type = g_type_class_ref (GNOME_TYPE_CANVAS_PIXBUF);
 		e_day_view_type = g_type_class_ref (e_day_view_get_type ());
 		e_week_view_type = g_type_class_ref (E_TYPE_WEEK_VIEW);
-		e_day_view_main_item_type = g_type_class_ref (e_day_view_main_item_get_type ());
-		e_week_view_main_item_type = g_type_class_ref (e_week_view_main_item_get_type ());
+		e_day_view_main_item_type = g_type_class_ref (
+			e_day_view_main_item_get_type ());
+		e_week_view_main_item_type = g_type_class_ref (
+			e_week_view_main_item_get_type ());
 
 		g_signal_add_emission_hook (g_signal_lookup ("event", E_TYPE_TEXT),
 					    0, ea_calendar_focus_watcher,
diff --git a/calendar/gui/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index 61fff7b4f9..3b7d6e714d 100644
--- a/calendar/gui/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
@@ -129,9 +129,8 @@ ea_jump_button_new (GObject *obj)
 		atk_obj->role = event_role;
 	}
 
-	/* the registered factory for GNOME_TYPE_CANVAS_ITEM is cannot create a EaJumpbutton,
-	 * we should save the EaJumpbutton object in it.
-	 */
+	/* The registered factory for GNOME_TYPE_CANVAS_ITEM cannot create
+	 * an EaJumpbutton, we should save the EaJumpbutton object in it. */
 	g_object_set_data (obj, "accessible-object", atk_obj);
 
 	return atk_obj;
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 433d1aa30d..2be13ee010 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -1142,7 +1142,8 @@ table_interface_get_row_description (AtkTable    *table,
 	description = ea_cell_table_get_row_label (cell_data, row);
 	if (!description) {
 		gchar buffer[128];
-		ea_week_view_main_item_get_row_label (ea_main_item, row, buffer, sizeof (buffer));
+		ea_week_view_main_item_get_row_label (
+			ea_main_item, row, buffer, sizeof (buffer));
 		ea_cell_table_set_row_label (cell_data, row, buffer);
 		description = ea_cell_table_get_row_label (cell_data,
 								row);
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 3a4adad829..ce7734ddcc 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -767,9 +767,9 @@ dn_e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer data)
 
 		ensure_dates_are_in_default_zone (gcal, l->data);
 		comp = e_cal_component_new ();
-		if (!e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (l->data))) {
+		if (!e_cal_component_set_icalcomponent (
+			comp, icalcomponent_new_clone (l->data))) {
 			g_object_unref (comp);
-
 			continue;
 		}
 
@@ -841,6 +841,8 @@ get_times_for_views (GnomeCalendar *gcal,
 {
 	GnomeCalendarPrivate *priv;
 	ECalModel *model;
+	EDayView *day_view;
+	EWeekView *week_view;
 	gint shown, display_start;
 	GDate date;
 	gint week_start_day;
@@ -861,12 +863,14 @@ get_times_for_views (GnomeCalendar *gcal,
 
 	switch (view_type) {
 	case GNOME_CAL_DAY_VIEW:
-		shown  = e_day_view_get_days_shown (E_DAY_VIEW (priv->views[view_type]));
+		day_view = E_DAY_VIEW (priv->views[view_type]);
+		shown  = e_day_view_get_days_shown (day_view);
 		*start_time = time_day_begin_with_zone (*start_time, timezone);
 		*end_time = time_add_day_with_zone (*start_time, shown, timezone);
 		break;
 	case GNOME_CAL_WORK_WEEK_VIEW:
 		/* FIXME Kind of gross, but it works */
+		day_view = E_DAY_VIEW (priv->views[view_type]);
 		time_to_gdate_with_zone (&date, *start_time, timezone);
 
 		/* The start of the work-week is the first working day after the
@@ -878,7 +882,7 @@ get_times_for_views (GnomeCalendar *gcal,
 		/* Find the first working day in the week, 0 (Sun) to 6 (Sat). */
 		first_day = (week_start_day + 1) % 7;
 		for (i = 0; i < 7; i++) {
-			if (E_DAY_VIEW (priv->views[view_type])->working_days & (1 << first_day)) {
+			if (day_view->working_days & (1 << first_day)) {
 				has_working_days = TRUE;
 				break;
 			}
@@ -889,7 +893,7 @@ get_times_for_views (GnomeCalendar *gcal,
 			/* Now find the last working day of the week, backwards. */
 			last_day = week_start_day % 7;
 			for (i = 0; i < 7; i++) {
-				if (E_DAY_VIEW (priv->views[view_type])->working_days & (1 << last_day))
+				if (day_view->working_days & (1 << last_day))
 					break;
 				last_day = (last_day + 6) % 7;
 			}
@@ -917,32 +921,41 @@ get_times_for_views (GnomeCalendar *gcal,
 		*start_time = icaltime_as_timet_with_zone (tt, timezone);
 		*end_time = time_add_day_with_zone (*start_time, days_shown, timezone);
 
-		if (select_time && E_DAY_VIEW (priv->views[view_type])->selection_start_day == -1)
+		if (select_time && day_view->selection_start_day == -1)
 			time (select_time);
 		break;
 	case GNOME_CAL_WEEK_VIEW:
-		/* FIXME We should be using the same day of the week enum every where */
-		display_start = (E_WEEK_VIEW (priv->views[view_type])->display_start_day + 1) % 7;
+		/* FIXME We should be using the same day
+		 *       of the week enum everywhere. */
+		week_view = E_WEEK_VIEW (priv->views[view_type]);
+		display_start = (week_view->display_start_day + 1) % 7;
 
-		*start_time = time_week_begin_with_zone (*start_time, display_start, timezone);
-		*end_time = time_add_week_with_zone (*start_time, 1, timezone);
+		*start_time = time_week_begin_with_zone (
+			*start_time, display_start, timezone);
+		*end_time = time_add_week_with_zone (
+			*start_time, 1, timezone);
 
-		if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1)
+		if (select_time && week_view->selection_start_day == -1)
 			time (select_time);
 		break;
 	case GNOME_CAL_MONTH_VIEW:
-		shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (priv->views[view_type]));
-		/* FIXME We should be using the same day of the week enum every where */
-		display_start = (E_WEEK_VIEW (priv->views[view_type])->display_start_day + 1) % 7;
+		/* FIXME We should be using the same day
+		 *       of the week enum everywhere. */
+		week_view = E_WEEK_VIEW (priv->views[view_type]);
+		shown = e_week_view_get_weeks_shown (week_view);
+		display_start = (week_view->display_start_day + 1) % 7;
 
 		if (!range_selected && (
-			!E_WEEK_VIEW (priv->views[view_type])->multi_week_view ||
-			!E_WEEK_VIEW (priv->views[view_type])->month_scroll_by_week))
-			*start_time = time_month_begin_with_zone (*start_time, timezone);
-		*start_time = time_week_begin_with_zone (*start_time, display_start, timezone);
-		*end_time = time_add_week_with_zone (*start_time, shown, timezone);
-
-		if (select_time && E_WEEK_VIEW (priv->views[view_type])->selection_start_day == -1)
+			!week_view->multi_week_view ||
+			!week_view->month_scroll_by_week))
+			*start_time = time_month_begin_with_zone (
+				*start_time, timezone);
+		*start_time = time_week_begin_with_zone (
+			*start_time, display_start, timezone);
+		*end_time = time_add_week_with_zone (
+			*start_time, shown, timezone);
+
+		if (select_time && week_view->selection_start_day == -1)
 			time (select_time);
 		break;
 	case GNOME_CAL_LIST_VIEW:
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index cfc177c07d..2bc566b771 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -615,7 +615,8 @@ comp_to_list (ECalComponentItipMethod method,
 			for (l = attendees; l != NULL; l = l->next) {
 				ECalComponentAttendee *att = l->data;
 
-				if (att->cutype != ICAL_CUTYPE_INDIVIDUAL && att->cutype != ICAL_CUTYPE_GROUP)
+				if (att->cutype != ICAL_CUTYPE_INDIVIDUAL &&
+				    att->cutype != ICAL_CUTYPE_GROUP)
 					continue;
 				else if (only_attendees &&
 					!comp_editor_have_in_new_attendees_lst (
@@ -1426,7 +1427,9 @@ setup_from (ECalComponentItipMethod method,
 
 			e_cal_component_get_organizer (comp, &organizer);
 			if (organizer.value != NULL) {
-				account = find_enabled_account (accounts, itip_strip_mailto (organizer.value));
+				account = find_enabled_account (
+					accounts,
+					itip_strip_mailto (organizer.value));
 			}
 		}
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index a63285465a..ed0d235af4 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -1789,7 +1789,8 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 				pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
 			}
 
-			x1 = left + (start_x + 1) * cell_width - 6 - gdk_pixbuf_get_width (pixbuf) * 0.5;
+			x1 = left + (start_x + 1) * cell_width - 6 -
+				gdk_pixbuf_get_width (pixbuf) * 0.5;
 
 			cairo_save (cr);
 			cairo_scale (cr, 0.5, 0.5);
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 7183d79071..a9cd687169 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -228,7 +228,8 @@ weekday_picker_get_preferred_width (GtkWidget *widget,
 	wp = WEEKDAY_PICKER (widget);
 	priv = wp->priv;
 
-	*minimum_width = *natural_width = (priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
+	*minimum_width = *natural_width =
+		(priv->max_letter_width + 2 * PADDING + 1) * 7 + 1;
 }
 
 static void