Coding style and whitespace cleanup.

28 files changed, 605 insertions, 384 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ab50520d5c..59cdb4515b 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -246,7 +246,8 @@ alarm_to_dialog (Dialog *dialog)
 }
 
 static void
-alarm_to_repeat_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
+alarm_to_repeat_widgets (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	ECalComponentAlarmRepeat repeat;
 
@@ -284,7 +285,8 @@ alarm_to_repeat_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 }
 
 static void
-repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
+repeat_widgets_to_alarm (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	ECalComponentAlarmRepeat repeat;
 
@@ -325,7 +327,8 @@ repeat_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the audio alarm data with the values from the widgets */
 static void
-aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
+aalarm_widgets_to_alarm (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	gchar *url;
 	icalattach *attach;
@@ -344,7 +347,8 @@ aalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the widgets with audio alarm data */
 static void
-alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
+alarm_to_aalarm_widgets (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	const gchar *url;
 	icalattach *attach;
@@ -364,7 +368,8 @@ alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the widgets with display alarm data */
 static void
-alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
+alarm_to_dalarm_widgets (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	ECalComponentText description;
 	GtkTextBuffer *text_buffer;
@@ -381,7 +386,8 @@ alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
 
 /* Fills the display alarm data with the values from the widgets */
 static void
-dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
+dalarm_widgets_to_alarm (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	gchar *str;
 	ECalComponentText description;
@@ -423,7 +429,8 @@ dalarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the mail alarm data with the values from the widgets */
 static void
-malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
+malarm_widgets_to_alarm (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	gchar *str;
 	ECalComponentText description;
@@ -497,7 +504,8 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the widgets from mail alarm data */
 static void
-alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
+alarm_to_malarm_widgets (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	ENameSelectorModel *name_selector_model;
 	EDestinationStore *destination_store;
@@ -543,7 +551,8 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
 
 /* Fills the widgets from procedure alarm data */
 static void
-alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
+alarm_to_palarm_widgets (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	ECalComponentText description;
 	const gchar *url;
@@ -564,7 +573,8 @@ alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 
 /* Fills the procedure alarm data with the values from the widgets */
 static void
-palarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
+palarm_widgets_to_alarm (Dialog *dialog,
+                         ECalComponentAlarm *alarm)
 {
 	gchar *program;
 	icalattach *attach;
@@ -820,7 +830,7 @@ get_widgets (Dialog *dialog)
 			N_("Send an email")
 		};
 
-		GtkComboBox *combo = (GtkComboBox*) dialog->action_combo;
+		GtkComboBox *combo = (GtkComboBox *) dialog->action_combo;
 		GtkCellRenderer *cell;
 		GtkListStore *store;
 		gint i;
@@ -881,13 +891,16 @@ get_widgets (Dialog *dialog)
 }
 
 static void
-addressbook_clicked_cb (GtkWidget *widget, Dialog *dialog)
+addressbook_clicked_cb (GtkWidget *widget,
+                        Dialog *dialog)
 {
 	e_name_selector_show_dialog (dialog->name_selector, dialog->toplevel);
 }
 
 static void
-addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
+addressbook_response_cb (GtkWidget *widget,
+                         gint response,
+                         gpointer data)
 {
 	Dialog *dialog = data;
 	ENameSelectorDialog *name_selector_dialog;
@@ -913,8 +926,9 @@ setup_select_names (Dialog *dialog)
 	gtk_widget_show (dialog->malarm_addresses);
 	gtk_box_pack_end (GTK_BOX (dialog->malarm_address_group), dialog->malarm_addresses, TRUE, TRUE, 0);
 
-	g_signal_connect (G_OBJECT (dialog->malarm_addressbook), "clicked",
-			  G_CALLBACK (addressbook_clicked_cb), dialog);
+	g_signal_connect (
+		dialog->malarm_addressbook, "clicked",
+		G_CALLBACK (addressbook_clicked_cb), dialog);
 
 	name_selector_dialog = e_name_selector_peek_dialog (dialog->name_selector);
 	g_signal_connect (name_selector_dialog, "response",
@@ -927,7 +941,8 @@ setup_select_names (Dialog *dialog)
  * repeat group options as appropriate.
  */
 static void
-repeat_toggle_toggled_cb (GtkToggleButton *toggle, gpointer data)
+repeat_toggle_toggled_cb (GtkToggleButton *toggle,
+                          gpointer data)
 {
 	Dialog *dialog = data;
 	gboolean active;
@@ -960,7 +975,8 @@ check_custom_sound (Dialog *dialog)
 }
 
 static void
-aalarm_sound_toggled_cb (GtkToggleButton *toggle, gpointer data)
+aalarm_sound_toggled_cb (GtkToggleButton *toggle,
+                         gpointer data)
 {
 	Dialog *dialog = data;
 	gboolean active;
@@ -972,7 +988,8 @@ aalarm_sound_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-aalarm_attach_changed_cb (GtkWidget *widget, gpointer data)
+aalarm_attach_changed_cb (GtkWidget *widget,
+                          gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -999,7 +1016,8 @@ check_custom_message (Dialog *dialog)
 }
 
 static void
-dalarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
+dalarm_message_toggled_cb (GtkToggleButton *toggle,
+                           gpointer data)
 {
 	Dialog *dialog = data;
 	gboolean active;
@@ -1011,7 +1029,8 @@ dalarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-dalarm_description_changed_cb (GtkWidget *widget, gpointer data)
+dalarm_description_changed_cb (GtkWidget *widget,
+                               gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -1031,7 +1050,8 @@ check_custom_program (Dialog *dialog)
 }
 
 static void
-palarm_program_changed_cb (GtkWidget *widget, gpointer data)
+palarm_program_changed_cb (GtkWidget *widget,
+                           gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -1074,7 +1094,8 @@ malarm_addresses_changed_cb (GtkWidget *editable,
 }
 
 static void
-malarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
+malarm_message_toggled_cb (GtkToggleButton *toggle,
+                           gpointer data)
 {
 	Dialog *dialog = data;
 	gboolean active;
@@ -1086,7 +1107,8 @@ malarm_message_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-malarm_description_changed_cb (GtkWidget *widget, gpointer data)
+malarm_description_changed_cb (GtkWidget *widget,
+                               gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -1094,7 +1116,8 @@ malarm_description_changed_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-action_changed_cb (GtkWidget *action_combo, gpointer data)
+action_changed_cb (GtkWidget *action_combo,
+                   gpointer data)
 {
 	Dialog *dialog = data;
 	gchar *dir;
@@ -1146,43 +1169,53 @@ init_widgets (Dialog *dialog)
 {
 	GtkTextBuffer *text_buffer;
 
-	g_signal_connect (dialog->action_combo, "changed",
-			  G_CALLBACK (action_changed_cb),
-			  dialog);
+	g_signal_connect (
+		dialog->action_combo, "changed",
+		G_CALLBACK (action_changed_cb), dialog);
 
-	g_signal_connect (G_OBJECT (dialog->repeat_toggle), "toggled",
-			  G_CALLBACK (repeat_toggle_toggled_cb), dialog);
+	g_signal_connect (
+		dialog->repeat_toggle, "toggled",
+		G_CALLBACK (repeat_toggle_toggled_cb), dialog);
 
 	/* Handle custom sounds */
-	g_signal_connect (G_OBJECT (dialog->aalarm_sound), "toggled",
-			  G_CALLBACK (aalarm_sound_toggled_cb), dialog);
-	g_signal_connect (G_OBJECT (dialog->aalarm_file_chooser), "selection-changed",
-			  G_CALLBACK (aalarm_attach_changed_cb), dialog);
+	g_signal_connect (
+		dialog->aalarm_sound, "toggled",
+		G_CALLBACK (aalarm_sound_toggled_cb), dialog);
+	g_signal_connect (
+		dialog->aalarm_file_chooser, "selection-changed",
+		G_CALLBACK (aalarm_attach_changed_cb), dialog);
 
 	/* Handle custom messages */
-	g_signal_connect (G_OBJECT (dialog->dalarm_message), "toggled",
-			  G_CALLBACK (dalarm_message_toggled_cb), dialog);
+	g_signal_connect (
+		dialog->dalarm_message, "toggled",
+		G_CALLBACK (dalarm_message_toggled_cb), dialog);
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
-	g_signal_connect (G_OBJECT (text_buffer), "changed",
-			  G_CALLBACK (dalarm_description_changed_cb), dialog);
+	g_signal_connect (
+		text_buffer, "changed",
+		G_CALLBACK (dalarm_description_changed_cb), dialog);
 
 	/* Handle program */
-	g_signal_connect (G_OBJECT (dialog->palarm_program), "changed",
-			  G_CALLBACK (palarm_program_changed_cb), dialog);
+	g_signal_connect (
+		dialog->palarm_program, "changed",
+		G_CALLBACK (palarm_program_changed_cb), dialog);
 
 	/* Handle custom email */
-	g_signal_connect (G_OBJECT (dialog->malarm_message), "toggled",
-			  G_CALLBACK (malarm_message_toggled_cb), dialog);
+	g_signal_connect (
+		dialog->malarm_message, "toggled",
+		G_CALLBACK (malarm_message_toggled_cb), dialog);
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->malarm_description));
-	g_signal_connect (G_OBJECT (text_buffer), "changed",
-			  G_CALLBACK (malarm_description_changed_cb), dialog);
+	g_signal_connect (
+		text_buffer, "changed",
+		G_CALLBACK (malarm_description_changed_cb), dialog);
 
 	g_signal_connect (dialog->malarm_addresses, "changed",
 			  G_CALLBACK (malarm_addresses_changed_cb), dialog);
 }
 
 gboolean
-alarm_dialog_run (GtkWidget *parent, ECalClient *cal_client, ECalComponentAlarm *alarm)
+alarm_dialog_run (GtkWidget *parent,
+                  ECalClient *cal_client,
+                  ECalComponentAlarm *alarm)
 {
 	Dialog dialog;
 	GtkWidget *container;
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index c83dde429d..48503c1023 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -110,7 +110,8 @@ sensitize_buttons (Dialog *dialog)
 
 /* Callback used for the "add reminder" button */
 static void
-add_clicked_cb (GtkButton *button, gpointer data)
+add_clicked_cb (GtkButton *button,
+                gpointer data)
 {
 	Dialog *dialog = data;
 	ECalComponentAlarm *alarm;
@@ -140,7 +141,8 @@ add_clicked_cb (GtkButton *button, gpointer data)
 
 /* Callback used for the "edit reminder" button */
 static void
-edit_clicked_cb (GtkButton *button, gpointer data)
+edit_clicked_cb (GtkButton *button,
+                 gpointer data)
 {
 	Dialog *dialog = data;
 	GtkTreeSelection *selection;
@@ -168,7 +170,8 @@ edit_clicked_cb (GtkButton *button, gpointer data)
 
 /* Callback used for the "delete reminder" button */
 static void
-delete_clicked_cb (GtkButton *button, gpointer data)
+delete_clicked_cb (GtkButton *button,
+                   gpointer data)
 {
 	Dialog *dialog = data;
 	GtkTreeSelection *selection;
@@ -203,7 +206,8 @@ delete_clicked_cb (GtkButton *button, gpointer data)
 }
 
 static void
-selection_changed_cb (GtkTreeSelection *selection, gpointer data)
+selection_changed_cb (GtkTreeSelection *selection,
+                      gpointer data)
 {
 	Dialog *dialog = data;
 
@@ -211,7 +215,8 @@ selection_changed_cb (GtkTreeSelection *selection, gpointer data)
 }
 
 void
-alarm_list_dialog_set_client (GtkWidget *dlg_box, ECalClient *cal_client)
+alarm_list_dialog_set_client (GtkWidget *dlg_box,
+                              ECalClient *cal_client)
 {
 	Dialog *dialog;
 
@@ -310,7 +315,8 @@ alarm_list_dialog_run (GtkWidget *parent,
 }
 
 GtkWidget *
-alarm_list_dialog_peek (ECalClient *cal_client, EAlarmList *list_store)
+alarm_list_dialog_peek (ECalClient *cal_client,
+                        EAlarmList *list_store)
 {
 	Dialog *dialog;
 
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 3894061eb0..0ffdb4cf1f 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -59,7 +59,9 @@ struct _CalendarSourceDialog {
 };
 
 static gboolean
-eccp_check_complete (EConfig *ec, const gchar *pageid, gpointer data)
+eccp_check_complete (EConfig *ec,
+                     const gchar *pageid,
+                     gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	gboolean valid = TRUE;
@@ -101,7 +103,9 @@ eccp_commit (EConfig *ec,
 }
 
 static void
-eccp_free (EConfig *ec, GSList *items, gpointer data)
+eccp_free (EConfig *ec,
+           GSList *items,
+           gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 
@@ -117,7 +121,8 @@ eccp_free (EConfig *ec, GSList *items, gpointer data)
 }
 
 static void
-eccp_type_changed (GtkComboBox *dropdown, CalendarSourceDialog *sdialog)
+eccp_type_changed (GtkComboBox *dropdown,
+                   CalendarSourceDialog *sdialog)
 {
 	gint id = gtk_combo_box_get_active (dropdown);
 	GtkTreeModel *model;
@@ -169,7 +174,7 @@ eccp_get_source_type (EConfig *ec,
 		gtk_label_set_markup (GTK_LABEL (type), markup);
 		gtk_misc_set_alignment (GTK_MISC (type), 0.0, 0.5);
 		g_free (markup);
-		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	} else {
 		GtkCellRenderer *cell;
 		GtkListStore *store;
@@ -203,19 +208,20 @@ eccp_get_source_type (EConfig *ec,
 		gtk_combo_box_set_active ((GtkComboBox *) type, active);
 		g_signal_connect (type, "changed", G_CALLBACK (eccp_type_changed), sdialog);
 		gtk_widget_show (type);
-		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+		gtk_table_attach (GTK_TABLE (parent), type, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 		gtk_label_set_mnemonic_widget (GTK_LABEL (label), type);
 	}
 
 	gtk_widget_show (label);
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
 
 	return type;
 }
 
 static void
-name_changed (GtkEntry *entry, ECalConfigTargetSource *t)
+name_changed (GtkEntry *entry,
+              ECalConfigTargetSource *t)
 {
 	ESource *source = t->source;
 	e_source_set_name (source, gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -242,13 +248,15 @@ eccp_get_source_name (EConfig *ec,
 	label = gtk_label_new_with_mnemonic (_("_Name:"));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
 
 	entry = gtk_entry_new ();
 	gtk_widget_show (entry);
-	gtk_table_attach (GTK_TABLE (parent), entry, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (parent), entry, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
-	g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (name_changed), (gpointer) t);
+	g_signal_connect (
+		entry, "changed",
+		G_CALLBACK (name_changed), (gpointer) t);
 
 	if (source)
 		gtk_entry_set_text (GTK_ENTRY (entry), e_source_peek_name (source));
@@ -257,7 +265,8 @@ eccp_get_source_name (EConfig *ec,
 }
 
 static void
-offline_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
+offline_status_changed_cb (GtkWidget *widget,
+                           CalendarSourceDialog *sdialog)
 {
 
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
@@ -296,7 +305,7 @@ eccp_general_offline (EConfig *ec,
 
 		gtk_widget_show (offline_setting);
 		g_signal_connect (offline_setting, "toggled", G_CALLBACK (offline_status_changed_cb), sdialog);
-		gtk_table_attach (GTK_TABLE (parent), offline_setting, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+		gtk_table_attach (GTK_TABLE (parent), offline_setting, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	}
 
@@ -307,7 +316,8 @@ eccp_general_offline (EConfig *ec,
 }
 
 static void
-alarm_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
+alarm_status_changed_cb (GtkWidget *widget,
+                         CalendarSourceDialog *sdialog)
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		e_source_set_property (sdialog->source, "alarm", "true");
@@ -317,11 +327,11 @@ alarm_status_changed_cb (GtkWidget *widget, CalendarSourceDialog *sdialog)
 
 static GtkWidget *
 eccp_notify_reminders (EConfig *ec,
-			EConfigItem *item,
-			GtkWidget *parent,
-			GtkWidget *old,
-			gint position,
-			gpointer data)
+                       EConfigItem *item,
+                       GtkWidget *parent,
+                       GtkWidget *old,
+                       gint position,
+                       gpointer data)
 {
 	CalendarSourceDialog *sdialog = data;
 	GtkWidget *reminder_setting = NULL;
@@ -342,20 +352,22 @@ eccp_notify_reminders (EConfig *ec,
 	gtk_widget_show (reminder_setting);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (reminder_setting), alarm && g_str_equal (alarm, "true"));
 	g_signal_connect (reminder_setting, "toggled", G_CALLBACK (alarm_status_changed_cb), sdialog);
-	gtk_table_attach (GTK_TABLE (parent), reminder_setting, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+	gtk_table_attach (GTK_TABLE (parent), reminder_setting, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
 	return reminder_setting;
 }
 
 static void
-color_changed (GtkColorButton *color_button, ECalConfigTargetSource *target)
+color_changed (GtkColorButton *color_button,
+               ECalConfigTargetSource *target)
 {
 	ESource *source = target->source;
 	gchar color_spec[16];
 	GdkColor color;
 
 	gtk_color_button_get_color (color_button, &color);
-	g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x",
+	g_snprintf (
+		color_spec, sizeof (color_spec), "#%04x%04x%04x",
 		color.red, color.green, color.blue);
 	e_source_set_color_spec (source, color_spec);
 }
@@ -475,7 +487,9 @@ static ECalConfigItem ecmp_items[] = {
  */
 
 static void
-cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGroup *group)
+cs_load_sources (CalendarSourceDialog *sdialog,
+                 const gchar *conf_key,
+                 ESourceGroup *group)
 {
 	GConfClient *gconf;
 
@@ -501,7 +515,9 @@ cs_load_sources (CalendarSourceDialog *sdialog, const gchar *conf_key, ESourceGr
  * Show calendar properties for @source.
  **/
 void
-calendar_setup_edit_calendar (GtkWindow *parent, ESource *source, ESourceGroup *group)
+calendar_setup_edit_calendar (GtkWindow *parent,
+                              ESource *source,
+                              ESourceGroup *group)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
 	gchar *xml;
@@ -561,7 +577,8 @@ calendar_setup_new_calendar (GtkWindow *parent)
 }
 
 void
-calendar_setup_edit_task_list (GtkWindow *parent, ESource *source)
+calendar_setup_edit_task_list (GtkWindow *parent,
+                               ESource *source)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
 	gchar *xml;
@@ -620,7 +637,8 @@ calendar_setup_new_task_list (GtkWindow *parent)
 }
 
 void
-calendar_setup_edit_memo_list (GtkWindow *parent, ESource *source)
+calendar_setup_edit_memo_list (GtkWindow *parent,
+                               ESource *source)
 {
 	CalendarSourceDialog *sdialog = g_new0 (CalendarSourceDialog, 1);
 	gchar *xml;
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 5fb0240037..78928795f6 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -44,7 +44,10 @@
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean deleted, gboolean changed)
+changed_component_dialog (GtkWindow *parent,
+                          ECalComponent *comp,
+                          gboolean deleted,
+                          gboolean changed)
 {
 	GtkWidget *dialog;
 	ECalComponentVType vtype;
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index 89adf7c491..3d8af28153 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -329,7 +329,8 @@ comp_editor_page_fill_widgets (CompEditorPage *page,
  * Returns: TRUE if the component could be filled, FALSE otherwise
  **/
 gboolean
-comp_editor_page_fill_component (CompEditorPage *page, ECalComponent *comp)
+comp_editor_page_fill_component (CompEditorPage *page,
+                                 ECalComponent *comp)
 {
 	CompEditorPageClass *class;
 
@@ -355,7 +356,8 @@ comp_editor_page_fill_component (CompEditorPage *page, ECalComponent *comp)
  * Returns: TRUE if the timezones were added, FALSE otherwise.
  */
 gboolean
-comp_editor_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
+comp_editor_page_fill_timezones (CompEditorPage *page,
+                                 GHashTable *timezones)
 {
 	CompEditorPageClass *class;
 
@@ -378,7 +380,8 @@ comp_editor_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
  * Sets the date values for this group of widgets
  **/
 void
-comp_editor_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
+comp_editor_page_set_dates (CompEditorPage *page,
+                            CompEditorPageDates *dates)
 {
 	CompEditorPageClass *class;
 
@@ -421,7 +424,7 @@ comp_editor_page_add_attendee (CompEditorPage *page,
  **/
 void
 comp_editor_page_notify_dates_changed (CompEditorPage *page,
-				       CompEditorPageDates *dates)
+                                       CompEditorPageDates *dates)
 {
 	g_return_if_fail (IS_COMP_EDITOR_PAGE (page));
 
@@ -442,8 +445,8 @@ comp_editor_page_notify_dates_changed (CompEditorPage *page,
  */
 void
 comp_editor_page_display_validation_error (CompEditorPage *page,
-					   const gchar *msg,
-					   GtkWidget *field)
+                                           const gchar *msg,
+                                           GtkWidget *field)
 {
 	GtkWidget *dialog;
 
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index a33d83810d..f8ab87de63 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -71,9 +71,9 @@ struct _CompEditorPage {
 	GObject object;
 
 	/* The GtkAccelGroup for the page. We install this when the page is
-	   mapped, and uninstall when it is unmapped. libglade would do this
-	   normally, but we create our pages individually so have to do it
-	   ourselves. */
+	 * mapped, and uninstall when it is unmapped. libglade would do this
+	 * normally, but we create our pages individually so have to do it
+	 * ourselves. */
 	GtkAccelGroup *accel_group;
 
 	CompEditorPagePrivate *priv;
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index a98314b389..cbc34cb108 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -49,7 +49,8 @@
  * results.
  **/
 void
-comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp)
+comp_editor_dates (CompEditorPageDates *dates,
+                   ECalComponent *comp)
 {
 	ECalComponentDateTime dt;
 
@@ -59,8 +60,8 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp)
 	dates->complete = NULL;
 
 	/* Note that the ECalComponentDateTime's returned contain allocated
-	   icaltimetype and tzid values, so we just take over ownership of
-	   those. */
+	 * icaltimetype and tzid values, so we just take over ownership of
+	 * those. */
 	e_cal_component_get_dtstart (comp, &dt);
 	if (dt.value) {
 		dates->start = g_new (ECalComponentDateTime, 1);
@@ -89,7 +90,7 @@ void
 comp_editor_free_dates (CompEditorPageDates *dates)
 {
 	/* Note that e_cal_component_free_datetime() only frees the fields in
-	   the struct. It doesn't free the struct itself, so we do that. */
+	 * the struct. It doesn't free the struct itself, so we do that. */
 	if (dates->start) {
 		e_cal_component_free_datetime (dates->start);
 		g_free (dates->start);
@@ -142,9 +143,9 @@ comp_editor_new_date_edit (gboolean show_date,
 }
 
 /* Returns the current time, for EDateEdit widgets and ECalendar items in the
-   dialogs.
-   FIXME: Should probably use the timezone from somewhere in the component
-   rather than the current timezone. */
+ * dialogs.
+ * FIXME: Should probably use the timezone from somewhere in the component
+ * rather than the current timezone. */
 struct tm
 comp_editor_get_current_time (EDateEdit *date_edit,
                               CompEditor *editor)
@@ -242,7 +243,9 @@ comp_editor_strip_categories (const gchar *categories)
 }
 
 static GSList *
-manage_new_attendees (const GSList *lst, const gchar *eml, gboolean add)
+manage_new_attendees (const GSList *lst,
+                      const gchar *eml,
+                      gboolean add)
 {
 	GSList *copy = NULL;
 	const GSList *l;
@@ -328,7 +331,8 @@ comp_editor_manage_new_attendees (ECalComponent *comp,
  * Copies "new-attendees" information from @src to @des component.
  **/
 void
-comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src)
+comp_editor_copy_new_attendees (ECalComponent *des,
+                                ECalComponent *src)
 {
 	GSList *copy = NULL, *l;
 
@@ -350,7 +354,8 @@ comp_editor_copy_new_attendees (ECalComponent *des, ECalComponent *src)
  * Returns: Whether @ma is present in the list of new attendees of the comp.
  **/
 gboolean
-comp_editor_have_in_new_attendees (ECalComponent *comp, EMeetingAttendee *ma)
+comp_editor_have_in_new_attendees (ECalComponent *comp,
+                                   EMeetingAttendee *ma)
 {
 	const gchar *eml;
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index c94b2f5016..1d5a45af31 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -107,7 +107,7 @@ struct _CompEditorPrivate {
 	guint32 attachment_bar_visible : 1;
 
 	/* TODO use this flags for setting all the boolean variables
-	   below */
+	 * below */
 	CompEditorFlags flags;
 
 	icaltimezone *zone;
@@ -238,7 +238,7 @@ static void
 attachment_store_changed_cb (CompEditor *editor)
 {
 	/* Mark the editor as changed so it prompts about unsaved
-	   changes on close */
+	 * changes on close */
 	comp_editor_set_changed (editor, TRUE);
 }
 
@@ -348,8 +348,8 @@ get_attachment_list (CompEditor *editor)
 }
 
 /* This sets the focus to the toplevel, so any field being edited is committed.
-   FIXME: In future we may also want to check some of the fields are valid,
-   e.g. the EDateEdit fields. */
+ * FIXME: In future we may also want to check some of the fields are valid,
+ * e.g. the EDateEdit fields. */
 static void
 commit_all_fields (CompEditor *editor)
 {
@@ -443,7 +443,9 @@ listen_for_changes (CompEditor *editor)
 }
 
 static void
-send_timezone (gpointer key, gpointer value, gpointer user_data)
+send_timezone (gpointer key,
+               gpointer value,
+               gpointer user_data)
 {
 	icaltimezone *zone = value;
 	CompEditor *editor = user_data;
@@ -885,8 +887,8 @@ action_print_preview_cb (GtkAction *action,
 
 static gboolean
 remove_event_dialog (ECalClient *client,
-		     ECalComponent *comp,
-		     GtkWindow *parent)
+                     ECalComponent *comp,
+                     GtkWindow *parent)
 {
 	GtkWidget *dialog;
 	gboolean ret;
@@ -1508,7 +1510,8 @@ comp_editor_get_property (GObject *object,
 }
 
 static void
-unref_page_cb (gpointer editor_page, gpointer comp_editor)
+unref_page_cb (gpointer editor_page,
+               gpointer comp_editor)
 {
 	if (IS_COMP_EDITOR_PAGE (editor_page)) {
 		GtkWidget *page_widget;
@@ -1568,25 +1571,26 @@ comp_editor_dispose (GObject *object)
 	}
 
 	if (priv->view) {
-		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      object);
-
+		g_signal_handlers_disconnect_matched (
+			G_OBJECT (priv->view), G_SIGNAL_MATCH_DATA,
+			0, 0, NULL, NULL, object);
 		g_object_unref (priv->view);
 		priv->view = NULL;
 	}
 
 	if (priv->attachment_view) {
-		g_signal_handlers_disconnect_matched (G_OBJECT (e_attachment_view_get_store (E_ATTACHMENT_VIEW (priv->attachment_view))),
-						      G_SIGNAL_MATCH_DATA,
-						      0, 0, NULL, NULL,
-						      object);
+		EAttachmentStore *store;
+
+		store = e_attachment_view_get_store (
+			E_ATTACHMENT_VIEW (priv->attachment_view));
+		g_signal_handlers_disconnect_matched (
+			G_OBJECT (store), G_SIGNAL_MATCH_DATA,
+			0, 0, NULL, NULL, object);
 	}
 
 	/* We want to destroy the pages after the widgets get destroyed,
-	   since they have lots of signal handlers connected to the widgets
-	   with the pages as the data. */
+	 * since they have lots of signal handlers connected to the widgets
+	 * with the pages as the data. */
 	g_list_foreach (priv->pages, (GFunc) unref_page_cb, object);
 	g_list_free (priv->pages);
 	priv->pages = NULL;
@@ -2050,7 +2054,7 @@ comp_editor_init (CompEditor *editor)
 	/* Fine Tuning */
 
 	action = comp_editor_get_action (editor, "attach");
-	g_object_set (G_OBJECT (action), "short-label", _("Attach"), NULL);
+	g_object_set (action, "short-label", _("Attach"), NULL);
 
 	/* Desensitize the "save" action. */
 	action = comp_editor_get_action (editor, "save");
@@ -2175,7 +2179,8 @@ comp_editor_init (CompEditor *editor)
 }
 
 static gboolean
-prompt_and_save_changes (CompEditor *editor, gboolean send)
+prompt_and_save_changes (CompEditor *editor,
+                         gboolean send)
 {
 	CompEditorPrivate *priv;
 	gboolean correct = FALSE;
@@ -2254,8 +2259,8 @@ close_dialog (CompEditor *editor)
 	g_signal_emit_by_name (editor, "comp_closed", priv->saved);
 
 	/* FIXME Unfortunately we do this here because otherwise corba
-	   calls happen during destruction and we might get a change
-	   notification back when we are in an inconsistent state */
+	 * calls happen during destruction and we might get a change
+	 * notification back when we are in an inconsistent state */
 	if (priv->view)
 		g_signal_handlers_disconnect_matched (G_OBJECT (priv->view),
 						      G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, editor);
@@ -2275,7 +2280,8 @@ comp_editor_compare (CompEditor *editor_a,
 }
 
 void
-comp_editor_set_existing_org (CompEditor *editor, gboolean existing_org)
+comp_editor_set_existing_org (CompEditor *editor,
+                              gboolean existing_org)
 {
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 
@@ -2745,9 +2751,9 @@ page_unmapped_cb (GtkWidget *page_widget,
  **/
 void
 comp_editor_append_widget (CompEditor *editor,
-			 GtkWidget *page,
-			 const gchar *label,
-			 gboolean add)
+                         GtkWidget *page,
+                         const gchar *label,
+                         gboolean add)
 {
 	CompEditorPrivate *priv;
 	GtkWidget *label_widget = NULL;
@@ -2771,7 +2777,7 @@ comp_editor_append_widget (CompEditor *editor,
 	}
 
 	/* Listen for when the page is mapped/unmapped so we can
-	   install/uninstall the appropriate GtkAccelGroup.
+	 * install/uninstall the appropriate GtkAccelGroup.
 	g_signal_connect (
 		page, "map",
 		G_CALLBACK (page_mapped_cb), page);
@@ -2794,9 +2800,9 @@ comp_editor_append_widget (CompEditor *editor,
  **/
 void
 comp_editor_append_page (CompEditor *editor,
-			 CompEditorPage *page,
-			 const gchar *label,
-			 gboolean add)
+                         CompEditorPage *page,
+                         const gchar *label,
+                         gboolean add)
 {
 	CompEditorPrivate *priv;
 	GtkWidget *page_widget;
@@ -2843,7 +2849,7 @@ comp_editor_append_page (CompEditor *editor,
 		G_CALLBACK (page_dates_changed_cb), editor);
 
 	/* Listen for when the page is mapped/unmapped so we can
-	   install/uninstall the appropriate GtkAccelGroup. */
+	 * install/uninstall the appropriate GtkAccelGroup. */
 	g_signal_connect (
 		page_widget, "map",
 		G_CALLBACK (page_mapped_cb), page);
@@ -2866,7 +2872,8 @@ comp_editor_append_page (CompEditor *editor,
  * Removes the page from the component editor
  **/
 void
-comp_editor_remove_page (CompEditor *editor, CompEditorPage *page)
+comp_editor_remove_page (CompEditor *editor,
+                         CompEditorPage *page)
 {
 	CompEditorPrivate *priv;
 	GtkWidget *page_widget;
@@ -2902,7 +2909,8 @@ comp_editor_remove_page (CompEditor *editor, CompEditorPage *page)
  *
  **/
 void
-comp_editor_show_page (CompEditor *editor, CompEditorPage *page)
+comp_editor_show_page (CompEditor *editor,
+                       CompEditorPage *page)
 {
 	CompEditorPrivate *priv;
 	GtkWidget *page_widget;
@@ -3009,7 +3017,8 @@ attachment_loaded_cb (EAttachment *attachment,
 }
 
 static void
-set_attachment_list (CompEditor *editor, GSList *uri_list)
+set_attachment_list (CompEditor *editor,
+                     GSList *uri_list)
 {
 	EAttachmentStore *store;
 	EAttachmentView *view;
@@ -3090,7 +3099,8 @@ fill_widgets (CompEditor *editor)
 }
 
 static void
-real_edit_comp (CompEditor *editor, ECalComponent *comp)
+real_edit_comp (CompEditor *editor,
+                ECalComponent *comp)
 {
 	CompEditorPrivate *priv;
 
@@ -3152,7 +3162,8 @@ set_attendees_for_delegation (ECalComponent *comp,
 }
 
 static void
-get_users_from_memo_comp (ECalComponent *comp, GSList **users)
+get_users_from_memo_comp (ECalComponent *comp,
+                          GSList **users)
 {
 	icalcomponent *icalcomp;
 	icalproperty *icalprop;
@@ -3298,7 +3309,8 @@ real_send_comp (CompEditor *editor,
  * Starts the editor editing the given component
  **/
 void
-comp_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
+comp_editor_edit_comp (CompEditor *editor,
+                       ECalComponent *comp)
 {
 	CompEditorClass *class;
 
@@ -3328,7 +3340,8 @@ comp_editor_get_comp (CompEditor *editor)
  * Returns: Newly allocated component, should be unref-ed by g_object_unref().
  **/
 ECalComponent *
-comp_editor_get_current_comp (CompEditor *editor, gboolean *correct)
+comp_editor_get_current_comp (CompEditor *editor,
+                              gboolean *correct)
 {
 	CompEditorPrivate *priv;
 	ECalComponent *comp;
@@ -3361,7 +3374,8 @@ comp_editor_get_current_comp (CompEditor *editor, gboolean *correct)
  *
  **/
 gboolean
-comp_editor_save_comp (CompEditor *editor, gboolean send)
+comp_editor_save_comp (CompEditor *editor,
+                       gboolean send)
 {
 	return prompt_and_save_changes (editor, send);
 }
@@ -3516,7 +3530,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 
 static void
 page_dates_changed_cb (CompEditor *editor,
-		       CompEditorPageDates *dates,
+                       CompEditorPageDates *dates,
                        CompEditorPage *page)
 {
 	CompEditorPrivate *priv = editor->priv;
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index aca5c8ef11..c2a3082a31 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -91,11 +91,11 @@ struct _CompEditorClass {
 };
 
 typedef enum {
-	COMP_EDITOR_NEW_ITEM = 1<<0,
-	COMP_EDITOR_MEETING = 1<<1,
-	COMP_EDITOR_DELEGATE = 1<<2,
-	COMP_EDITOR_USER_ORG = 1<<3,
-	COMP_EDITOR_IS_ASSIGNED = 1<<4,
+	COMP_EDITOR_NEW_ITEM = 1 << 0,
+	COMP_EDITOR_MEETING = 1 << 1,
+	COMP_EDITOR_DELEGATE = 1 << 2,
+	COMP_EDITOR_USER_ORG = 1 << 3,
+	COMP_EDITOR_IS_ASSIGNED = 1 << 4,
 	COMP_EDITOR_IS_SHARED = 1 << 5,
 	COMP_EDITOR_SEND_TO_NEW_ATTENDEES_ONLY = 1 << 6
 } CompEditorFlags;
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 31e7cef1b5..e247f13264 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -41,7 +41,9 @@ typedef struct {
 } CopySourceDialogData;
 
 static void
-show_error (CopySourceDialogData *csdd, const gchar *msg, const GError *error)
+show_error (CopySourceDialogData *csdd,
+            const gchar *msg,
+            const GError *error)
 {
 	GtkWidget *dialog;
 
@@ -59,7 +61,8 @@ struct ForeachTzidData
 };
 
 static void
-add_timezone_to_cal_cb (icalparameter *param, gpointer data)
+add_timezone_to_cal_cb (icalparameter *param,
+                        gpointer data)
 {
 	struct ForeachTzidData *ftd = data;
 	icaltimezone *tz = NULL;
@@ -231,7 +234,9 @@ copy_source (const CopySourceDialogData *const_csdd)
  * source to copy to.
  */
 void
-copy_source_dialog (GtkWindow *parent, ESource *source, ECalClientSourceType obj_type)
+copy_source_dialog (GtkWindow *parent,
+                    ESource *source,
+                    ECalClientSourceType obj_type)
 {
 	CopySourceDialogData csdd;
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index f5ac9c9ce4..a28fa00221 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -162,7 +162,8 @@ delete_component_dialog (ECalComponent *comp,
 }
 
 static void
-cb_toggled_cb (GtkToggleButton *toggle, gpointer data)
+cb_toggled_cb (GtkToggleButton *toggle,
+               gpointer data)
 {
 	gboolean active = FALSE;
 	GtkWidget *entry = (GtkWidget *) data;
@@ -172,7 +173,10 @@ cb_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 gboolean
-prompt_retract_dialog (ECalComponent *comp, gchar **retract_text, GtkWidget *parent, gboolean *retract)
+prompt_retract_dialog (ECalComponent *comp,
+                       gchar **retract_text,
+                       GtkWidget *parent,
+                       gboolean *retract)
 {
 	gchar *message = NULL;
 	ECalComponentVType type = E_CAL_COMPONENT_NO_TYPE;
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index cd461c7858..a5cc6a1b02 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -39,7 +39,8 @@
  *
  **/
 void
-delete_error_dialog (const GError *error, ECalComponentVType vtype)
+delete_error_dialog (const GError *error,
+                     ECalComponentVType vtype)
 {
 	GtkWidget *dialog;
 	const gchar *str;
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index da6eeea05d..af61f807a8 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -114,7 +114,9 @@ e_delegate_dialog_finalize (GObject *object)
 }
 
 EDelegateDialog *
-e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address)
+e_delegate_dialog_construct (EDelegateDialog *edd,
+                             const gchar *name,
+                             const gchar *address)
 {
 	EDelegateDialogPrivate *priv;
 	EDestinationStore *destination_store;
@@ -157,7 +159,7 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gcha
 	e_destination_store_append_destination (destination_store, dest);
 	g_object_unref (dest);
 
-	g_signal_connect((priv->addressbook), "clicked",
+	g_signal_connect ((priv->addressbook), "clicked",
 			    G_CALLBACK (addressbook_clicked_cb), edd);
 
 	name_selector_dialog = e_name_selector_peek_dialog (priv->name_selector);
@@ -188,7 +190,8 @@ get_widgets (EDelegateDialog *edd)
 }
 
 static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
+addressbook_clicked_cb (GtkWidget *widget,
+                        gpointer data)
 {
 	EDelegateDialog *edd = data;
 
@@ -197,7 +200,9 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data)
 }
 
 static void
-addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
+addressbook_response_cb (GtkWidget *widget,
+                         gint response,
+                         gpointer data)
 {
 	EDelegateDialog *edd = data;
 	EDelegateDialogPrivate *priv;
@@ -218,7 +223,8 @@ addressbook_response_cb (GtkWidget *widget, gint response, gpointer data)
  * editor could not be created.
  **/
 EDelegateDialog *
-e_delegate_dialog_new (const gchar *name, const gchar *address)
+e_delegate_dialog_new (const gchar *name,
+                       const gchar *address)
 {
 	EDelegateDialog *edd;
 
@@ -227,7 +233,7 @@ e_delegate_dialog_new (const gchar *name, const gchar *address)
 }
 
 gchar *
-e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
+e_delegate_dialog_get_delegate (EDelegateDialog *edd)
 {
 	EDelegateDialogPrivate *priv;
 	ENameSelectorModel *name_selector_model;
@@ -258,7 +264,7 @@ e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 }
 
 gchar *
-e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
+e_delegate_dialog_get_delegate_name (EDelegateDialog *edd)
 {
 	EDelegateDialogPrivate *priv;
 	ENameSelectorModel *name_selector_model;
@@ -288,8 +294,8 @@ e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
 	return g_strdup (priv->name);
 }
 
-GtkWidget*
-e_delegate_dialog_get_toplevel	(EDelegateDialog  *edd)
+GtkWidget *
+e_delegate_dialog_get_toplevel (EDelegateDialog *edd)
 {
 	EDelegateDialogPrivate *priv;
 
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 5e1c9f0e5b..032901c8bc 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -52,11 +52,11 @@ struct _EDelegateDialogClass {
 
 GType            e_delegate_dialog_get_type          (void);
 
-EDelegateDialog* e_delegate_dialog_construct         (EDelegateDialog *etd,
+EDelegateDialog * e_delegate_dialog_construct         (EDelegateDialog *etd,
 						      const gchar      *name,
 						      const gchar      *address);
 
-EDelegateDialog* e_delegate_dialog_new               (const gchar      *name,
+EDelegateDialog * e_delegate_dialog_new               (const gchar      *name,
 						      const gchar      *address);
 
 gchar *            e_delegate_dialog_get_delegate      (EDelegateDialog *etd);
@@ -66,7 +66,7 @@ gchar *            e_delegate_dialog_get_delegate_name (EDelegateDialog *etd);
 void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
 						      const gchar      *address);
 
-GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
+GtkWidget *       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
 
 
 
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index d85e821d91..f8e933574c 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -31,7 +31,9 @@
 #include <string.h>
 
 void
-e_send_options_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type)
+e_send_options_utils_set_default_data (ESendOptionsDialog *sod,
+                                       ESource *source,
+                                       const gchar *type)
 {
 	ESendOptionsGeneral *gopts = NULL;
 	ESendOptionsStatusTracking *sopts;
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 0529e90286..f89b67056d 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -377,7 +377,7 @@ event_editor_constructor (GType type,
 		}
 
 		event_page_set_meeting (priv->event_page, TRUE);
-		priv->meeting_shown=TRUE;
+		priv->meeting_shown = TRUE;
 
 		if (e_shell_get_express_mode (shell)) {
 			attendee_page = event_page_get_attendee_page (priv->event_page);
@@ -597,7 +597,8 @@ event_editor_init (EventEditor *ee)
 }
 
 static void
-event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
+event_editor_edit_comp (CompEditor *editor,
+                        ECalComponent *comp)
 {
 	EventEditorPrivate *priv;
 	ECalComponentOrganizer organizer;
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 0ecb18393c..653f0215ac 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -183,8 +183,8 @@ struct _EventPagePrivate {
 	gint alarm_interval;
 
 	/* This is TRUE if both the start & end timezone are the same. If the
-	   start timezone is then changed, we updated the end timezone to the
-	   same value, since 99% of events start and end in one timezone. */
+	 * start timezone is then changed, we updated the end timezone to the
+	 * same value, since 99% of events start and end in one timezone. */
 	gboolean sync_timezones;
 	gboolean is_meeting;
 
@@ -645,7 +645,7 @@ sensitize_widgets (EventPage *epage)
 
 	alarm = e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map) != ALARM_NONE;
 	custom = is_custom_alarm_store (priv->alarm_list_store, priv->old_summary, priv->alarm_units, priv->alarm_interval, NULL) ||
-		 e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map)  == ALARM_CUSTOM ? TRUE:FALSE;
+		 e_dialog_combo_box_get (priv->alarm_time_combo, priv->alarm_map)  == ALARM_CUSTOM ? TRUE : FALSE;
 
 	if (alarm && !priv->alarm_icon) {
 		priv->alarm_icon = create_alarm_image_button ("stock_bell", _("This event has reminders"), epage);
@@ -729,7 +729,7 @@ update_time (EventPage *epage,
 	GtkAction *action;
 	struct icaltimetype *start_tt, *end_tt, implied_tt;
 	icaltimezone *start_zone = NULL, *def_zone = NULL;
-	gboolean all_day_event, homezone=TRUE;
+	gboolean all_day_event, homezone = TRUE;
 	gboolean show_timezone;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
@@ -737,8 +737,8 @@ update_time (EventPage *epage,
 
 	if (start_date->tzid) {
 		/* Note that if we are creating a new event, the timezones may not be
-		   on the server, so we try to get the builtin timezone with the TZID
-		   first. */
+		 * on the server, so we try to get the builtin timezone with the TZID
+		 * first. */
 		start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
 		if (!start_zone) {
 			/* FIXME: Handle error better. */
@@ -753,7 +753,7 @@ update_time (EventPage *epage,
 	}
 
 	/* If both times are DATE values, we set the 'All Day Event' checkbox.
-	   Also, if DTEND is after DTSTART, we subtract 1 day from it. */
+	 * Also, if DTEND is after DTSTART, we subtract 1 day from it. */
 	all_day_event = FALSE;
 	start_tt = start_date->value;
 	end_tt = end_date->value;
@@ -774,8 +774,8 @@ update_time (EventPage *epage,
 	set_all_day (epage, all_day_event);
 
 	/* If it is an all day event, we set both timezones to the current
-	   timezone, so that if the user toggles the 'All Day Event' checkbox
-	   the event uses the current timezone rather than none at all. */
+	 * timezone, so that if the user toggles the 'All Day Event' checkbox
+	 * the event uses the current timezone rather than none at all. */
 	if (all_day_event)
 		start_zone = e_meeting_store_get_timezone (
 			epage->priv->meeting_store);
@@ -809,7 +809,7 @@ update_time (EventPage *epage,
 		0, 0, NULL, NULL, epage);
 
 	/* Set the timezones, and set sync_timezones to TRUE if both timezones
-	   are the same. */
+	 * are the same. */
 	g_signal_handlers_block_matched (
 		epage->priv->start_timezone, G_SIGNAL_MATCH_DATA,
 		0, 0, NULL, NULL, epage);
@@ -843,7 +843,8 @@ update_time (EventPage *epage,
 }
 
 static void
-organizer_changed_cb (GtkEntry *entry, EventPage *epage)
+organizer_changed_cb (GtkEntry *entry,
+                      EventPage *epage)
 {
 	gchar *name;
 	gchar *mailto;
@@ -949,7 +950,7 @@ event_page_focus_main_widget (CompEditorPage *page)
 
 static void
 event_page_load_locations_list (CompEditorPage *page,
-				ECalComponent *comp)
+                                ECalComponent *comp)
 {
 	EShell *shell;
 	EShellBackend *backend;
@@ -1008,7 +1009,7 @@ event_page_load_locations_list (CompEditorPage *page,
 
 static void
 event_page_save_locations_list (CompEditorPage *page,
-				ECalComponent *comp)
+                                ECalComponent *comp)
 {
 	EShell *shell;
 	EShellBackend *backend;
@@ -1455,7 +1456,7 @@ event_page_fill_component (CompEditorPage *page,
 	g_return_val_if_fail (end_date_set, FALSE);
 
 	/* If the all_day toggle is set, we use DATE values for DTSTART and
-	   DTEND. If not, we fetch the hour & minute from the widgets. */
+	 * DTEND. If not, we fetch the hour & minute from the widgets. */
 	all_day_event = priv->all_day_event;
 
 	if (all_day_event) {
@@ -1806,28 +1807,32 @@ event_page_init (EventPage *epage)
 }
 
 void
-event_page_set_view_role (EventPage *epage, gboolean state)
+event_page_set_view_role (EventPage *epage,
+                          gboolean state)
 {
 	e_meeting_list_view_column_set_visible (
 		epage->priv->list_view, E_MEETING_STORE_ROLE_COL, state);
 }
 
 void
-event_page_set_view_status (EventPage *epage, gboolean state)
+event_page_set_view_status (EventPage *epage,
+                            gboolean state)
 {
 	e_meeting_list_view_column_set_visible (
 		epage->priv->list_view, E_MEETING_STORE_STATUS_COL, state);
 }
 
 void
-event_page_set_view_type (EventPage *epage, gboolean state)
+event_page_set_view_type (EventPage *epage,
+                          gboolean state)
 {
 	e_meeting_list_view_column_set_visible (
 		epage->priv->list_view, E_MEETING_STORE_TYPE_COL, state);
 }
 
 void
-event_page_set_view_rsvp (EventPage *epage, gboolean state)
+event_page_set_view_rsvp (EventPage *epage,
+                          gboolean state)
 {
 	e_meeting_list_view_column_set_visible (
 		epage->priv->list_view, E_MEETING_STORE_RSVP_COL, state);
@@ -1860,7 +1865,8 @@ event_page_show_options (EventPage *page)
 }
 
 void
-event_page_set_meeting (EventPage *page, gboolean set)
+event_page_set_meeting (EventPage *page,
+                        gboolean set)
 {
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
@@ -1870,7 +1876,8 @@ event_page_set_meeting (EventPage *page, gboolean set)
 }
 
 void
-event_page_set_delegate (EventPage *page, gboolean set)
+event_page_set_delegate (EventPage *page,
+                         gboolean set)
 {
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
@@ -1881,7 +1888,8 @@ event_page_set_delegate (EventPage *page, gboolean set)
 }
 
 static void
-time_sel_changed (GtkComboBox *combo, EventPage *epage)
+time_sel_changed (GtkComboBox *combo,
+                  EventPage *epage)
 {
 	EventPagePrivate *priv;
 	gint selection = gtk_combo_box_get_active (combo);
@@ -1932,20 +1940,22 @@ void update_end_time_combo (EventPage *epage)
 
 	end_timet -= start_timet;
 	hours = end_timet / ( 60 * 60 );
-	minutes = (end_timet/60) - ( hours * 60 );
+	minutes = (end_timet / 60) - ( hours * 60 );
 
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->hour_selector), hours);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->minute_selector), minutes);
 }
 
 static void
-hour_sel_changed (GtkSpinButton *widget, EventPage *epage)
+hour_sel_changed (GtkSpinButton *widget,
+                  EventPage *epage)
 {
 	hour_minute_changed (epage);
 }
 
 static void
-minute_sel_changed (GtkSpinButton *widget, EventPage *epage)
+minute_sel_changed (GtkSpinButton *widget,
+                    EventPage *epage)
 {
 	hour_minute_changed (epage);
 }
@@ -1981,7 +1991,8 @@ hour_minute_changed (EventPage *epage)
 }
 
 static void
-edit_clicked_cb (GtkButton *btn, EventPage *epage)
+edit_clicked_cb (GtkButton *btn,
+                 EventPage *epage)
 {
 	EventPagePrivate *priv;
 	GtkTreePath *path = NULL;
@@ -2001,7 +2012,8 @@ edit_clicked_cb (GtkButton *btn, EventPage *epage)
 }
 
 static void
-add_clicked_cb (GtkButton *btn, EventPage *epage)
+add_clicked_cb (GtkButton *btn,
+                EventPage *epage)
 {
 	CompEditor *editor;
 	CompEditorFlags flags;
@@ -2020,7 +2032,8 @@ add_clicked_cb (GtkButton *btn, EventPage *epage)
 }
 
 static gboolean
-existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
+existing_attendee (EMeetingAttendee *ia,
+                   ECalComponent *comp)
 {
 	GSList *attendees, *l;
 	const gchar *ia_address;
@@ -2056,7 +2069,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 }
 
 static void
-remove_attendee (EventPage *epage, EMeetingAttendee *ia)
+remove_attendee (EventPage *epage,
+                 EMeetingAttendee *ia)
 {
 	EventPagePrivate *priv = epage->priv;
 	CompEditor *editor;
@@ -2070,7 +2084,7 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia)
 	delegate = (flags & COMP_EDITOR_DELEGATE);
 
 	/* If the user deletes the organizer attendee explicitly,
-	   assume they no longer want the organizer showing up */
+	 * assume they no longer want the organizer showing up */
 	if (ia == priv->ia) {
 		g_object_unref (priv->ia);
 		priv->ia = NULL;
@@ -2113,7 +2127,8 @@ remove_attendee (EventPage *epage, EMeetingAttendee *ia)
 }
 
 static void
-remove_clicked_cb (GtkButton *btn, EventPage *epage)
+remove_clicked_cb (GtkButton *btn,
+                   EventPage *epage)
 {
 	EventPagePrivate *priv;
 	EMeetingAttendee *ia;
@@ -2135,7 +2150,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage)
 	}
 	paths = g_list_reverse (paths);
 
-	for (tmp = paths; tmp; tmp=tmp->next) {
+	for (tmp = paths; tmp; tmp = tmp->next) {
 		path = tmp->data;
 
 		gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->meeting_store), &iter, path);
@@ -2214,8 +2229,10 @@ attendee_added_cb (EMeetingListView *emlv,
 }
 
 static gboolean
-list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage) {
-
+list_view_event (EMeetingListView *list_view,
+                 GdkEvent *event,
+                 EventPage *epage)
+{
 	EventPagePrivate *priv = epage->priv;
 	CompEditor *editor;
 	CompEditorFlags flags;
@@ -2240,7 +2257,9 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage)
 }
 
 static gboolean
-list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage)
+list_key_press (EMeetingListView *list_view,
+                GdkEventKey *event,
+                EventPage *epage)
 {
 	if (event->keyval == GDK_KEY_Delete) {
 
@@ -2257,7 +2276,8 @@ list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epag
 }
 
 void
-event_page_set_all_day_event (EventPage *epage, gboolean all_day)
+event_page_set_all_day_event (EventPage *epage,
+                              gboolean all_day)
 {
 	EventPagePrivate *priv = epage->priv;
 	struct icaltimetype start_tt = icaltime_null_time ();
@@ -2309,7 +2329,7 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day)
 		start_tt.is_date = TRUE;
 
 		/* Round down to the start of the day, or the start of the
-		   previous day if it is midnight. */
+		 * previous day if it is midnight. */
 		icaltime_adjust (&end_tt, 0, 0, 0, -1);
 		end_tt.hour = 0;
 		end_tt.minute  = 0;
@@ -2322,8 +2342,8 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day)
 		    && end_tt.month == start_tt.month
 		    && end_tt.day == start_tt.day) {
 			/* The event is within one day, so we set the event
-			   start to the start of the working day, and the end
-			   to one hour later. */
+			 * start to the start of the working day, and the end
+			 * to one hour later. */
 			start_tt.hour =
 				comp_editor_get_work_day_start_hour (editor);
 			start_tt.minute =
@@ -2334,8 +2354,8 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day)
 			icaltime_adjust (&end_tt, 0, 1, 0, 0);
 		} else {
 			/* The event is longer than 1 day, so we keep exactly
-			   the same times, just using DATE-TIME rather than
-			   DATE. */
+			 * the same times, just using DATE-TIME rather than
+			 * DATE. */
 			icaltime_adjust (&end_tt, 1, 0, 0, 0);
 		}
 
@@ -2373,7 +2393,8 @@ event_page_set_all_day_event (EventPage *epage, gboolean all_day)
 }
 
 void
-event_page_set_show_time_busy (EventPage *epage, gboolean state)
+event_page_set_show_time_busy (EventPage *epage,
+                               gboolean state)
 {
 	epage->priv->show_time_as_busy = state;
 	comp_editor_page_changed (COMP_EDITOR_PAGE (epage));
@@ -2386,7 +2407,8 @@ event_page_show_alarm (EventPage *epage)
 }
 
 void
-event_page_set_show_timezone (EventPage *epage, gboolean state)
+event_page_set_show_timezone (EventPage *epage,
+                              gboolean state)
 {
 	if (state) {
 		gtk_widget_show_all (epage->priv->start_timezone);
@@ -2399,7 +2421,8 @@ event_page_set_show_timezone (EventPage *epage, gboolean state)
 }
 
 void
-event_page_set_show_categories (EventPage *epage, gboolean state)
+event_page_set_show_categories (EventPage *epage,
+                                gboolean state)
 {
 	if (state) {
 		gtk_widget_show (epage->priv->categories_btn);
@@ -2412,7 +2435,9 @@ event_page_set_show_categories (EventPage *epage, gboolean state)
 
 /*If the msg has some value set, the icon should always be set */
 void
-event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *msg)
+event_page_set_info_string (EventPage *epage,
+                            const gchar *icon,
+                            const gchar *msg)
 {
 	EventPagePrivate *priv;
 
@@ -2454,7 +2479,7 @@ get_widgets (EventPage *epage)
 		return FALSE;
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -2572,11 +2597,12 @@ summary_changed_cb (GtkEditable *editable,
 }
 
 /* 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. */
+ * dates visible to the user. For DATE values, we have to add 1 day to the
+ * end_tt before emitting the signal. */
 static void
-notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
-		      struct icaltimetype *end_tt)
+notify_dates_changed (EventPage *epage,
+                      struct icaltimetype *start_tt,
+                      struct icaltimetype *end_tt)
 {
 	EventPagePrivate *priv;
 	CompEditorPageDates dates;
@@ -2592,7 +2618,7 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 
 	if (all_day_event) {
 		/* The actual DTEND is 1 day after the displayed date for
-		   DATE values. */
+		 * DATE values. */
 		icaltime_adjust (end_tt, 1, 0, 0, 0);
 	} else {
 		start_zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
@@ -2615,10 +2641,10 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 
 static gboolean
 check_start_before_end (struct icaltimetype *start_tt,
-			icaltimezone *start_zone,
-			struct icaltimetype *end_tt,
-			icaltimezone *end_zone,
-			gboolean adjust_end_time)
+                        icaltimezone *start_zone,
+                        struct icaltimetype *end_tt,
+                        icaltimezone *end_zone,
+                        gboolean adjust_end_time)
 {
 	struct icaltimetype end_tt_copy;
 	gint cmp;
@@ -2628,7 +2654,7 @@ check_start_before_end (struct icaltimetype *start_tt,
 	icaltimezone_convert_time (&end_tt_copy, end_zone, start_zone);
 
 	/* Now check if the start time is after the end time. If it is,
-	   we need to modify one of the times. */
+	 * we need to modify one of the times. */
 	cmp = icaltime_compare (*start_tt, end_tt_copy);
 	if (cmp > 0) {
 		if (adjust_end_time) {
@@ -2660,7 +2686,8 @@ check_start_before_end (struct icaltimetype *start_tt,
  * start or end time, the other time is adjusted to make it valid.
  */
 static void
-times_updated (EventPage *epage, gboolean adjust_end_time)
+times_updated (EventPage *epage,
+               gboolean adjust_end_time)
 {
 	EventPagePrivate *priv;
 	struct icaltimetype start_tt = icaltime_null_time ();
@@ -2691,7 +2718,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 
 	if (all_day_event) {
 		/* All Day Events are simple. We just compare the dates and if
-		   start > end we copy one of them to the other. */
+		 * start > end we copy one of them to the other. */
 		gint cmp = icaltime_compare_date_only (start_tt, end_tt);
 		if (cmp > 0) {
 			if (adjust_end_time) {
@@ -2707,7 +2734,7 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 		end_tt.is_date = TRUE;
 	} else {
 		/* For DATE-TIME events, we have to convert to the same
-		   timezone before comparing. */
+		 * timezone before comparing. */
 		e_date_edit_get_time_of_day (E_DATE_EDIT (priv->start_time),
 					     &start_tt.hour,
 					     &start_tt.minute);
@@ -2858,7 +2885,9 @@ event_page_send_options_clicked_cb (EventPage *epage)
 }
 
 static void
-epage_client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
+epage_client_opened_cb (GObject *source_object,
+                        GAsyncResult *result,
+                        gpointer user_data)
 {
 	ESource *source = E_SOURCE (source_object);
 	EClient *client = NULL;
@@ -2928,7 +2957,8 @@ epage_client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer u
 }
 
 static void
-source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
+source_changed_cb (ESourceComboBox *source_combo_box,
+                   EventPage *epage)
 {
 	EventPagePrivate *priv = epage->priv;
 	ESource *source;
@@ -2950,7 +2980,8 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
 }
 
 static void
-set_subscriber_info_string (EventPage *epage, const gchar *backend_address)
+set_subscriber_info_string (EventPage *epage,
+                            const gchar *backend_address)
 {
 	CompEditor *editor;
 	ECalClient *client;
@@ -2963,7 +2994,7 @@ set_subscriber_info_string (EventPage *epage, const gchar *backend_address)
 	if (e_source_get_property (source, "subscriber")) {
 		g_free (epage->priv->subscriber_info_text);
 		/* Translators: This string is used when we are creating an Event
-		   (meeting or appointment)  on behalf of some other user */
+		 * (meeting or appointment)  on behalf of some other user */
 		epage->priv->subscriber_info_text = g_markup_printf_escaped (_("You are acting on behalf of %s"), backend_address);
 	} else {
 		g_free (epage->priv->subscriber_info_text);
@@ -3131,7 +3162,7 @@ init_widgets (EventPage *epage)
 	client = comp_editor_get_client (editor);
 
 	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
+	 * current time. */
 	e_date_edit_set_get_time_callback (
 		E_DATE_EDIT (priv->start_time),
 		(EDateEditGetTimeCallback) comp_editor_get_current_time,
@@ -3147,7 +3178,7 @@ init_widgets (EventPage *epage)
 	gtk_widget_hide (priv->info_hbox);
 
 	/* Summary */
-	g_signal_connect((priv->summary), "changed",
+	g_signal_connect ((priv->summary), "changed",
 			    G_CALLBACK (summary_changed_cb), epage);
 
 	/* Description */
@@ -3164,11 +3195,11 @@ init_widgets (EventPage *epage)
 			    G_CALLBACK (end_date_changed_cb), epage);
 
 	/* Categories */
-	g_signal_connect((priv->categories_btn), "clicked",
+	g_signal_connect ((priv->categories_btn), "clicked",
 			    G_CALLBACK (categories_clicked_cb), epage);
 
 	/* Source selector */
-	g_signal_connect((priv->source_selector), "changed",
+	g_signal_connect ((priv->source_selector), "changed",
 			    G_CALLBACK (source_changed_cb), epage);
 	/* Alarms */
 	priv->alarm_list_store = e_alarm_list_new ();
@@ -3183,7 +3214,7 @@ init_widgets (EventPage *epage)
 		G_CALLBACK (comp_editor_page_changed), epage);
 
 	/* Timezone changed */
-	g_signal_connect((priv->start_timezone), "changed",
+	g_signal_connect ((priv->start_timezone), "changed",
 			    G_CALLBACK (start_timezone_changed_cb), epage);
 
 	e_meeting_list_view_column_set_visible (
@@ -3212,24 +3243,40 @@ init_widgets (EventPage *epage)
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 
-	g_signal_connect (G_OBJECT (priv->list_view), "event", G_CALLBACK (list_view_event), epage);
-	g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), epage);
+	g_signal_connect (
+		priv->list_view, "event",
+		G_CALLBACK (list_view_event), epage);
+	g_signal_connect (
+		priv->list_view, "key_press_event",
+		G_CALLBACK (list_key_press), epage);
 
 	/* Add attendee button */
-	g_signal_connect (priv->add, "clicked", G_CALLBACK (add_clicked_cb), epage);
+	g_signal_connect (
+		priv->add, "clicked",
+		G_CALLBACK (add_clicked_cb), epage);
 
 	/* Remove attendee button */
-	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), epage);
+	g_signal_connect (
+		priv->remove, "clicked",
+		G_CALLBACK (remove_clicked_cb), epage);
 
 	/* Edit attendee button */
-	g_signal_connect (priv->edit, "clicked", G_CALLBACK (edit_clicked_cb), epage);
+	g_signal_connect (
+		priv->edit, "clicked",
+		G_CALLBACK (edit_clicked_cb), epage);
 
 	/* Contacts button */
-	g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), epage);
+	g_signal_connect (
+		priv->invite, "clicked",
+		G_CALLBACK (invite_cb), epage);
 
 	/* Alarm dialog */
-	g_signal_connect (GTK_DIALOG (priv->alarm_dialog), "response", G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
-	g_signal_connect (GTK_DIALOG (priv->alarm_dialog), "delete-event", G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
+	g_signal_connect (
+		priv->alarm_dialog, "response",
+		G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
+	g_signal_connect (
+		priv->alarm_dialog, "delete-event",
+		G_CALLBACK (gtk_widget_hide), priv->alarm_dialog);
 	priv->alarm_list_dlg_widget = alarm_list_dialog_peek (client, priv->alarm_list_store);
 	gtk_widget_reparent (priv->alarm_list_dlg_widget, priv->alarm_box);
 	gtk_widget_show_all (priv->alarm_list_dlg_widget);
@@ -3259,7 +3306,7 @@ init_widgets (EventPage *epage)
 	update_end_time_combo ( epage);
 
 	/* Hour and Minute selector */
-	gtk_spin_button_set_range ( (GtkSpinButton*) priv->hour_selector, 0, G_MAXINT);
+	gtk_spin_button_set_range ( (GtkSpinButton *) priv->hour_selector, 0, G_MAXINT);
 	g_signal_connect (priv->hour_selector, "value-changed", G_CALLBACK (hour_sel_changed), epage);
 	g_signal_connect (priv->minute_selector, "value-changed", G_CALLBACK (minute_sel_changed), epage);
 
@@ -3363,7 +3410,8 @@ init_widgets (EventPage *epage)
 
 
 static void
-event_page_select_organizer (EventPage *epage, const gchar *backend_address)
+event_page_select_organizer (EventPage *epage,
+                             const gchar *backend_address)
 {
 	EventPagePrivate *priv = epage->priv;
 	CompEditor *editor;
@@ -3505,7 +3553,8 @@ event_page_new (EMeetingStore *meeting_store,
 }
 
 static void
-set_attendees (ECalComponent *comp, const GPtrArray *attendees)
+set_attendees (ECalComponent *comp,
+               const GPtrArray *attendees)
 {
 	GSList *comp_attendees = NULL, *l;
 	gint i;
diff --git a/calendar/gui/dialogs/goto-dialog.c b/calendar/gui/dialogs/goto-dialog.c
index 7b8fffa430..4a77c87554 100644
--- a/calendar/gui/dialogs/goto-dialog.c
+++ b/calendar/gui/dialogs/goto-dialog.c
@@ -59,7 +59,8 @@ static GoToDialog *dlg = NULL;
 
 /* Callback used when the year adjustment is changed */
 static void
-year_changed (GtkAdjustment *adj, gpointer data)
+year_changed (GtkAdjustment *adj,
+              gpointer data)
 {
 	GtkSpinButton *spin_button;
 	GoToDialog *dlg = data;
@@ -73,7 +74,8 @@ year_changed (GtkAdjustment *adj, gpointer data)
 
 /* Callback used when a month button is toggled */
 static void
-month_changed (GtkToggleButton *toggle, gpointer data)
+month_changed (GtkToggleButton *toggle,
+               gpointer data)
 {
 	GtkComboBox *combo_box;
 	GoToDialog *dlg = data;
@@ -86,7 +88,8 @@ month_changed (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
+ecal_date_range_changed (ECalendarItem *calitem,
+                         gpointer user_data)
 {
 	GoToDialog *dlg = user_data;
 	ECalModel *model;
@@ -101,7 +104,8 @@ ecal_date_range_changed (ECalendarItem *calitem, gpointer user_data)
 /* Event handler for day groups in the month item.  A button press makes
  * the calendar jump to the selected day and destroys the Go-to dialog box. */
 static void
-ecal_event (ECalendarItem *calitem, gpointer user_data)
+ecal_event (ECalendarItem *calitem,
+            gpointer user_data)
 {
 	GoToDialog *dlg = user_data;
 	GDate start_date, end_date;
@@ -127,7 +131,8 @@ ecal_event (ECalendarItem *calitem, gpointer user_data)
 
 /* Returns the current time, for the ECalendarItem. */
 static struct tm
-get_current_time (ECalendarItem *calitem, gpointer data)
+get_current_time (ECalendarItem *calitem,
+                  gpointer data)
 {
 	icaltimezone *zone;
 	struct tm tmp_tm = { 0 };
@@ -224,7 +229,8 @@ goto_dialog_init_widgets (GoToDialog *dlg)
 
 /* Creates a "goto date" dialog and runs it */
 void
-goto_dialog (GtkWindow *parent, GnomeCalendar *gcal)
+goto_dialog (GtkWindow *parent,
+             GnomeCalendar *gcal)
 {
 	ECalModel *model;
 	time_t start_time;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 9c14fccd0a..cf1e879d1d 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -503,7 +503,8 @@ get_recipients (ECalComponent *comp)
 }
 
 static gboolean
-fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
+fill_comp_with_recipients (ENameSelector *name_selector,
+                           ECalComponent *comp)
 {
 	EDestinationStore *destination_store;
 	GString *str = NULL;
@@ -678,7 +679,7 @@ memo_page_fill_component (CompEditorPage *page,
 		gunichar uc;
 
 		for (i = 0, p = str, uc = g_utf8_get_char_validated (p, -1);
-		    i < 50 && p && uc < (gunichar)-2;
+		    i < 50 && p && uc < (gunichar) - 2;
 		    i++, p = g_utf8_next_char (p), uc = g_utf8_get_char_validated (p, -1)) {
 			if (uc == '\n' || !uc) {
 				p = NULL;
@@ -784,7 +785,8 @@ memo_page_fill_component (CompEditorPage *page,
 }
 
 void
-memo_page_set_show_categories (MemoPage *page, gboolean state)
+memo_page_set_show_categories (MemoPage *page,
+                               gboolean state)
 {
 	if (state) {
 		gtk_widget_show (page->priv->categories_btn);
@@ -797,7 +799,9 @@ memo_page_set_show_categories (MemoPage *page, gboolean state)
 
 /*If the msg has some value set, the icon should always be set */
 void
-memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg)
+memo_page_set_info_string (MemoPage *mpage,
+                           const gchar *icon,
+                           const gchar *msg)
 {
 	MemoPagePrivate *priv;
 
@@ -834,7 +838,7 @@ get_widgets (MemoPage *mpage)
 	}
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -896,7 +900,9 @@ categories_clicked_cb (GtkWidget *button,
 }
 
 static void
-mpage_client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
+mpage_client_opened_cb (GObject *source_object,
+                        GAsyncResult *result,
+                        gpointer user_data)
 {
 	ESource *source = E_SOURCE (source_object);
 	EClient *client = NULL;
@@ -1002,7 +1008,7 @@ set_subscriber_info_string (MemoPage *mpage,
 	if (e_source_get_property (source, "subscriber")) {
 		g_free (mpage->priv->subscriber_info_text);
 		/* Translators: This string is used when we are creating a Memo
-		   on behalf of some other user */
+		 * on behalf of some other user */
 		mpage->priv->subscriber_info_text = g_markup_printf_escaped (_("You are acting on behalf of %s"), backend_address);
 	} else {
 		g_free (mpage->priv->subscriber_info_text);
@@ -1082,7 +1088,7 @@ init_widgets (MemoPage *mpage)
 		G_CALLBACK (source_changed_cb), mpage);
 
 	/* Connect the default signal handler to use to make sure the "changed"
-	   field gets set whenever a field is changed. */
+	 * field gets set whenever a field is changed. */
 
 	/* Belongs to priv->memo_content */
 	g_signal_connect_swapped (
@@ -1142,7 +1148,8 @@ get_to_entry (ENameSelector *name_selector)
 }
 
 static void
-memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address)
+memo_page_select_organizer (MemoPage *mpage,
+                            const gchar *backend_address)
 {
 	MemoPagePrivate *priv;
 	CompEditor *editor;
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 3514c03dbf..e9a941998d 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -33,9 +33,10 @@
 
 gboolean
 recur_component_dialog (ECalClient *client,
-			ECalComponent *comp,
-			CalObjModType *mod,
-			GtkWindow *parent, gboolean delegated)
+                        ECalComponent *comp,
+                        CalObjModType *mod,
+                        GtkWindow *parent,
+                        gboolean delegated)
 {
 	gchar *str;
 	GtkWidget *dialog, *rb_this, *rb_prior, *rb_future, *rb_all, *hbox;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index fa18e0d9f1..6f201b596f 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -463,7 +463,8 @@ clear_widgets (RecurrencePage *rpage)
 
 /* Appends an exception date to the list */
 static void
-append_exception (RecurrencePage *rpage, ECalComponentDateTime *datetime)
+append_exception (RecurrencePage *rpage,
+                  ECalComponentDateTime *datetime)
 {
 	RecurrencePagePrivate *priv;
 	GtkTreeView *view;
@@ -478,7 +479,8 @@ append_exception (RecurrencePage *rpage, ECalComponentDateTime *datetime)
 
 /* Fills in the exception widgets with the data from the calendar component */
 static void
-fill_exception_widgets (RecurrencePage *rpage, ECalComponent *comp)
+fill_exception_widgets (RecurrencePage *rpage,
+                        ECalComponent *comp)
 {
 	GSList *list, *l;
 
@@ -588,7 +590,8 @@ sensitize_recur_widgets (RecurrencePage *rpage)
 }
 
 static void
-update_with_readonly (RecurrencePage *rpage, gboolean read_only)
+update_with_readonly (RecurrencePage *rpage,
+                      gboolean read_only)
 {
 	RecurrencePagePrivate *priv = rpage->priv;
 	CompEditor *editor;
@@ -617,7 +620,9 @@ update_with_readonly (RecurrencePage *rpage, gboolean read_only)
 }
 
 static void
-rpage_get_objects_for_uid_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
+rpage_get_objects_for_uid_cb (GObject *source_object,
+                              GAsyncResult *result,
+                              gpointer user_data)
 {
 	ECalClient *client = E_CAL_CLIENT (source_object);
 	RecurrencePage *rpage = user_data;
@@ -639,7 +644,9 @@ rpage_get_objects_for_uid_cb (GObject *source_object, GAsyncResult *result, gpoi
 }
 
 static void
-rpage_get_object_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
+rpage_get_object_cb (GObject *source_object,
+                     GAsyncResult *result,
+                     gpointer user_data)
 {
 	ECalClient *client = E_CAL_CLIENT (source_object);
 	RecurrencePage *rpage = user_data;
@@ -711,24 +718,12 @@ sensitize_buttons (RecurrencePage *rpage)
 	}
 }
 
-#if 0
-/* Encondes a position/weekday pair into the proper format for
- * icalrecurrencetype.by_day. Not needed at present.
- */
-static short
-nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
-{
-	g_assert (pos > 0 && pos <= 5);
-
-	return (pos << 3) | (gint) weekday;
-}
-#endif
-
 /* Gets the simple recurrence data from the recurrence widgets and stores it in
  * the calendar component.
  */
 static void
-simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
+simple_recur_to_comp (RecurrencePage *rpage,
+                      ECalComponent *comp)
 {
 	RecurrencePagePrivate *priv;
 	struct icalrecurrencetype r;
@@ -820,8 +815,8 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 			break;
 
 		/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-		   accept BYDAY=2TU. So we now use the same as Outlook
-		   by default. */
+		 * accept BYDAY=2TU. So we now use the same as Outlook
+		 * by default. */
 		case MONTH_DAY_MON:
 			r.by_day[0] = ICAL_MONDAY_WEEKDAY;
 			r.by_set_pos[0] = month_num;
@@ -890,7 +885,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 		g_return_if_fail (E_IS_DATE_EDIT (priv->ending_date_edit));
 
 		/* We only allow a DATE value to be set for the UNTIL property,
-		   since we don't support sub-day recurrences. */
+		 * since we don't support sub-day recurrences. */
 		date_set = e_date_edit_get_date (E_DATE_EDIT (priv->ending_date_edit),
 						 &r.until.year,
 						 &r.until.month,
@@ -921,7 +916,8 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
  * custom recurrence, it leaves it intact.
  */
 static gboolean
-fill_component (RecurrencePage *rpage, ECalComponent *comp)
+fill_component (RecurrencePage *rpage,
+                ECalComponent *comp)
 {
 	RecurrencePagePrivate *priv;
 	gboolean recurs;
@@ -1058,7 +1054,11 @@ make_weekly_special (RecurrencePage *rpage)
 
 /* Creates the subtree for the monthly recurrence number */
 static void
-make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const gchar *title, gint start, gint end)
+make_recur_month_num_subtree (GtkTreeStore *store,
+                              GtkTreeIter *par,
+                              const gchar *title,
+                              gint start,
+                              gint end)
 {
 	GtkTreeIter iter, parent;
 	gint i;
@@ -1071,12 +1071,13 @@ make_recur_month_num_subtree (GtkTreeStore *store, GtkTreeIter *par, const gchar
 		gtk_tree_store_set (store, &iter, 0, _(e_cal_recur_nth[i]), 1, i + 1, -1);
 	}
 }
+
 static void
-only_leaf_sensitive (GtkCellLayout   *cell_layout,
-		      GtkCellRenderer *cell,
-		      GtkTreeModel    *tree_model,
-		      GtkTreeIter     *iter,
-		      gpointer         data)
+only_leaf_sensitive (GtkCellLayout *cell_layout,
+                     GtkCellRenderer *cell,
+                     GtkTreeModel *tree_model,
+                     GtkTreeIter *iter,
+                     gpointer data)
 {
   gboolean sensitive;
 
@@ -1184,8 +1185,8 @@ make_recur_month_combobox (void)
 {
 	static const gchar *options[] = {
 		/* For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
-		   (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
-		   the name of a week day (like 'Monday' or 'Friday') always follow. */
+		 * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
+		 * the name of a week day (like 'Monday' or 'Friday') always follow. */
 		N_("day"),
 		N_("Monday"),
 		N_("Tuesday"),
@@ -1209,7 +1210,8 @@ make_recur_month_combobox (void)
 }
 
 static void
-month_num_combo_changed_cb (GtkComboBox *combo, RecurrencePage *rpage)
+month_num_combo_changed_cb (GtkComboBox *combo,
+                            RecurrencePage *rpage)
 {
 	GtkTreeIter iter;
 	RecurrencePagePrivate *priv;
@@ -1269,7 +1271,8 @@ month_num_combo_changed_cb (GtkComboBox *combo, RecurrencePage *rpage)
  * are 1-31 while a Sunday is the 1st through 5th.
  */
 static void
-month_day_combo_changed_cb (GtkComboBox *combo, RecurrencePage *rpage)
+month_day_combo_changed_cb (GtkComboBox *combo,
+                            RecurrencePage *rpage)
 {
 	RecurrencePagePrivate *priv;
 	enum month_num_options month_num;
@@ -1403,7 +1406,8 @@ make_recurrence_special (RecurrencePage *rpage)
 
 /* Counts the elements in the by_xxx fields of an icalrecurrencetype */
 static gint
-count_by_xxx (gshort *field, gint max_elements)
+count_by_xxx (gshort *field,
+              gint max_elements)
 {
 	gint i;
 
@@ -1456,7 +1460,7 @@ make_ending_until_special (RecurrencePage *rpage)
 		G_CALLBACK (comp_editor_page_changed), rpage);
 
 	/* Make sure the EDateEdit widget uses our timezones to get the
-	   current time. */
+	 * current time. */
 	e_date_edit_set_get_time_callback (
 		de,
 		(EDateEditGetTimeCallback) comp_editor_get_current_time,
@@ -1554,7 +1558,8 @@ make_ending_special (RecurrencePage *rpage)
  * component.
  */
 static void
-fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r)
+fill_ending_date (RecurrencePage *rpage,
+                  struct icalrecurrencetype *r)
 {
 	RecurrencePagePrivate *priv = rpage->priv;
 	CompEditor *editor;
@@ -1635,7 +1640,8 @@ fill_ending_date (RecurrencePage *rpage, struct icalrecurrencetype *r)
  * no rdates or exrules (exdates are handled just fine elsewhere).
  */
 static gboolean
-recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
+recurrence_page_fill_widgets (CompEditorPage *page,
+                              ECalComponent *comp)
 {
 	RecurrencePage *rpage;
 	RecurrencePagePrivate *priv;
@@ -1867,8 +1873,8 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 			enum month_day_options month_day;
 
 			/* Outlook 2000 uses BYDAY=TU;BYSETPOS=2, and will not
-			   accept BYDAY=2TU. So we now use the same as Outlook
-			   by default. */
+			 * accept BYDAY=2TU. So we now use the same as Outlook
+			 * by default. */
 
 			weekday = icalrecurrencetype_day_day_of_week (r->by_day[0]);
 			pos = icalrecurrencetype_day_position (r->by_day[0]);
@@ -1988,7 +1994,8 @@ recurrence_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 
 /* fill_component handler for the recurrence page */
 static gboolean
-recurrence_page_fill_component (CompEditorPage *page, ECalComponent *comp)
+recurrence_page_fill_component (CompEditorPage *page,
+                                ECalComponent *comp)
 {
 	RecurrencePage *rpage;
 
@@ -1998,7 +2005,8 @@ recurrence_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 
 /* set_dates handler for the recurrence page */
 static void
-recurrence_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
+recurrence_page_set_dates (CompEditorPage *page,
+                           CompEditorPageDates *dates)
 {
 	RecurrencePage *rpage;
 	RecurrencePagePrivate *priv;
@@ -2088,7 +2096,7 @@ get_widgets (RecurrencePage *rpage)
 		return FALSE;
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -2170,7 +2178,9 @@ type_toggled_cb (GtkToggleButton *toggle,
 }
 
 static GtkWidget *
-create_exception_dialog (RecurrencePage *rpage, const gchar *title, GtkWidget **date_edit)
+create_exception_dialog (RecurrencePage *rpage,
+                         const gchar *title,
+                         GtkWidget **date_edit)
 {
 	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *toplevel;
@@ -2357,7 +2367,7 @@ init_widgets (RecurrencePage *rpage)
 	priv->preview_calendar = e_calendar_new ();
 	ecal = E_CALENDAR (priv->preview_calendar);
 
-	g_signal_connect((ecal->calitem), "date_range_changed",
+	g_signal_connect ((ecal->calitem), "date_range_changed",
 			    G_CALLBACK (preview_date_range_changed_cb),
 			    rpage);
 	e_calendar_item_set_max_days_sel (ecal->calitem, 0);
@@ -2373,7 +2383,7 @@ init_widgets (RecurrencePage *rpage)
 
 	/* Recurrence types */
 
-	g_signal_connect(priv->recurs, "toggled", G_CALLBACK (type_toggled_cb), rpage);
+	g_signal_connect (priv->recurs, "toggled", G_CALLBACK (type_toggled_cb), rpage);
 
 	/* Recurrence interval */
 
@@ -2402,11 +2412,11 @@ init_widgets (RecurrencePage *rpage)
 
 	/* Exception buttons */
 
-	g_signal_connect((priv->exception_add), "clicked",
+	g_signal_connect ((priv->exception_add), "clicked",
 			    G_CALLBACK (exception_add_cb), rpage);
-	g_signal_connect((priv->exception_modify), "clicked",
+	g_signal_connect ((priv->exception_modify), "clicked",
 			    G_CALLBACK (exception_modify_cb), rpage);
-	g_signal_connect((priv->exception_delete), "clicked",
+	g_signal_connect ((priv->exception_delete), "clicked",
 			    G_CALLBACK (exception_delete_cb), rpage);
 
 	gtk_widget_set_sensitive (priv->exception_modify, FALSE);
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 0f9a6fba8e..459ff9a4c6 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -41,7 +41,8 @@
  **/
 
 GtkResponseType
-save_component_dialog (GtkWindow *parent, ECalComponent *comp)
+save_component_dialog (GtkWindow *parent,
+                       ECalComponent *comp)
 {
 	ECalComponentVType vtype = e_cal_component_get_vtype (comp);
 	CompEditorFlags flags;
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 0b78f55c7b..3b96fbd2bc 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -54,8 +54,8 @@ struct _SchedulePagePrivate {
 	EMeetingTimeSelector *sel;
 
 	/* The timezone we use. Note that we use the same timezone for the
-	   start and end date. We convert the end date if it is passed in in
-	   another timezone. */
+	 * start and end date. We convert the end date if it is passed in in
+	 * another timezone. */
 	icaltimezone *zone;
 };
 
@@ -95,8 +95,8 @@ update_time (SchedulePage *spage,
 
 	if (start_date->tzid) {
 		/* Note that if we are creating a new event, the timezones may not be
-		   on the server, so we try to get the builtin timezone with the TZID
-		   first. */
+		 * on the server, so we try to get the builtin timezone with the TZID
+		 * first. */
 		start_zone = icaltimezone_get_builtin_timezone_from_tzid (start_date->tzid);
 		if (!start_zone) {
 			GError *error = NULL;
@@ -145,7 +145,7 @@ update_time (SchedulePage *spage,
 	all_day = (start_tt.is_date && end_tt.is_date) ? TRUE : FALSE;
 
 	/* For All Day Events, if DTEND is after DTSTART, we subtract 1 day
-	   from it. */
+	 * from it. */
 	if (all_day) {
 		if (icaltime_compare_date_only (end_tt, start_tt) > 0) {
 			icaltime_adjust (&end_tt, -1, 0, 0, 0);
@@ -215,7 +215,8 @@ schedule_page_focus_main_widget (CompEditorPage *page)
 }
 
 static gboolean
-schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
+schedule_page_fill_widgets (CompEditorPage *page,
+                            ECalComponent *comp)
 {
 	SchedulePage *spage;
 	ECalComponentDateTime start_date, end_date;
@@ -242,13 +243,15 @@ schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 }
 
 static gboolean
-schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp)
+schedule_page_fill_component (CompEditorPage *page,
+                              ECalComponent *comp)
 {
 	return TRUE;
 }
 
 static void
-schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
+schedule_page_set_dates (CompEditorPage *page,
+                         CompEditorPageDates *dates)
 {
 	SchedulePage *spage;
 
@@ -304,7 +307,7 @@ get_widgets (SchedulePage *spage)
 		return FALSE;
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -368,7 +371,8 @@ schedule_page_set_meeting_time (SchedulePage *spage,
  * be created.
  **/
 SchedulePage *
-schedule_page_construct (SchedulePage *spage, EMeetingStore *ems)
+schedule_page_construct (SchedulePage *spage,
+                         EMeetingStore *ems)
 {
 	SchedulePagePrivate *priv = spage->priv;
 	CompEditor *editor;
@@ -450,7 +454,8 @@ schedule_page_update_free_busy (SchedulePage *spage)
 }
 
 void
-schedule_page_set_name_selector (SchedulePage *spage, ENameSelector *name_selector)
+schedule_page_set_name_selector (SchedulePage *spage,
+                                 ENameSelector *name_selector)
 {
 	SchedulePagePrivate *priv;
 
@@ -504,7 +509,7 @@ times_changed_cb (GtkWidget *widget,
 		end_dt.tzid = start_dt.tzid;
 	} else {
 		/* For All-Day Events, we set the timezone to NULL, and add
-		   1 day to DTEND. */
+		 * 1 day to DTEND. */
 		start_dt.value->is_date = TRUE;
 		start_dt.tzid = NULL;
 		end_dt.value->is_date = TRUE;
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index 4ae9f0a0d8..6a768e5b7a 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -35,7 +35,9 @@
  * Implements dialog for allowing user to select a destination source.
  */
 ESource *
-select_source_dialog (GtkWindow *parent, ECalClientSourceType obj_type, ESource *except_source)
+select_source_dialog (GtkWindow *parent,
+                      ECalClientSourceType obj_type,
+                      ESource *except_source)
 {
 	GtkWidget *dialog;
 	ESourceList *source_list;
@@ -78,7 +80,7 @@ select_source_dialog (GtkWindow *parent, ECalClientSourceType obj_type, ESource
 			gchar *absolute_uri;
 
 			/* set the absolute URI on the source we keep around, since the group
-			   will be unrefed */
+			 * will be unrefed */
 			absolute_uri = e_source_build_absolute_uri (selected_source);
 			e_source_set_absolute_uri (selected_source, (const gchar *) absolute_uri);
 
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index bf016403ec..3752db372b 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -106,7 +106,8 @@ have_nonprocedural_alarm (ECalComponent *comp)
 }
 
 static GtkWidget *
-add_checkbox (GtkBox *where, const gchar *caption)
+add_checkbox (GtkBox *where,
+              const gchar *caption)
 {
 	GtkWidget *checkbox, *align;
 
@@ -133,7 +134,12 @@ add_checkbox (GtkBox *where, const gchar *caption)
  * Return value: TRUE if the user clicked Yes, FALSE otherwise.
  **/
 gboolean
-send_component_dialog (GtkWindow *parent, ECalClient *client, ECalComponent *comp, gboolean new, gboolean *strip_alarms, gboolean *only_new_attendees)
+send_component_dialog (GtkWindow *parent,
+                       ECalClient *client,
+                       ECalComponent *comp,
+                       gboolean new,
+                       gboolean *strip_alarms,
+                       gboolean *only_new_attendees)
 {
 	ECalComponentVType vtype;
 	const gchar *id;
@@ -173,7 +179,7 @@ send_component_dialog (GtkWindow *parent, ECalClient *client, ECalComponent *com
 
 	if (only_new_attendees && !component_has_new_attendees (comp)) {
 		/* do not show the check if there is no new attendee and
-		   set as all attendees are required to be notified */
+		 * set as all attendees are required to be notified */
 		*only_new_attendees = FALSE;
 
 		/* pretend it as being passed NULL to simplify code below */
@@ -206,7 +212,9 @@ send_component_dialog (GtkWindow *parent, ECalClient *client, ECalComponent *com
 }
 
 gboolean
-send_component_prompt_subject (GtkWindow *parent, ECalClient *client, ECalComponent *comp)
+send_component_prompt_subject (GtkWindow *parent,
+                               ECalClient *client,
+                               ECalComponent *comp)
 {
 	ECalComponentVType vtype;
 	const gchar *id;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index bc828cf431..de30baca77 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -269,7 +269,7 @@ task_details_page_fill_widgets (CompEditorPage *page,
 		icaltimezone *utc_zone, *zone;
 
 		/* Completed is in UTC, but that would confuse the user, so
-		   we convert it to local time. */
+		 * we convert it to local time. */
 		utc_zone = icaltimezone_get_utc_timezone ();
 		zone = comp_editor_get_timezone (editor);
 
@@ -376,11 +376,11 @@ task_details_page_fill_component (CompEditorPage *page,
 		}
 
 		/* COMPLETED must be in UTC, so we assume that the date in the
-		   dialog is in the current timezone, and we now convert it
-		   to UTC. FIXME: We should really use one timezone for the
-		   entire time the dialog is shown. Otherwise if the user
-		   changes the timezone, the COMPLETED date may get changed
-		   as well. */
+		 * dialog is in the current timezone, and we now convert it
+		 * to UTC. FIXME: We should really use one timezone for the
+		 * entire time the dialog is shown. Otherwise if the user
+		 * changes the timezone, the COMPLETED date may get changed
+		 * as well. */
 		icaltimezone_convert_time (&icalcomplete, zone,
 				icaltimezone_get_utc_timezone ());
 		e_cal_component_set_completed (comp, &icalcomplete);
@@ -461,7 +461,7 @@ get_widgets (TaskDetailsPage *tdpage)
 		return FALSE;
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -499,7 +499,9 @@ get_widgets (TaskDetailsPage *tdpage)
 }
 
 static void
-complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
+complete_date_changed (TaskDetailsPage *tdpage,
+                       time_t ctime,
+                       gboolean complete)
 {
 	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
 	icaltimezone *zone;
@@ -573,7 +575,8 @@ date_changed_cb (EDateEdit *dedit,
 }
 
 static void
-status_changed (GtkWidget *combo, TaskDetailsPage *tdpage)
+status_changed (GtkWidget *combo,
+                TaskDetailsPage *tdpage)
 {
 	TaskDetailsPagePrivate *priv;
 	icalproperty_status status;
@@ -618,7 +621,8 @@ status_changed (GtkWidget *combo, TaskDetailsPage *tdpage)
 }
 
 static void
-percent_complete_changed (GtkAdjustment	*adj, TaskDetailsPage *tdpage)
+percent_complete_changed (GtkAdjustment *adj,
+                          TaskDetailsPage *tdpage)
 {
 	TaskDetailsPagePrivate *priv;
 	gint percent;
@@ -673,7 +677,7 @@ init_widgets (TaskDetailsPage *tdpage)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tdpage));
 
 	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
+	 * current time. */
 	e_date_edit_set_get_time_callback (
 		E_DATE_EDIT (priv->completed_date),
 		(EDateEditGetTimeCallback) comp_editor_get_current_time,
@@ -689,8 +693,8 @@ init_widgets (TaskDetailsPage *tdpage)
 		priv->url_entry);
 
 	/* Connect signals. The Status, Percent Complete & Date Completed
-	   properties are closely related so whenever one changes we may need
-	   to update the other 2. */
+	 * properties are closely related so whenever one changes we may need
+	 * to update the other 2. */
 	g_signal_connect (
 		GTK_COMBO_BOX (priv->status_combo), "changed",
 		G_CALLBACK (status_changed), tdpage);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index ee31eb0a1c..31593e0a04 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -377,7 +377,8 @@ task_editor_init (TaskEditor *te)
 }
 
 static void
-task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
+task_editor_edit_comp (CompEditor *editor,
+                       ECalComponent *comp)
 {
 	TaskEditorPrivate *priv;
 	ECalComponentOrganizer organizer;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 958eac682b..d88976be75 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -546,14 +546,14 @@ task_page_fill_widgets (CompEditorPage *page,
 		e_date_edit_set_time (E_DATE_EDIT (priv->due_date), -1);
 
 		/* If no time is set, we use the default timezone, so the
-		   user usually doesn't have to set this when they set the
-		   date. */
+		 * user usually doesn't have to set this when they set the
+		 * date. */
 		zone = NULL;
 	}
 
 	/* Note that if we are creating a new task, the timezones may not be
-	   on the server, so we try to get the builtin timezone with the TZID
-	   first. */
+	 * on the server, so we try to get the builtin timezone with the TZID
+	 * first. */
 	if (!zone && d.tzid) {
 		GError *error = NULL;
 		if (!e_cal_client_get_timezone_sync (client, d.tzid, &zone, NULL, &error))
@@ -1018,7 +1018,8 @@ task_page_init (TaskPage *tpage)
 }
 
 void
-task_page_set_view_role (TaskPage *page, gboolean state)
+task_page_set_view_role (TaskPage *page,
+                         gboolean state)
 {
 	TaskPagePrivate *priv = page->priv;
 
@@ -1026,7 +1027,8 @@ task_page_set_view_role (TaskPage *page, gboolean state)
 }
 
 void
-task_page_set_view_status (TaskPage *page, gboolean state)
+task_page_set_view_status (TaskPage *page,
+                           gboolean state)
 {
 	TaskPagePrivate *priv = page->priv;
 
@@ -1034,7 +1036,8 @@ task_page_set_view_status (TaskPage *page, gboolean state)
 }
 
 void
-task_page_set_view_type (TaskPage *page, gboolean state)
+task_page_set_view_type (TaskPage *page,
+                         gboolean state)
 {
 	TaskPagePrivate *priv = page->priv;
 
@@ -1042,7 +1045,8 @@ task_page_set_view_type (TaskPage *page, gboolean state)
 }
 
 void
-task_page_set_view_rsvp (TaskPage *page, gboolean state)
+task_page_set_view_rsvp (TaskPage *page,
+                         gboolean state)
 {
 	TaskPagePrivate *priv = page->priv;
 
@@ -1076,7 +1080,8 @@ task_page_show_options (TaskPage *page)
 }
 
 void
-task_page_set_assignment (TaskPage *page, gboolean set)
+task_page_set_assignment (TaskPage *page,
+                          gboolean set)
 {
 	g_return_if_fail (IS_TASK_PAGE (page));
 
@@ -1085,7 +1090,8 @@ task_page_set_assignment (TaskPage *page, gboolean set)
 }
 
 static void
-add_clicked_cb (GtkButton *btn, TaskPage *page)
+add_clicked_cb (GtkButton *btn,
+                TaskPage *page)
 {
 	EMeetingAttendee *attendee;
 	CompEditor *editor;
@@ -1120,7 +1126,8 @@ static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
 }
 
 static gboolean
-existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
+existing_attendee (EMeetingAttendee *ia,
+                   ECalComponent *comp)
 {
 	GSList *attendees, *l;
 	const gchar *ia_address;
@@ -1156,7 +1163,8 @@ existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 }
 
 static void
-remove_attendee (TaskPage *page, EMeetingAttendee *ia)
+remove_attendee (TaskPage *page,
+                 EMeetingAttendee *ia)
 {
 	TaskPagePrivate *priv = page->priv;
 	CompEditor *editor;
@@ -1167,7 +1175,7 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia)
 	flags = comp_editor_get_flags (editor);
 
 	/* If the user deletes the organizer attendee explicitly,
-	   assume they no longer want the organizer showing up */
+	 * assume they no longer want the organizer showing up */
 	if (ia == priv->ia) {
 		g_object_unref (priv->ia);
 		priv->ia = NULL;
@@ -1209,7 +1217,8 @@ remove_attendee (TaskPage *page, EMeetingAttendee *ia)
 }
 
 static void
-remove_clicked_cb (GtkButton *btn, TaskPage *page)
+remove_clicked_cb (GtkButton *btn,
+                   TaskPage *page)
 {
 	TaskPagePrivate *priv;
 	EMeetingAttendee *ia;
@@ -1231,7 +1240,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page)
 	}
 	paths = g_list_reverse (paths);
 
-	for (tmp = paths; tmp; tmp=tmp->next) {
+	for (tmp = paths; tmp; tmp = tmp->next) {
 		path = tmp->data;
 
 		gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->meeting_store), &iter, path);
@@ -1310,8 +1319,10 @@ attendee_added_cb (EMeetingListView *emlv,
 }
 
 static gboolean
-list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) {
-
+list_view_event (EMeetingListView *list_view,
+                 GdkEvent *event,
+                 TaskPage *page)
+{
 	TaskPagePrivate *priv= page->priv;
 	CompEditor *editor;
 	CompEditorFlags flags;
@@ -1336,7 +1347,9 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) {
 }
 
 static gboolean
-list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
+list_key_press (EMeetingListView *list_view,
+                GdkEventKey *event,
+                TaskPage *page)
 {
 	if (event->keyval == GDK_KEY_Delete) {
 
@@ -1353,7 +1366,8 @@ list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
 }
 
 void
-task_page_set_show_timezone (TaskPage *page, gboolean state)
+task_page_set_show_timezone (TaskPage *page,
+                             gboolean state)
 {
 	if (state) {
 		gtk_widget_show_all (page->priv->timezone);
@@ -1366,7 +1380,8 @@ task_page_set_show_timezone (TaskPage *page, gboolean state)
 }
 
 void
-task_page_set_show_categories (TaskPage *page, gboolean state)
+task_page_set_show_categories (TaskPage *page,
+                               gboolean state)
 {
 	if (state) {
 		gtk_widget_show (page->priv->categories_btn);
@@ -1379,7 +1394,9 @@ task_page_set_show_categories (TaskPage *page, gboolean state)
 
 /*If the msg has some value set, the icon should always be set */
 void
-task_page_set_info_string (TaskPage *tpage, const gchar *icon, const gchar *msg)
+task_page_set_info_string (TaskPage *tpage,
+                           const gchar *icon,
+                           const gchar *msg)
 {
 	TaskPagePrivate *priv;
 
@@ -1414,7 +1431,7 @@ get_widgets (TaskPage *tpage)
 		return FALSE;
 
 	/* Get the GtkAccelGroup from the toplevel window, so we can install
-	   it when the notebook page is mapped. */
+	 * it when the notebook page is mapped. */
 	toplevel = gtk_widget_get_toplevel (priv->main);
 	accel_groups = gtk_accel_groups_from_object (G_OBJECT (toplevel));
 	if (accel_groups)
@@ -1585,11 +1602,11 @@ categories_clicked_cb (GtkWidget *button,
 
 static gboolean
 check_start_before_end (struct icaltimetype *start_tt,
-			icaltimezone *start_zone,
-			struct icaltimetype *end_tt,
-			icaltimezone *end_zone,
-			gboolean adjust_end_time,
-			gboolean adjust_by_hour)
+                        icaltimezone *start_zone,
+                        struct icaltimetype *end_tt,
+                        icaltimezone *end_zone,
+                        gboolean adjust_end_time,
+                        gboolean adjust_by_hour)
 {
 	struct icaltimetype end_tt_copy;
 	gint cmp;
@@ -1599,7 +1616,7 @@ check_start_before_end (struct icaltimetype *start_tt,
 	icaltimezone_convert_time (&end_tt_copy, end_zone, start_zone);
 
 	/* Now check if the start time is after the end time. If it is,
-	   we need to modify one of the times. */
+	 * we need to modify one of the times. */
 	cmp = icaltime_compare (*start_tt, end_tt_copy);
 	if (cmp > 0) {
 		if (adjust_end_time) {
@@ -1634,7 +1651,8 @@ check_start_before_end (struct icaltimetype *start_tt,
  * otherwise times will differ one hour.
  */
 static void
-times_updated (TaskPage *tpage, gboolean adjust_end_time)
+times_updated (TaskPage *tpage,
+               gboolean adjust_end_time)
 {
 	TaskPagePrivate *priv;
 	struct icaltimetype start_tt = icaltime_null_time ();
@@ -1704,7 +1722,9 @@ due_date_changed_cb (TaskPage *tpage)
 }
 
 static void
-tpage_client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer user_data)
+tpage_client_opened_cb (GObject *source_object,
+                        GAsyncResult *result,
+                        gpointer user_data)
 {
 	ESource *source = E_SOURCE (source_object);
 	EClient *client = NULL;
@@ -1775,7 +1795,8 @@ tpage_client_opened_cb (GObject *source_object, GAsyncResult *result, gpointer u
 }
 
 static void
-source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage)
+source_changed_cb (ESourceComboBox *source_combo_box,
+                   TaskPage *tpage)
 {
 	TaskPagePrivate *priv = tpage->priv;
 	ESource *source;
@@ -1791,13 +1812,16 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage)
 	}
 	priv->open_cancellable = g_cancellable_new ();
 
-	e_client_utils_open_new (source, E_CLIENT_SOURCE_TYPE_TASKS, FALSE, priv->open_cancellable,
-				 e_client_utils_authenticate_handler, NULL,
-				 tpage_client_opened_cb, tpage);
+	e_client_utils_open_new (
+		source, E_CLIENT_SOURCE_TYPE_TASKS,
+		FALSE, priv->open_cancellable,
+		e_client_utils_authenticate_handler, NULL,
+		tpage_client_opened_cb, tpage);
 }
 
 static void
-set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address)
+set_subscriber_info_string (TaskPage *tpage,
+                            const gchar *backend_address)
 {
 	CompEditor *editor;
 	ECalClient *client;
@@ -1810,7 +1834,7 @@ set_subscriber_info_string (TaskPage *tpage, const gchar *backend_address)
 	if (e_source_get_property (source, "subscriber")) {
 		g_free (tpage->priv->subscriber_info_text);
 		/* Translators: This string is used when we are creating a Task
-		   on behalf of some other user */
+		 * on behalf of some other user */
 		tpage->priv->subscriber_info_text = g_markup_printf_escaped (_("You are acting on behalf of %s"), backend_address);
 	} else {
 		g_free (tpage->priv->subscriber_info_text);
@@ -1865,7 +1889,7 @@ init_widgets (TaskPage *tpage)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage));
 
 	/* Make sure the EDateEdit widgets use our timezones to get the
-	   current time. */
+	 * current time. */
 	e_date_edit_set_get_time_callback (
 		E_DATE_EDIT (priv->start_date),
 		(EDateEditGetTimeCallback) comp_editor_get_current_time,
@@ -1881,7 +1905,7 @@ init_widgets (TaskPage *tpage)
 	gtk_widget_hide (priv->info_hbox);
 
 	/* Summary */
-	g_signal_connect((priv->summary), "changed",
+	g_signal_connect ((priv->summary), "changed",
 			    G_CALLBACK (summary_changed_cb), tpage);
 
 	/* Description */
@@ -1892,23 +1916,23 @@ init_widgets (TaskPage *tpage)
 	e_buffer_tagger_connect (GTK_TEXT_VIEW (priv->description));
 
 	/* Dates */
-	g_signal_connect((priv->start_date), "changed",
+	g_signal_connect ((priv->start_date), "changed",
 			    G_CALLBACK (date_changed_cb), tpage);
-	g_signal_connect((priv->due_date), "changed",
+	g_signal_connect ((priv->due_date), "changed",
 			    G_CALLBACK (date_changed_cb), tpage);
 
 	/* time zone changed */
 	g_signal_connect (priv->timezone, "changed", G_CALLBACK(timezone_changed_cb), tpage);
 
 	/* Categories button */
-	g_signal_connect((priv->categories_btn), "clicked",
+	g_signal_connect ((priv->categories_btn), "clicked",
 			    G_CALLBACK (categories_clicked_cb), tpage);
 
 	/* Source selector */
 	g_signal_connect (priv->source_selector, "changed", G_CALLBACK (source_changed_cb), tpage);
 
 	/* Connect the default signal handler to use to make sure the "changed"
-	   field gets set whenever a field is changed. */
+	 * field gets set whenever a field is changed. */
 
 	/* Belongs to priv->description */
 	g_signal_connect_swapped (
@@ -1953,7 +1977,7 @@ init_widgets (TaskPage *tpage)
 	g_signal_connect (priv->remove, "clicked", G_CALLBACK (remove_clicked_cb), tpage);
 
 	/* Contacts button */
-	g_signal_connect(priv->invite, "clicked", G_CALLBACK (invite_cb), tpage);
+	g_signal_connect (priv->invite, "clicked", G_CALLBACK (invite_cb), tpage);
 
 	/* Meeting List View */
 	g_signal_connect (priv->list_view, "attendee_added", G_CALLBACK (attendee_added_cb), tpage);
@@ -1999,7 +2023,8 @@ init_widgets (TaskPage *tpage)
 
 
 static void
-task_page_select_organizer (TaskPage *tpage, const gchar *backend_address)
+task_page_select_organizer (TaskPage *tpage,
+                            const gchar *backend_address)
 {
 	TaskPagePrivate *priv = tpage->priv;
 	CompEditor *editor;
@@ -2117,7 +2142,8 @@ task_page_construct (TaskPage *tpage,
  * not be created.
  **/
 TaskPage *
-task_page_new (EMeetingStore *model, CompEditor *editor)
+task_page_new (EMeetingStore *model,
+               CompEditor *editor)
 {
 	TaskPage *tpage;
 	ECalClient *client;