Coding style cleanups.

61 files changed, 316 insertions, 316 deletions

diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index aa42987caa..551c064078 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -281,7 +281,7 @@ notified_alarms_dialog_new (void)
 
 	e_buffer_tagger_connect (GTK_TEXT_VIEW (an->description));
 
-	gtk_tree_view_set_model (GTK_TREE_VIEW(an->treeview), model);
+	gtk_tree_view_set_model (GTK_TREE_VIEW (an->treeview), model);
 
 	gtk_window_set_keep_above (GTK_WINDOW (an->dialog), TRUE);
 
@@ -383,7 +383,7 @@ add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigge
 	funcinfo->func = func;
 	funcinfo->func_data = func_data;
 
-	gtk_list_store_append (GTK_LIST_STORE(model), &iter);
+	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
 
 	current_zone = config_data_get_timezone ();
 	start = timet_to_str_with_zone (occur_start, current_zone);
@@ -393,17 +393,17 @@ add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigge
 		summary, start, str_time);
 	g_free (start);
 	g_free (end);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter,
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
 		ALARM_DISPLAY_COLUMN, to_display, -1);
 	g_free (to_display);
 	g_free (str_time);
 
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_SUMMARY_COLUMN, summary, -1);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_DESCRIPTION_COLUMN, description, -1);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_LOCATION_COLUMN, location, -1);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_START_COLUMN, occur_start, -1);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_END_COLUMN, occur_end, -1);
-	gtk_list_store_set (GTK_LIST_STORE(model), &iter, ALARM_FUNCINFO_COLUMN, funcinfo, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_SUMMARY_COLUMN, summary, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_DESCRIPTION_COLUMN, description, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_LOCATION_COLUMN, location, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_START_COLUMN, occur_start, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_END_COLUMN, occur_end, -1);
+	gtk_list_store_set (GTK_LIST_STORE (model), &iter, ALARM_FUNCINFO_COLUMN, funcinfo, -1);
 
 	return iter;
 }
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 9b397ca415..7dc63abf6f 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -187,7 +187,7 @@ message_push (Message *msg)
  * use a static ring-buffer so we can call this twice
  * in a printf without getting nonsense results.
  */
-d(#define DEBUGGING_ON)
+d (#define DEBUGGING_ON)
 #ifdef DEBUGGING_ON
 static const gchar *
 e_ctime (const time_t *timep)
@@ -482,7 +482,7 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms)
 		ECalComponentAlarmInstance *instance;
 		gpointer alarm_id;
 		QueuedAlarm *qa;
-		d(time_t tnow = time(NULL));
+		d (time_t tnow = time (NULL));
 
 		instance = l->data;
 
@@ -594,7 +594,7 @@ load_alarms_for_today (ClientAlarms *ca)
 
 	day_end = time_day_end_with_zone (now, zone);
 	d(printf("%s:%d (load_alarms_for_today) - From %s to %s\n",__FILE__, __LINE__,
-		 g_strdup (ctime (&from)), g_strdup (e_ctime(&day_end))));
+		 g_strdup (ctime (&from)), g_strdup (e_ctime (&day_end))));
 	load_alarms (ca, from, day_end);
 }
 
@@ -1607,7 +1607,7 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	}
 
 	n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL);
-	if (!notify_notification_show(n, NULL))
+	if (!notify_notification_show (n, NULL))
 	    g_warning ("Could not send notification to daemon\n");
 
 	/* create the private structure */
@@ -1659,7 +1659,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa,
 			flag = 1;
 #ifdef HAVE_CANBERRA
 			ca_context_play (
-				ca_gtk_context_get(), 0,
+				ca_gtk_context_get (), 0,
 				CA_PROP_MEDIA_FILENAME, filename, NULL);
 #endif
 		}
@@ -1986,7 +1986,7 @@ alarm_queue_add_async (struct _alarm_client_msg *msg)
 	ca = lookup_client (client);
 	if (ca) {
 		/* We already have it. Unref the passed one*/
-		g_object_unref(client);
+		g_object_unref (client);
 		return;
 	}
 
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index eb0f52425d..8c56abaff2 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -78,7 +78,7 @@ main (gint argc, gchar **argv)
 	 *       this once that is fixed. */
 
 	/* Initialize Camel's type system. */
-	camel_object_get_type();
+	camel_object_get_type ();
 
 	icon_theme = gtk_icon_theme_get_default ();
 	gtk_icon_theme_append_search_path (icon_theme, EVOLUTION_ICONDIR);
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index dcc2677610..a98e55d999 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -197,7 +197,7 @@ calendar_config_get_24_hour_format	(void)
 	/* If the locale defines 'am' and 'pm' strings then the user has the
 	   choice of 12-hour or 24-hour time format, with 12-hour as the
 	   default. If the locale doesn't have 'am' and 'pm' strings we have
-	   to use 24-hour format, or strftime()/strptime() won't work. */
+	   to use 24-hour format, or strftime ()/strptime () won't work. */
 	if (calendar_config_locale_supports_12_hour_format ())
 		return gconf_client_get_bool (config, CALENDAR_CONFIG_24HOUR, NULL);
 
@@ -345,7 +345,7 @@ calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
 GSList   *
 calendar_config_get_tasks_selected (void)
 {
-	calendar_config_init();
+	calendar_config_init ();
 
 	return gconf_client_get_list (config, CALENDAR_CONFIG_TASKS_SELECTED_TASKS, GCONF_VALUE_STRING, NULL);
 }
@@ -589,7 +589,7 @@ calendar_config_set_default_reminder_units (CalUnits units)
 {
 	calendar_config_init ();
 
-	gconf_client_set_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, units_to_string(units), NULL);
+	gconf_client_set_string (config, CALENDAR_CONFIG_DEFAULT_REMINDER_UNITS, units_to_string (units), NULL);
 }
 
 /**
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index 191abfa813..6ca9457af9 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -114,11 +114,11 @@ void	  calendar_config_set_memos_selected (GSList *selected);
 gboolean  calendar_config_get_hide_completed_tasks	(void);
 void	  calendar_config_set_hide_completed_tasks	(gboolean	hide);
 
-CalUnits  calendar_config_get_hide_completed_tasks_units(void);
-void	  calendar_config_set_hide_completed_tasks_units(CalUnits	units);
+CalUnits  calendar_config_get_hide_completed_tasks_units (void);
+void	  calendar_config_set_hide_completed_tasks_units (CalUnits	units);
 
-gint	  calendar_config_get_hide_completed_tasks_value(void);
-void	  calendar_config_set_hide_completed_tasks_value(gint		value);
+gint	  calendar_config_get_hide_completed_tasks_value (void);
+void	  calendar_config_set_hide_completed_tasks_value (gint		value);
 
 gchar *	  calendar_config_get_hide_completed_tasks_sexp (gboolean get_completed);
 
@@ -141,7 +141,7 @@ void calendar_config_set_free_busy (GSList * url_list);
 
 /* Returns TRUE if the locale has 'am' and 'pm' strings defined, i.e. it
    supports 12-hour time format. */
-gboolean  calendar_config_locale_supports_12_hour_format(void);
+gboolean  calendar_config_locale_supports_12_hour_format (void);
 
 void	  calendar_config_set_dir_path (const gchar *);
 gchar *	  calendar_config_get_dir_path (void);
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index f7827413b7..acb4423f71 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -481,7 +481,7 @@ malarm_widgets_to_alarm (Dialog *dialog, ECalComponentAlarm *alarm)
 	/* remove the X-EVOLUTION-NEEDS-DESCRIPTION property, so that
 	 * we don't re-set the alarm's description */
 	icalcomp = e_cal_component_alarm_get_icalcomponent (alarm);
-	icalprop = icalcomponent_get_first_property(icalcomp, ICAL_X_PROPERTY);
+	icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
 	while (icalprop) {
 		const gchar *x_name;
 
@@ -527,7 +527,7 @@ alarm_to_malarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
                     e_destination_set_email (dest, a->value);
             }
             e_destination_store_append_destination (destination_store, dest);
-            g_object_unref(GTK_OBJECT (dest));
+            g_object_unref (GTK_OBJECT (dest));
         }
         e_cal_component_free_attendee_list (attendee_list);
     }
@@ -1217,7 +1217,7 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	e_load_ui_builder_definition (dialog.builder, "alarm-dialog.ui");
 
 	if (!get_widgets (&dialog)) {
-		g_object_unref(dialog.builder);
+		g_object_unref (dialog.builder);
 		return FALSE;
 	}
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index b8588d666d..0fb09c6c29 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -271,7 +271,7 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	e_load_ui_builder_definition (dialog.builder, "alarm-list-dialog.ui");
 
 	if (!get_widgets (&dialog)) {
-		g_object_unref(dialog.builder);
+		g_object_unref (dialog.builder);
 		return FALSE;
 	}
 
@@ -316,7 +316,7 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 	e_load_ui_builder_definition (dialog->builder, "alarm-list-dialog.ui");
 
 	if (!get_widgets (dialog)) {
-		g_object_unref(dialog->builder);
+		g_object_unref (dialog->builder);
 		return NULL;
 	}
 
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 6d3adfe733..259533877a 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -223,7 +223,7 @@ comp_editor_strip_categories (const gchar *categories)
 				start = p;
 				end = p;
 			} else
-				end = g_utf8_next_char(p) - 1;
+				end = g_utf8_next_char (p) - 1;
 		}
 	}
 
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 6c5092e508..69cb2f2479 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -428,7 +428,7 @@ save_comp (CompEditor *editor)
 		}
 
 		/* retrieve all timezones */
-		if (IS_COMP_EDITOR_PAGE(l->data))
+		if (IS_COMP_EDITOR_PAGE (l->data))
 			comp_editor_page_fill_timezones (l->data, timezones);
 	}
 
@@ -520,7 +520,7 @@ save_comp (CompEditor *editor)
 			GTK_BUTTONS_OK,
 			"%s", (error != NULL) ? error->message :
 			_("Could not update object"));
-		gtk_dialog_run (GTK_DIALOG(dialog));
+		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
 
 		if (error)
@@ -810,15 +810,15 @@ action_save_cb (GtkAction *action,
 		gboolean response = 1;
 	/*FIXME: Cannot use mail functions from calendar!!!! */
 #if 0
-		ECalComponentVType vtype = e_cal_component_get_vtype(editor->priv->comp);
+		ECalComponentVType vtype = e_cal_component_get_vtype (editor->priv->comp);
 
 		if (vtype == E_CAL_COMPONENT_EVENT)
-			response = em_utils_prompt_user((GtkWindow *)widget,
+			response = em_utils_prompt_user ((GtkWindow *)widget,
 							 NULL,
 							 "calendar:ask-send-event-pending-download",
 							  NULL);
 		else
-			response = em_utils_prompt_user((GtkWindow *)widget,
+			response = em_utils_prompt_user ((GtkWindow *)widget,
 							 NULL,
 							 "calendar:ask-send-task-pending-download",
 							  NULL);
@@ -1872,7 +1872,7 @@ prompt_and_save_changes (CompEditor *editor, gboolean send)
 	if (!priv->changed)
 		return TRUE;
 
-	switch (save_component_dialog (GTK_WINDOW(editor), priv->comp)) {
+	switch (save_component_dialog (GTK_WINDOW (editor), priv->comp)) {
 	case GTK_RESPONSE_YES: /* Save */
 		if (!e_cal_is_read_only (priv->client, &read_only, NULL) || read_only) {
 			e_alert_run_dialog_for_args (
@@ -2341,7 +2341,7 @@ comp_editor_append_widget (CompEditor *editor,
 	g_signal_connect (
 		page, "map",
 		G_CALLBACK (page_mapped_cb), page);
-	g_signal_connect(
+	g_signal_connect (
 		page, "unmap",
 		G_CALLBACK (page_unmapped_cb), page);
 		*/
@@ -2408,7 +2408,7 @@ comp_editor_append_page (CompEditor *editor,
 	g_signal_connect (
 		page_widget, "map",
 		G_CALLBACK (page_mapped_cb), page);
-	g_signal_connect(
+	g_signal_connect (
 		page_widget, "unmap",
 		G_CALLBACK (page_unmapped_cb), page);
 
@@ -2642,7 +2642,7 @@ fill_widgets (CompEditor *editor)
 		action, G_CALLBACK (action_classification_cb), editor);
 
 	for (iter = priv->pages; iter != NULL; iter = iter->next) {
-		if (IS_COMP_EDITOR_PAGE(iter->data))
+		if (IS_COMP_EDITOR_PAGE (iter->data))
 			comp_editor_page_fill_widgets (iter->data, priv->comp);
 	}
 
@@ -2699,7 +2699,7 @@ set_attendees_for_delegation (ECalComponent *comp,
 		const gchar *attendee = icalproperty_get_attendee (prop);
 		const gchar *delfrom = NULL;
 
-		param = icalproperty_get_first_parameter(prop, ICAL_DELEGATEDFROM_PARAMETER);
+		param = icalproperty_get_first_parameter (prop, ICAL_DELEGATEDFROM_PARAMETER);
 		if (param)
 			delfrom = icalparameter_get_delegatedfrom (param);
 		if (!(g_str_equal (itip_strip_mailto (attendee), address) ||
@@ -2901,7 +2901,7 @@ comp_editor_get_current_comp (CompEditor *editor, gboolean *correct)
 	comp_editor_copy_new_attendees (comp, priv->comp);
 	if (priv->changed) {
 		for (l = priv->pages; l != NULL; l = l->next) {
-			if (IS_COMP_EDITOR_PAGE(l->data))
+			if (IS_COMP_EDITOR_PAGE (l->data))
 				all_ok = comp_editor_page_fill_component (l->data, comp) && all_ok;
 		}
 	}
@@ -3076,7 +3076,7 @@ page_dates_changed_cb (CompEditor *editor,
 	GList *l;
 
 	for (l = priv->pages; l != NULL; l = l->next)
-		if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE(l->data))
+		if (page != (CompEditorPage *) l->data && IS_COMP_EDITOR_PAGE (l->data))
 			comp_editor_page_set_dates (l->data, dates);
 
 	if (!priv->warned && priv->existing_org && !priv->user_org &&
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index bd26ce8b66..09ced8f533 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -150,7 +150,7 @@ void		comp_editor_delete_comp		(CompEditor *editor);
 gboolean	comp_editor_send_comp		(CompEditor *editor,
 						 ECalComponentItipMethod method,
 						 gboolean strip_alarms);
-GSList *	comp_editor_get_mime_attach_list(CompEditor *editor);
+GSList *	comp_editor_get_mime_attach_list (CompEditor *editor);
 gboolean	comp_editor_close		(CompEditor *editor);
 
 void		comp_editor_sensitize_attachment_bar
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 396b9b8d08..2e727ebbbc 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -326,7 +326,7 @@ event_editor_constructor (GType type,
 		G_CALLBACK (gtk_widget_hide), NULL);
 	g_signal_connect (
 		priv->recur_window, "delete-event",
-		G_CALLBACK(gtk_widget_hide_on_delete), NULL);
+		G_CALLBACK (gtk_widget_hide_on_delete), NULL);
 
 	content_area =
 		gtk_dialog_get_content_area (GTK_DIALOG (priv->recur_window));
@@ -358,7 +358,7 @@ event_editor_constructor (GType type,
 		/* Alarm page */
 		alarm_page = event_page_get_alarm_page (priv->event_page);
 		comp_editor_append_widget (editor, alarm_page, _("Alarm"), TRUE);
-		g_object_unref(alarm_page);
+		g_object_unref (alarm_page);
 
 	}
 
@@ -383,7 +383,7 @@ event_editor_constructor (GType type,
 		if (e_shell_get_express_mode (shell)) {
 			attendee_page = event_page_get_attendee_page (priv->event_page);
 			comp_editor_append_widget (editor, attendee_page, _("Attendees"), TRUE);
-			g_object_unref(attendee_page);
+			g_object_unref (attendee_page);
 		}
 	}
 
@@ -673,18 +673,18 @@ event_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 				EIterator *it;
 
 				accounts = itip_addresses_get ();
-				for (it = e_list_get_iterator((EList *)accounts);
-					e_iterator_is_valid(it);
-					e_iterator_next(it)) {
+				for (it = e_list_get_iterator ((EList *)accounts);
+					e_iterator_is_valid (it);
+					e_iterator_next (it)) {
 					EMeetingAttendee *ia;
 
-					account = (EAccount*)e_iterator_get(it);
+					account = (EAccount*)e_iterator_get (it);
 
 					ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row);
 					if (ia != NULL)
 						e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS);
 				}
-				g_object_unref(it);
+				g_object_unref (it);
 			} else if (e_cal_get_organizer_must_attend (client)) {
 				EMeetingAttendee *ia;
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index b221368f94..e4e034fd16 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -455,7 +455,7 @@ update_time (EventPage *epage, ECalComponentDateTime *start_date, ECalComponentD
 		e_timezone_entry_set_timezone (E_TIMEZONE_ENTRY (priv->start_timezone),
 					       start_zone);
 	def_zone = calendar_config_get_icaltimezone ();
-	if (!def_zone || !start_zone || strcmp (icaltimezone_get_tzid(def_zone), icaltimezone_get_tzid (start_zone)))
+	if (!def_zone || !start_zone || strcmp (icaltimezone_get_tzid (def_zone), icaltimezone_get_tzid (start_zone)))
 		 homezone = FALSE;
 
 	action = comp_editor_get_action (editor, "view-time-zone");
@@ -952,8 +952,8 @@ get_current_account (EventPage *epage)
 	if (!str)
 		return NULL;
 
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
+	for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) {
+		EAccount *a = (EAccount *)e_iterator_get (it);
 		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
@@ -1659,8 +1659,8 @@ static
 void update_end_time_combo (EventPage *epage)
 {
 	EventPagePrivate *priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
+	struct icaltimetype start_tt = icaltime_null_time ();
+	struct icaltimetype end_tt = icaltime_null_time ();
 	time_t start_timet,end_timet;
 	gint hours,minutes;
 
@@ -1709,7 +1709,7 @@ hour_minute_changed (EventPage *epage)
 {
 	EventPagePrivate *priv;
 	gint for_hours, for_minutes;
-	struct icaltimetype end_tt = icaltime_null_time();
+	struct icaltimetype end_tt = icaltime_null_time ();
 
 	priv = epage->priv;
 
@@ -1892,7 +1892,7 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage)
 	for (tmp = paths; tmp; tmp=tmp->next) {
 		path = tmp->data;
 
-		gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path);
+		gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
 
 		gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
 		ia = e_meeting_store_find_attendee (priv->model, address, NULL);
@@ -2014,8 +2014,8 @@ void
 event_page_set_all_day_event (EventPage *epage, gboolean all_day)
 {
 	EventPagePrivate *priv = epage->priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
+	struct icaltimetype start_tt = icaltime_null_time ();
+	struct icaltimetype end_tt = icaltime_null_time ();
 	CompEditor *editor;
 	GtkAction *action;
 	gboolean date_set;
@@ -2171,7 +2171,7 @@ event_page_set_info_string (EventPage *epage, const gchar *icon, const gchar *ms
 	priv = epage->priv;
 
 	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
-	gtk_label_set_markup (GTK_LABEL(priv->info_string), msg);
+	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
 		gtk_widget_show (priv->info_hbox);
@@ -2415,8 +2415,8 @@ static void
 times_updated (EventPage *epage, gboolean adjust_end_time)
 {
 	EventPagePrivate *priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
+	struct icaltimetype start_tt = icaltime_null_time ();
+	struct icaltimetype end_tt = icaltime_null_time ();
 	gboolean date_set, all_day_event;
 	gboolean set_start_date = FALSE, set_end_date = FALSE;
 	icaltimezone *start_zone;
@@ -2660,7 +2660,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
 		if (client) {
 			gchar *backend_addr = NULL;
 
-			e_cal_get_cal_address(client, &backend_addr, NULL);
+			e_cal_get_cal_address (client, &backend_addr, NULL);
 
 			if (priv->is_meeting)
 				event_page_select_organizer (epage, backend_addr);
@@ -2979,7 +2979,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);
 
@@ -3081,7 +3081,7 @@ event_page_select_organizer (EventPage *epage, const gchar *backend_address)
 	ESource *source = NULL;
 	const gchar *user_addr = NULL;
 
-	def_account = itip_addresses_get_default();
+	def_account = itip_addresses_get_default ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -3159,12 +3159,12 @@ event_page_construct (EventPage *epage, EMeetingStore *model)
 	}
 
 	priv->accounts = itip_addresses_get ();
-	for (it = e_list_get_iterator((EList *)priv->accounts);
-	     e_iterator_is_valid(it);
-	     e_iterator_next(it)) {
+	for (it = e_list_get_iterator ((EList *)priv->accounts);
+	     e_iterator_is_valid (it);
+	     e_iterator_next (it)) {
 		gchar *full = NULL;
 
-		a = (EAccount *)e_iterator_get(it);
+		a = (EAccount *)e_iterator_get (it);
 
 		/* skip disabled accounts */
 		if (!a->enabled)
@@ -3172,10 +3172,10 @@ event_page_construct (EventPage *epage, EMeetingStore *model)
 
 		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
-		priv->address_strings = g_list_append(priv->address_strings, full);
+		priv->address_strings = g_list_append (priv->address_strings, full);
 	}
 
-	g_object_unref(it);
+	g_object_unref (it);
 
 	if (priv->address_strings) {
 		GList *l;
@@ -3331,7 +3331,7 @@ event_page_get_alarm_page (EventPage *epage)
 
 	tmp = GW("dialog-vbox1");
 	alarm_page = GW("vbox2");
-	g_object_ref(alarm_page);
+	g_object_ref (alarm_page);
 	gtk_container_remove ((GtkContainer *)tmp, alarm_page);
 
 	return alarm_page;
@@ -3349,8 +3349,8 @@ event_page_get_attendee_page (EventPage *epage)
 	priv = epage->priv;
 
 	apage = priv->list_box;
-	g_object_ref(apage);
-	gtk_container_remove ((GtkContainer *)gtk_widget_get_parent(apage), apage);
+	g_object_ref (apage);
+	gtk_container_remove ((GtkContainer *)gtk_widget_get_parent (apage), apage);
 	gtk_widget_hide (priv->attendee_box);
 
 	return apage;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 735566b837..b7e3095e3f 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -564,8 +564,8 @@ get_current_account (MemoPage *page)
 	if (!str)
 		return NULL;
 
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
+	for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) {
+		EAccount *a = (EAccount *)e_iterator_get (it);
 		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
@@ -659,7 +659,7 @@ memo_page_fill_component (CompEditorPage *page,
 		if (i == 50 && uc && uc < (gunichar)-2)
 			sumText.value = txt = g_strdup_printf ("%.*s...", idxToUse, str);
 		else
-			sumText.value = txt = g_strndup(str, idxToUse);
+			sumText.value = txt = g_strndup (str, idxToUse);
 
 		sumText.altrep = NULL;
 
@@ -670,7 +670,7 @@ memo_page_fill_component (CompEditorPage *page,
 
 		e_cal_component_set_description_list (comp, &l);
 
-		g_free(txt);
+		g_free (txt);
 	}
 
 	if (str)
@@ -779,7 +779,7 @@ memo_page_set_info_string (MemoPage *mpage, const gchar *icon, const gchar *msg)
 	priv = mpage->priv;
 
 	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
-	gtk_label_set_markup (GTK_LABEL(priv->info_string), msg);
+	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
 		gtk_widget_show (priv->info_hbox);
@@ -914,7 +914,7 @@ source_changed_cb (ESourceComboBox *source_combo_box,
 		if (client) {
 			gchar *backend_addr = NULL;
 
-			e_cal_get_cal_address(client, &backend_addr, NULL);
+			e_cal_get_cal_address (client, &backend_addr, NULL);
 
 			if (flags & COMP_EDITOR_IS_SHARED)
 				memo_page_select_organizer (mpage, backend_addr);
@@ -1012,7 +1012,7 @@ init_widgets (MemoPage *mpage)
 	e_buffer_tagger_connect (view);
 
 	/* Categories button */
-	g_signal_connect(
+	g_signal_connect (
 		priv->categories_btn, "clicked",
 		G_CALLBACK (categories_clicked_cb), mpage);
 
@@ -1096,7 +1096,7 @@ memo_page_select_organizer (MemoPage *mpage, const gchar *backend_address)
 	ESource *source = NULL;
 	const gchar *user_addr = NULL;
 
-	def_account = itip_addresses_get_default();
+	def_account = itip_addresses_get_default ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -1169,12 +1169,12 @@ memo_page_construct (MemoPage *mpage)
 
 	if (flags & COMP_EDITOR_IS_SHARED) {
 		priv->accounts = itip_addresses_get ();
-		for (it = e_list_get_iterator((EList *)priv->accounts);
-				e_iterator_is_valid(it);
-				e_iterator_next(it)) {
+		for (it = e_list_get_iterator ((EList *)priv->accounts);
+				e_iterator_is_valid (it);
+				e_iterator_next (it)) {
 			gchar *full = NULL;
 
-			a = (EAccount *)e_iterator_get(it);
+			a = (EAccount *)e_iterator_get (it);
 
 			/* skip disabled accounts */
 			if (!a->enabled)
@@ -1182,10 +1182,10 @@ memo_page_construct (MemoPage *mpage)
 
 			full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
-			priv->address_strings = g_list_append(priv->address_strings, full);
+			priv->address_strings = g_list_append (priv->address_strings, full);
 		}
 
-		g_object_unref(it);
+		g_object_unref (it);
 
 		if (priv->address_strings) {
 			GList *l;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index c5944af194..555ca073c8 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -270,7 +270,7 @@ preview_recur (RecurrencePage *rpage)
 
 	tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp,
 			      client, zone, TRUE, FALSE);
-	g_object_unref(comp);
+	g_object_unref (comp);
 }
 
 static GObject *
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index 823bd4be52..0f9a6fba8e 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -43,12 +43,12 @@
 GtkResponseType
 save_component_dialog (GtkWindow *parent, ECalComponent *comp)
 {
-	ECalComponentVType vtype = e_cal_component_get_vtype(comp);
+	ECalComponentVType vtype = e_cal_component_get_vtype (comp);
 	CompEditorFlags flags;
 
 	switch (vtype) {
 		case E_CAL_COMPONENT_EVENT:
-			flags = comp_editor_get_flags (COMP_EDITOR(parent));
+			flags = comp_editor_get_flags (COMP_EDITOR (parent));
 			if (flags & COMP_EDITOR_MEETING)
 				return e_alert_run_dialog_for_args (parent, "calendar:prompt-save-meeting", NULL);
 			else
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 35ec225c19..ec63458d81 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -365,7 +365,7 @@ task_details_page_fill_component (CompEditorPage *page,
 		/* COMPLETED today or before */
 		icaltoday = icaltime_current_time_with_zone (zone);
 		icaltimezone_convert_time (&icaltoday, zone,
-				icaltimezone_get_utc_timezone());
+				icaltimezone_get_utc_timezone ());
 
 		if (icaltime_compare_date_only (icalcomplete, icaltoday) > 0) {
 			comp_editor_page_display_validation_error (
@@ -498,7 +498,7 @@ complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
 {
 	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
 	icaltimezone *zone;
-	struct icaltimetype completed_tt = icaltime_null_time();
+	struct icaltimetype completed_tt = icaltime_null_time ();
 
 	/* Get the current time in UTC. */
 	zone = icaltimezone_get_utc_timezone ();
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 5a9849db8e..476fb060d4 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -335,7 +335,7 @@ task_editor_init (TaskEditor *te)
 		G_CALLBACK (gtk_widget_hide), NULL);
 	g_signal_connect (
 		te->priv->task_details_window, "delete-event",
-		G_CALLBACK(gtk_widget_hide), NULL);
+		G_CALLBACK (gtk_widget_hide), NULL);
 
 	te->priv->task_details_page = task_details_page_new (editor);
 	content_area = gtk_dialog_get_content_area (
@@ -434,18 +434,18 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 			EIterator *it;
 
 			accounts = itip_addresses_get ();
-			for (it = e_list_get_iterator((EList *)accounts);
-				e_iterator_is_valid(it);
-				e_iterator_next(it)) {
+			for (it = e_list_get_iterator ((EList *)accounts);
+				e_iterator_is_valid (it);
+				e_iterator_next (it)) {
 				EMeetingAttendee *ia;
 
-				account = (EAccount*)e_iterator_get(it);
+				account = (EAccount*)e_iterator_get (it);
 
 				ia = e_meeting_store_find_attendee (priv->model, account->id->address, &row);
 				if (ia != NULL)
 					e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_STATUS);
 			}
-			g_object_unref(it);
+			g_object_unref (it);
 		} else if (e_cal_get_organizer_must_attend (client)) {
 			EMeetingAttendee *ia;
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 85c6bb15b8..7777f23dd0 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -483,8 +483,8 @@ get_current_account (TaskPage *page)
 	if (!str)
 		return NULL;
 
-	for (it = e_list_get_iterator((EList *)priv->accounts); e_iterator_is_valid(it); e_iterator_next(it)) {
-		EAccount *a = (EAccount *)e_iterator_get(it);
+	for (it = e_list_get_iterator ((EList *)priv->accounts); e_iterator_is_valid (it); e_iterator_next (it)) {
+		EAccount *a = (EAccount *)e_iterator_get (it);
 		gchar *full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
 		if (!g_ascii_strcasecmp (full, str)) {
@@ -1184,7 +1184,7 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page)
 	for (tmp = paths; tmp; tmp=tmp->next) {
 		path = tmp->data;
 
-		gtk_tree_model_get_iter (GTK_TREE_MODEL(priv->model), &iter, path);
+		gtk_tree_model_get_iter (GTK_TREE_MODEL (priv->model), &iter, path);
 
 		gtk_tree_model_get (GTK_TREE_MODEL (priv->model), &iter, E_MEETING_STORE_ADDRESS_COL, &address, -1);
 		ia = e_meeting_store_find_attendee (priv->model, address, NULL);
@@ -1357,7 +1357,7 @@ task_page_set_info_string (TaskPage *tpage, const gchar *icon, const gchar *msg)
 	priv = tpage->priv;
 
 	gtk_image_set_from_stock (GTK_IMAGE (priv->info_icon), icon, GTK_ICON_SIZE_BUTTON);
-	gtk_label_set_markup (GTK_LABEL(priv->info_string), msg);
+	gtk_label_set_markup (GTK_LABEL (priv->info_string), msg);
 
 	if (msg && icon)
 		gtk_widget_show (priv->info_hbox);
@@ -1489,8 +1489,8 @@ date_changed_cb (EDateEdit *dedit,
 	CompEditorPageDates dates;
 	gboolean date_set, time_set;
 	ECalComponentDateTime start_dt, due_dt;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype due_tt = icaltime_null_time();
+	struct icaltimetype start_tt = icaltime_null_time ();
+	struct icaltimetype due_tt = icaltime_null_time ();
 
 	if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage)))
 		return;
@@ -1624,8 +1624,8 @@ static void
 times_updated (TaskPage *tpage, gboolean adjust_end_time)
 {
 	TaskPagePrivate *priv;
-	struct icaltimetype start_tt = icaltime_null_time();
-	struct icaltimetype end_tt = icaltime_null_time();
+	struct icaltimetype start_tt = icaltime_null_time ();
+	struct icaltimetype end_tt = icaltime_null_time ();
 	gboolean date_set;
 	gboolean set_start_date = FALSE, set_end_date = FALSE, adjust_by_hour;
 	icaltimezone *zone;
@@ -1756,7 +1756,7 @@ source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage)
 		if (client) {
 			gchar *backend_addr = NULL;
 
-			e_cal_get_cal_address(client, &backend_addr, NULL);
+			e_cal_get_cal_address (client, &backend_addr, NULL);
 
 			if (priv->is_assignment)
 				task_page_select_organizer (tpage, backend_addr);
@@ -1984,7 +1984,7 @@ task_page_select_organizer (TaskPage *tpage, const gchar *backend_address)
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (tpage));
 	client = comp_editor_get_client (editor);
 
-	def_account = itip_addresses_get_default();
+	def_account = itip_addresses_get_default ();
 	if (def_account && def_account->enabled)
 		def_address = g_strdup_printf("%s <%s>", def_account->id->name, def_account->id->address);
 
@@ -2061,12 +2061,12 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 	}
 
 	priv->accounts = itip_addresses_get ();
-	for (it = e_list_get_iterator((EList *)priv->accounts);
-	     e_iterator_is_valid(it);
-	     e_iterator_next(it)) {
+	for (it = e_list_get_iterator ((EList *)priv->accounts);
+	     e_iterator_is_valid (it);
+	     e_iterator_next (it)) {
 		gchar *full = NULL;
 
-		a = (EAccount *)e_iterator_get(it);
+		a = (EAccount *)e_iterator_get (it);
 
 		/* skip disabled accounts */
 		if (!a->enabled)
@@ -2074,10 +2074,10 @@ task_page_construct (TaskPage *tpage, EMeetingStore *model, ECal *client)
 
 		full = g_strdup_printf("%s <%s>", a->id->name, a->id->address);
 
-		priv->address_strings = g_list_append(priv->address_strings, full);
+		priv->address_strings = g_list_append (priv->address_strings, full);
 	}
 
-	g_object_unref(it);
+	g_object_unref (it);
 
 	if (priv->address_strings) {
 		GList *l;
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
index 273c316879..0be9b8538b 100644
--- a/calendar/gui/dialogs/task-page.h
+++ b/calendar/gui/dialogs/task-page.h
@@ -80,7 +80,7 @@ void		task_page_show_options		(TaskPage *page);
 void		task_page_hide_options		(TaskPage *page);
 void		task_page_set_assignment	(TaskPage *page,
 						 gboolean set);
-void		task_page_send_options_clicked_cb(TaskPage *tpage);
+void		task_page_send_options_clicked_cb (TaskPage *tpage);
 void		task_page_set_view_role		(TaskPage *page,
 						 gboolean state);
 void		task_page_set_view_status	(TaskPage *page,
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 03798a4727..89888afde0 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -65,7 +65,7 @@ struct _ECalComponentPreviewClass {
 	void (* selection_changed) (ECalComponentPreview *preview, gint n_selected);
 };
 
-GType		e_cal_component_preview_get_type(void);
+GType		e_cal_component_preview_get_type (void);
 GtkWidget *	e_cal_component_preview_new	(void);
 icaltimezone *	e_cal_component_preview_get_default_timezone
 						(ECalComponentPreview *preview);
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index a8d2ad169f..0454706fec 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -86,9 +86,9 @@ ecp_source_changed (struct _ESource *source, EConfig *ec)
 static void
 ecp_set_target (EConfig *ec, EConfigTarget *t)
 {
-	struct _ECalConfigPrivate *p = _PRIVATE(ec);
+	struct _ECalConfigPrivate *p = _PRIVATE (ec);
 
-	((EConfigClass *)ecp_parent_class)->set_target(ec, t);
+	((EConfigClass *)ecp_parent_class)->set_target (ec, t);
 
 	if (t) {
 		switch (t->type) {
@@ -138,7 +138,7 @@ e_cal_config_get_type (void)
 ECalConfig *
 e_cal_config_new (gint type, const gchar *menuid)
 {
-	ECalConfig *ecp = g_object_new (e_cal_config_get_type(), NULL);
+	ECalConfig *ecp = g_object_new (e_cal_config_get_type (), NULL);
 	e_config_construct (&ecp->config, type, menuid);
 	return ecp;
 }
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 2cd5ad0b77..2efc7c2dff 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -174,7 +174,7 @@ setup_e_table (ECalListView *cal_list_view)
 
 	/* Create the header columns */
 
-	extras = e_table_extras_new();
+	extras = e_table_extras_new ();
 
 	/* Normal string fields */
 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 70d20c30b8..9cb8352c33 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -2690,7 +2690,7 @@ e_cal_model_component_class_init (ECalModelComponentClass *class)
 static void
 e_cal_model_component_finalize (GObject *object)
 {
-	ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT(object);
+	ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT (object);
 
 	if (comp_data->client) {
 		g_object_unref (comp_data->client);
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 2750006f06..ec883a7df2 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -191,7 +191,7 @@ void		e_cal_model_set_flags		(ECalModel *model,
 icaltimezone *	e_cal_model_get_timezone	(ECalModel *model);
 void		e_cal_model_set_timezone	(ECalModel *model,
 						 icaltimezone *zone);
-void		e_cal_model_set_default_category(ECalModel *model,
+void		e_cal_model_set_default_category (ECalModel *model,
 						 const gchar *default_cat);
 gboolean	e_cal_model_get_use_24_hour_format
 						(ECalModel *model);
@@ -240,7 +240,7 @@ ECalModelComponent *
 		e_cal_model_get_component_for_uid
 						(ECalModel *model,
 						 const ECalComponentId *id);
-gchar *		e_cal_model_date_value_to_string(ECalModel *model,
+gchar *		e_cal_model_date_value_to_string (ECalModel *model,
 						 gconstpointer value);
 void		e_cal_model_generate_instances	(ECalModel *model,
 						 time_t start,
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 2bc7eef003..4555ef9a81 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -977,7 +977,7 @@ e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart
 	case GNOME_CAL_MONTH_VIEW:
 	case GNOME_CAL_LIST_VIEW:
 		if (old_dtstart.is_date && old_dtend.is_date
-			&& memcmp (&ic_dur, &ic_oneday, sizeof(ic_dur)) == 0)
+			&& memcmp (&ic_dur, &ic_oneday, sizeof (ic_dur)) == 0)
 			all_day_event = TRUE;
 		else {
 			icaltimetype new_time = icaltime_from_timet_with_zone (dtstart, FALSE, default_zone);
@@ -1271,7 +1271,7 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 			e_cal_get_timezone (event->comp_data->client, dt.tzid, &zone, &error);
 			if (error) {
 				zone = e_calendar_view_get_timezone (cal_view);
-				g_clear_error(&error);
+				g_clear_error (&error);
 			}
 		} else
 			zone = e_calendar_view_get_timezone (cal_view);
@@ -1331,7 +1331,7 @@ e_calendar_view_open_event (ECalendarView *cal_view)
 		ECalendarViewEvent *event = (ECalendarViewEvent *) selected->data;
 		if (event && is_comp_data_valid (event))
 			e_calendar_view_edit_appointment (cal_view, event->comp_data->client,
-					event->comp_data->icalcomp, icalcomponent_get_first_property(event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
+					event->comp_data->icalcomp, icalcomponent_get_first_property (event->comp_data->icalcomp, ICAL_ATTENDEE_PROPERTY) != NULL);
 
 		g_list_free (selected);
 	}
@@ -1646,7 +1646,7 @@ tooltip_grab (GtkWidget *tooltip, GdkEventKey *event, ECalendarView *view)
 	if (!widget)
 		return TRUE;
 
-	gdk_keyboard_ungrab(GDK_CURRENT_TIME);
+	gdk_keyboard_ungrab (GDK_CURRENT_TIME);
 	gtk_widget_destroy (widget);
 	g_object_set_data (G_OBJECT (view), "tooltip-window", NULL);
 
@@ -1860,7 +1860,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	e_cal_component_get_organizer (newcomp, &organiser);
 	if (organiser.cn) {
 		gchar *ptr;
-		ptr = strchr(organiser.value, ':');
+		ptr = strchr (organiser.value, ':');
 
 		if (ptr) {
 			ptr++;
@@ -1912,7 +1912,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	t_start = icaltime_as_timet_with_zone (*dtstart.value, zone);
 	t_end = icaltime_as_timet_with_zone (*dtend.value, zone);
 
-	tmp1 = get_label(dtstart.value, zone, default_zone);
+	tmp1 = get_label (dtstart.value, zone, default_zone);
 	tmp = calculate_time (t_start, t_end);
 
 	/* To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"*/
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index 1ba1727eba..9d455a8395 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -217,7 +217,7 @@ void		e_calendar_view_new_appointment_full
 						 gboolean meeting,
 						 gboolean no_past_date);
 void		e_calendar_view_new_appointment	(ECalendarView *cal_view);
-void		e_calendar_view_edit_appointment(ECalendarView *cal_view,
+void		e_calendar_view_edit_appointment (ECalendarView *cal_view,
 						 ECal *client,
 						 icalcomponent *icalcomp,
 						 gboolean meeting);
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 867cb89e81..724e154648 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -126,7 +126,7 @@ cell_date_edit_text_get_text (ECellText *cell,
 	/* Note that although the property may be in a different
 	   timezone, we convert it to the current timezone to display
 	   it in the table. If the user actually edits the value,
-	   it will be set to the current timezone. See set_value(). */
+	   it will be set to the current timezone. See set_value (). */
 	tmp_tm = icaltimetype_to_tm_with_zone (&dv->tt, dv->zone, timezone);
 
 	return e_datetime_format_format_tm (
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 0229f51602..7914fc06b5 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -1125,7 +1125,7 @@ day_view_main_item_draw (GnomeCanvasItem *canvas_item,
 	grid_x1 = day_view->day_offsets[0] - x;
 	grid_x2 = day_view->day_offsets[day_view->days_shown] - x;
 
-	cairo_save(cr);
+	cairo_save (cr);
 	gdk_cairo_set_source_color (cr,
 		&day_view->colors[E_DAY_VIEW_COLOR_BG_GRID]);
 
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index 64d56b135f..983a66fabb 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -70,8 +70,8 @@ void		e_day_view_top_item_get_day_label
 						 gint day,
 						 gchar *buffer,
 						 gint buffer_len);
-EDayView *	e_day_view_top_item_get_day_view(EDayViewTopItem *top_item);
-void		e_day_view_top_item_set_day_view(EDayViewTopItem *top_item,
+EDayView *	e_day_view_top_item_get_day_view (EDayViewTopItem *top_item);
+void		e_day_view_top_item_set_day_view (EDayViewTopItem *top_item,
 						 EDayView *day_view);
 gboolean	e_day_view_top_item_get_show_dates
 						(EDayViewTopItem *top_item);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 85513a2c74..b685210a6e 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -109,7 +109,7 @@ static GtkTargetEntry target_table[] = {
 
 static void e_day_view_destroy (GtkObject *object);
 static void e_day_view_realize (GtkWidget *widget);
-static void e_day_view_set_colors(EDayView *day_view, GtkWidget *widget);
+static void e_day_view_set_colors (EDayView *day_view, GtkWidget *widget);
 static void e_day_view_unrealize (GtkWidget *widget);
 static void e_day_view_style_set (GtkWidget *widget,
 				  GtkStyle  *previous_style);
@@ -1432,7 +1432,7 @@ e_day_view_realize (GtkWidget *widget)
 
 	/* Allocate the colors. */
 
-	e_day_view_set_colors(day_view, widget);
+	e_day_view_set_colors (day_view, widget);
 
 	gdk_gc_set_colormap (day_view->main_gc, colormap);
 
@@ -1461,7 +1461,7 @@ e_day_view_realize (GtkWidget *widget)
 }
 
 static void
-e_day_view_set_colors(EDayView *day_view, GtkWidget *widget)
+e_day_view_set_colors (EDayView *day_view, GtkWidget *widget)
 {
 	GtkStyle *style;
 
@@ -1611,7 +1611,7 @@ e_day_view_style_set (GtkWidget *widget,
 		(*GTK_WIDGET_CLASS (e_day_view_parent_class)->style_set)(widget, previous_style);
 
 	day_view = E_DAY_VIEW (widget);
-	e_day_view_set_colors(day_view, widget);
+	e_day_view_set_colors (day_view, widget);
 
 	for (week_day = 0; week_day < E_DAY_VIEW_MAX_DAYS; week_day++) {
 		for (event_num = 0; event_num < day_view->events[week_day]->len; event_num++) {
@@ -4917,7 +4917,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 		g_object_set_data (G_OBJECT (event->canvas_item), "event-day", GINT_TO_POINTER (E_DAY_VIEW_LONG_EVENT));
 		g_signal_connect (event->canvas_item, "event",
 				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-		g_signal_emit_by_name (G_OBJECT(day_view),
+		g_signal_emit_by_name (G_OBJECT (day_view),
 				       "event_added", event);
 
 		e_day_view_update_long_event_label (day_view, event_num);
@@ -4974,7 +4974,7 @@ e_day_view_reshape_long_event (EDayView *day_view,
 			       "clip_width", (gdouble) text_w,
 			       "clip_height", (gdouble) item_h,
 			       NULL);
-	e_canvas_item_move_absolute(event->canvas_item,
+	e_canvas_item_move_absolute (event->canvas_item,
 				    text_x, item_y);
 
 	g_object_unref (layout);
@@ -5068,7 +5068,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 				num_icons++;
 
 			num_icons += cal_comp_util_get_n_icons (comp, NULL);
-			g_object_unref(comp);
+			g_object_unref (comp);
 		}
 
 		if (num_icons > 0) {
@@ -5104,7 +5104,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 			g_object_set_data (G_OBJECT (event->canvas_item), "event-day", GINT_TO_POINTER (day));
 			g_signal_connect (event->canvas_item, "event",
 					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
-			g_signal_emit_by_name (G_OBJECT(day_view),
+			g_signal_emit_by_name (G_OBJECT (day_view),
 					       "event_added", event);
 
 			e_day_view_update_event_label (day_view, day, event_num);
@@ -5116,7 +5116,7 @@ e_day_view_reshape_day_event (EDayView *day_view,
 				       "clip_height", (gdouble) item_h,
 				       "x_offset", (gdouble) icons_offset,
 				       NULL);
-		e_canvas_item_move_absolute(event->canvas_item,
+		e_canvas_item_move_absolute (event->canvas_item,
 					    item_x, item_y);
 	}
 }
@@ -5442,7 +5442,7 @@ e_day_view_key_press (GtkWidget *widget, GdkEventKey *event)
 static void
 e_day_view_goto_start_of_work_day (EDayView *day_view)
 {
-	g_return_if_fail(day_view!=NULL);
+	g_return_if_fail (day_view!=NULL);
 
 	if (day_view->selection_in_top_canvas)
 		return;
@@ -5492,7 +5492,7 @@ e_day_view_goto_end_of_work_day (EDayView *day_view)
 static void
 e_day_view_change_duration_to_start_of_work_day (EDayView *day_view)
 {
-	g_return_if_fail(day_view != NULL);
+	g_return_if_fail (day_view != NULL);
 
 	if (day_view->selection_in_top_canvas)
 		return;
@@ -5525,7 +5525,7 @@ e_day_view_change_duration_to_start_of_work_day (EDayView *day_view)
 static void
 e_day_view_change_duration_to_end_of_work_day (EDayView *day_view)
 {
-	g_return_if_fail(day_view != NULL);
+	g_return_if_fail (day_view != NULL);
 
 	if (day_view->selection_in_top_canvas)
 		return;
@@ -5604,7 +5604,7 @@ e_day_view_focus (GtkWidget *widget, GtkDirectionType direction)
 	if ((new_day == -1) && (new_event_num == -1)) {
 		/* focus should go to the day view widget itself
 		 */
-		gtk_widget_grab_focus (GTK_WIDGET(day_view));
+		gtk_widget_grab_focus (GTK_WIDGET (day_view));
 		return TRUE;
 	}
 
@@ -5732,7 +5732,7 @@ e_day_view_get_next_tab_event (EDayView *day_view, GtkDirectionType direction,
 	g_return_val_if_fail (day_out != NULL, FALSE);
 	g_return_val_if_fail (event_num_out != NULL, FALSE);
 
-	days_shown = e_day_view_get_days_shown(day_view);
+	days_shown = e_day_view_get_days_shown (day_view);
 	*day_out = -1;
 	*event_num_out = -1;
 
@@ -6144,7 +6144,7 @@ e_day_view_start_editing_event (EDayView *day_view,
 
 	/* We must grab the focus before setting the initial text, since
 	   grabbing the focus will result in a call to
-	   e_day_view_on_editing_started(), which will reset the text to get
+	   e_day_view_on_editing_started (), which will reset the text to get
 	   rid of the start and end times. */
 	e_canvas_item_grab_focus (event->canvas_item, TRUE);
 
@@ -7175,7 +7175,7 @@ e_day_view_get_event_position (EDayView *day_view,
 	if (event->num_columns == 0)
 		return FALSE;
 
-	e_day_view_get_event_rows(day_view, day, event_num, &start_row, &end_row);
+	e_day_view_get_event_rows (day_view, day, event_num, &start_row, &end_row);
 
 	cols_in_row = day_view->cols_per_row[day][start_row];
 	start_col = event->start_row_or_col;
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index aee8be0683..4e70f46531 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -125,7 +125,7 @@ typedef enum
    The full format is like 'Thursday 12 September'. The abbreviated format is
    like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format
    is like '12'. The actual format used is determined in
-   e_day_view_recalc_cell_sizes(), once we know the font being used. */
+   e_day_view_recalc_cell_sizes (), once we know the font being used. */
 typedef enum
 {
 	E_DAY_VIEW_DATE_FULL,
@@ -259,7 +259,7 @@ struct _EDayView {
 
 	/* These are set to FALSE whenever an event in the corresponding array
 	   is changed. Any function that needs the events sorted calls
-	   e_day_view_ensure_events_sorted(). */
+	   e_day_view_ensure_events_sorted (). */
 	gboolean long_events_sorted;
 	gboolean events_sorted[E_DAY_VIEW_MAX_DAYS];
 
@@ -537,8 +537,8 @@ void	   e_day_view_set_work_day_end_minute	(EDayView *day_view,
 /* Whether we display the Marcus Bains Line in the main canvas and time
    canvas. */
 void	   e_day_view_marcus_bains_update	(EDayView *day_view);
-gboolean   e_day_view_marcus_bains_get_show_line(EDayView *day_view);
-void	   e_day_view_marcus_bains_set_show_line(EDayView *day_view,
+gboolean   e_day_view_marcus_bains_get_show_line (EDayView *day_view);
+void	   e_day_view_marcus_bains_set_show_line (EDayView *day_view,
 						 gboolean show_line);
 const gchar *
 	   e_day_view_marcus_bains_get_day_view_color
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index dd9516f7bf..838445d1b9 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -585,9 +585,9 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 
 			g_free (delegator_clean);
 		} else {
-			it = e_list_get_iterator((EList *)priv->accounts);
-			while (e_iterator_is_valid(it)) {
-				const EAccount *account = e_iterator_get(it);
+			it = e_list_get_iterator ((EList *)priv->accounts);
+			while (e_iterator_is_valid (it)) {
+				const EAccount *account = e_iterator_get (it);
 
 				/* Check for a matching address */
 				if (attendee_clean != NULL
@@ -600,7 +600,7 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 					g_free (attendee_clean);
 					g_free (name_clean);
 					g_free (my_alt_address);
-					g_object_unref(it);
+					g_object_unref (it);
 					return;
 				}
 
@@ -609,9 +609,9 @@ find_my_address (EItipControl *itip, icalcomponent *ical_comp, icalparameter_par
 				    && !g_ascii_strcasecmp (account->id->name, name_clean))
 					my_alt_address = g_strdup (attendee_clean);
 
-				e_iterator_next(it);
+				e_iterator_next (it);
 			}
-			g_object_unref(it);
+			g_object_unref (it);
 		}
 
 		g_free (attendee_clean);
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index d0f172c81d..8d233cf1ef 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -542,7 +542,7 @@ build_table (EMeetingListView *lview)
 						     NULL);
 	col = gtk_tree_view_get_column (view, pos -1);
 	gtk_tree_view_column_set_resizable (col, TRUE);
-	gtk_tree_view_column_set_reorderable(col, TRUE);
+	gtk_tree_view_column_set_reorderable (col, TRUE);
 	gtk_tree_view_column_set_expand (col, TRUE);
 	g_object_set (col, "min-width", 50, NULL);
 	g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_ATTENDEE_COL));
@@ -559,7 +559,7 @@ build_table (EMeetingListView *lview)
 						     NULL);
 	col = gtk_tree_view_get_column (view, pos -1);
 	gtk_tree_view_column_set_resizable (col, TRUE);
-	gtk_tree_view_column_set_reorderable(col, TRUE);
+	gtk_tree_view_column_set_reorderable (col, TRUE);
 	g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_TYPE_COL));
 	g_signal_connect (renderer, "edited", G_CALLBACK (type_edited_cb), view);
 	g_hash_table_insert (edit_table, GINT_TO_POINTER (E_MEETING_STORE_TYPE_COL), renderer);
@@ -571,7 +571,7 @@ build_table (EMeetingListView *lview)
 						     NULL);
 	col = gtk_tree_view_get_column (view, pos -1);
 	gtk_tree_view_column_set_resizable (col, TRUE);
-	gtk_tree_view_column_set_reorderable(col, TRUE);
+	gtk_tree_view_column_set_reorderable (col, TRUE);
 	g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_ROLE_COL));
 	g_signal_connect (renderer, "edited", G_CALLBACK (role_edited_cb), view);
 	g_hash_table_insert (edit_table, GINT_TO_POINTER (E_MEETING_STORE_ROLE_COL), renderer);
@@ -584,7 +584,7 @@ build_table (EMeetingListView *lview)
 						     NULL);
 	col = gtk_tree_view_get_column (view, pos -1);
 	gtk_tree_view_column_set_resizable (col, TRUE);
-	gtk_tree_view_column_set_reorderable(col, TRUE);
+	gtk_tree_view_column_set_reorderable (col, TRUE);
 	g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_RSVP_COL));
 	g_signal_connect (renderer, "edited", G_CALLBACK (rsvp_edited_cb), view);
 	g_hash_table_insert (edit_table, GINT_TO_POINTER (E_MEETING_STORE_RSVP_COL), renderer);
@@ -596,7 +596,7 @@ build_table (EMeetingListView *lview)
 						     NULL);
 	col = gtk_tree_view_get_column (view, pos -1);
 	gtk_tree_view_column_set_resizable (col, TRUE);
-	gtk_tree_view_column_set_reorderable(col, TRUE);
+	gtk_tree_view_column_set_reorderable (col, TRUE);
 	g_object_set_data (G_OBJECT (col), "mtg-store-col", GINT_TO_POINTER (E_MEETING_STORE_STATUS_COL));
 	g_signal_connect (renderer, "edited", G_CALLBACK (status_edited_cb), view);
 	g_hash_table_insert (edit_table, GINT_TO_POINTER (E_MEETING_STORE_STATUS_COL), renderer);
@@ -695,7 +695,7 @@ e_meeting_list_view_new (EMeetingStore *store)
 		build_table (view);
 	}
 
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view));
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 	g_signal_connect (selection, "changed", G_CALLBACK (row_activated_cb), view);
 	return view;
 }
@@ -831,7 +831,7 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 				if (!g_ascii_strcasecmp (attr, "icscalendar")) {
 
 					/* FIXME: this does not work, have to use first
-					   e_destination_use_contact() */
+					   e_destination_use_contact () */
 					contact = e_destination_get_contact (dest);
 					if (contact) {
 						attendee = e_contact_get (contact, E_CONTACT_FREEBUSY_URL);
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index dc1f2c8eeb..efd7671f3d 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -70,7 +70,7 @@ G_BEGIN_DECLS
 /* This is used to specify the format used when displaying the dates.
    The full format is like 'Sunday, September 12, 1999'. The abbreviated format
    is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
-   format used is determined in e_meeting_time_selector_style_set(), once we
+   format used is determined in e_meeting_time_selector_style_set (), once we
    know the font being used. */
 typedef enum
 {
@@ -228,7 +228,7 @@ struct _EMeetingTimeSelector {
 	/* These are the x pixel coordinates in the entire scroll region of
 	   the start and end times. Set to meeting_positions_valid to FALSE to
 	   invalidate. They will then be recomputed when needed. Always access
-	   with e_meeting_time_selector_get_meeting_time_positions(). */
+	   with e_meeting_time_selector_get_meeting_time_positions (). */
 	gint meeting_positions_valid;
 	gint meeting_positions_in_scroll_area;
 	gint meeting_start_x;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 8355aa9616..f2df4d6697 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -520,7 +520,7 @@ memo_table_query_tooltip (GtkWidget *widget,
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
 		gchar *ptr;
-		ptr = strchr( organizer.value, ':');
+		ptr = strchr ( organizer.value, ':');
 
 		if (ptr) {
 			ptr++;
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index d1c03563a2..6441d4f450 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -737,7 +737,7 @@ task_table_query_tooltip (GtkWidget *widget,
 	e_cal_component_get_organizer (new_comp, &organizer);
 	if (organizer.cn) {
 		gchar *ptr;
-		ptr = strchr( organizer.value, ':');
+		ptr = strchr ( organizer.value, ':');
 
 		if (ptr) {
 			ptr++;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 4aa2cb065c..926bd1fe95 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -506,7 +506,7 @@ week_view_event_item_draw_icons (EWeekViewEventItem *event_item,
 	g_slist_free (categories_pixbufs);
 
 	cairo_destroy (cr);
-	g_object_unref(comp);
+	g_object_unref (comp);
 	gdk_gc_set_clip_mask (gc, NULL);
 }
 
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 743f890485..52db8c19fa 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -410,7 +410,7 @@ e_week_view_layout_get_day_position	(gint		 day,
 /* Returns TRUE if the event span is visible or FALSE if it isn't.
    It also returns the number of days of the span that are visible.
    Usually this can easily be determined by the start & end days and row of
-   the span, which are set in e_week_view_layout_event(). Though we need a
+   the span, which are set in e_week_view_layout_event (). Though we need a
    special case for the weekends when they are compressed, since the span may
    not fit. */
 gboolean
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index 67975b2b20..98bf1ccb3a 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -43,7 +43,7 @@ GArray* e_week_view_layout_events	(GArray		*events,
 /* Returns which 'cell' in the table the day appears in. Note that most days
    have a height of 2 rows, but Sat/Sun are sometimes compressed so they have
    a height of only 1 row. */
-void e_week_view_layout_get_day_position(gint		 day,
+void e_week_view_layout_get_day_position (gint		 day,
 					 gboolean	 multi_week_view,
 					 gint		 weeks_shown,
 					 gint		 display_start_day,
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 3522790401..a42b60ea40 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -266,7 +266,7 @@ week_view_main_item_draw_day (EWeekViewMainItem *main_item,
 		layout = pango_cairo_create_layout (cr);
 		pango_layout_set_font_description (layout, font_desc);
 		pango_layout_set_text (layout, buffer, -1);
-		pango_layout_set_markup (layout, buffer, strlen(buffer));
+		pango_layout_set_markup (layout, buffer, strlen (buffer));
 	} else {
 		g_date_strftime (buffer, sizeof (buffer),
 				 format_string ? format_string : "%d", date);
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index d4cc111117..d6862bde95 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -65,7 +65,7 @@ struct _EWeekViewTitlesItemClass {
 	GnomeCanvasItemClass parent_class;
 };
 
-GType		e_week_view_titles_item_get_type(void);
+GType		e_week_view_titles_item_get_type (void);
 EWeekView *	e_week_view_titles_item_get_week_view
 						(EWeekViewTitlesItem *titles_item);
 void		e_week_view_titles_item_set_week_view
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 91abad1b50..83b9fa2d59 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -86,7 +86,7 @@ typedef struct {
 
 static void e_week_view_destroy (GtkObject *object);
 static void e_week_view_realize (GtkWidget *widget);
-static void e_week_view_set_colors(EWeekView *week_view, GtkWidget *widget);
+static void e_week_view_set_colors (EWeekView *week_view, GtkWidget *widget);
 static void e_week_view_unrealize (GtkWidget *widget);
 static void e_week_view_style_set (GtkWidget *widget,
 				   GtkStyle  *previous_style);
@@ -915,7 +915,7 @@ e_week_view_realize (GtkWidget *widget)
 	colormap = gtk_widget_get_colormap (widget);
 
 	/* Allocate the colors. */
-	e_week_view_set_colors(week_view, widget);
+	e_week_view_set_colors (week_view, widget);
 
 	gdk_gc_set_colormap (week_view->main_gc, colormap);
 
@@ -949,7 +949,7 @@ color_inc (GdkColor c, gint amount)
 }
 
 static void
-e_week_view_set_colors(EWeekView *week_view, GtkWidget *widget)
+e_week_view_set_colors (EWeekView *week_view, GtkWidget *widget)
 {
 	GtkStyle *style;
 
@@ -1086,7 +1086,7 @@ e_week_view_style_set (GtkWidget *widget,
 	week_view = E_WEEK_VIEW (widget);
 	style = gtk_widget_get_style (widget);
 
-	e_week_view_set_colors(week_view, widget);
+	e_week_view_set_colors (week_view, widget);
 	if (week_view->spans) {
 		for (span_num = 0; span_num < week_view->spans->len;
 				span_num++) {
@@ -1546,7 +1546,7 @@ e_week_view_focus (GtkWidget *widget, GtkDirectionType direction)
 			current_day = span->start_day;
 
 			if ((week_view->focused_jump_button != current_day) &&
-			    e_week_view_is_jump_button_visible(week_view, current_day)) {
+			    e_week_view_is_jump_button_visible (week_view, current_day)) {
 
 				/* focus go to the jump button */
 				e_week_view_stop_editing_event (week_view);
@@ -2316,7 +2316,7 @@ e_week_view_get_day_position	(EWeekView	*week_view,
 
 /* Returns the bounding box for a span of an event. Usually this can easily
    be determined by the start & end days and row of the span, which are set in
-   e_week_view_layout_event(). Though we need a special case for the weekends
+   e_week_view_layout_event (). Though we need a special case for the weekends
    when they are compressed, since the span may not fit.
    The bounding box includes the entire width of the days in the view (but
    not the vertical line down the right of the last day), though the displayed
@@ -3179,7 +3179,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 		g_signal_connect (span->text_item, "event",
 				  G_CALLBACK (e_week_view_on_text_item_event),
 				  week_view);
-		g_signal_emit_by_name (G_OBJECT(week_view),
+		g_signal_emit_by_name (G_OBJECT (week_view),
 				       "event_added", event);
 
 	}
@@ -3978,7 +3978,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 
 	if (string_is_empty (text) && !on_server) {
 		e_cal_component_get_uid (comp, &uid);
-		g_signal_handlers_disconnect_by_func(item, e_week_view_on_text_item_event, week_view);
+		g_signal_handlers_disconnect_by_func (item, e_week_view_on_text_item_event, week_view);
 		e_week_view_foreach_event_with_uid (week_view, uid,
 						    e_week_view_remove_event_cb, NULL);
 		week_view->event_destroyed = TRUE;
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 0712e1ac6f..83d058e2d7 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -260,7 +260,7 @@ struct _EWeekView {
 	PangoFontDescription *small_font_desc;
 
 	/* The widths of various pieces of text, used to determine which of
-	   several date formats to display, set in e_week_view_style_set(). */
+	   several date formats to display, set in e_week_view_style_set (). */
 	gint space_width;		/* One space character ' '. */
 	gint colon_width;		/* Size of ':' in the font. */
 	gint slash_width;		/* Size of '/' in the font. */
@@ -390,8 +390,8 @@ void		e_week_view_set_multi_week_view	(EWeekView *week_view,
 						 gboolean multi_week_view);
 
 /* Whether to update the base date when the time range changes */
-gboolean	e_week_view_get_update_base_date(EWeekView *week_view);
-void		e_week_view_set_update_base_date(EWeekView *week_view,
+gboolean	e_week_view_get_update_base_date (EWeekView *week_view);
+void		e_week_view_set_update_base_date (EWeekView *week_view,
 						 gboolean update_base_date);
 
 /* The number of weeks shown in the multi-week view. */
@@ -401,8 +401,8 @@ void		e_week_view_set_weeks_shown	(EWeekView *week_view,
 
 /* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month
    view. In the Week view they are always compressed. */
-gboolean	e_week_view_get_compress_weekend(EWeekView *week_view);
-void		e_week_view_set_compress_weekend(EWeekView *week_view,
+gboolean	e_week_view_get_compress_weekend (EWeekView *week_view);
+void		e_week_view_set_compress_weekend (EWeekView *week_view,
 						 gboolean compress_weekend);
 
 /* Whether we display event end times. */
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 3b36d7a07f..229d3822d5 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -253,8 +253,8 @@ ea_cal_view_event_dispose (GObject *object)
                 a11y->state_set = NULL;
         }
 
-        if (G_OBJECT_CLASS(parent_class)->dispose)
-                G_OBJECT_CLASS(parent_class)->dispose (object);
+        if (G_OBJECT_CLASS (parent_class)->dispose)
+                G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
 static G_CONST_RETURN gchar *
@@ -276,7 +276,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	g_obj = atk_gobject_accessible_get_object (atk_gobj);
 	if (!g_obj || !E_IS_TEXT (g_obj))
 		return NULL;
-	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM(g_obj));
+	event = ea_calendar_helpers_get_cal_view_event_from (GNOME_CANVAS_ITEM (g_obj));
 	if (!is_comp_data_valid (event))
 		return NULL;
 
@@ -356,7 +356,7 @@ ea_cal_view_event_get_index_in_parent (AtkObject *accessible)
 	ECalendarViewEvent *cal_view_event;
 
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), -1);
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(accessible));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible));
 	if (!g_obj)
 		/* defunct object*/
 		return -1;
@@ -459,7 +459,7 @@ ea_cal_view_get_extents (AtkComponent   *component,
 
 	g_return_if_fail (EA_IS_CAL_VIEW_EVENT (component));
 
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component));
 	if (!g_obj)
 		/* defunct object*/
 		return;
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 21b35e4e17..08dba44340 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -49,11 +49,11 @@ static void atk_action_interface_init (AtkActionIface *iface);
 static gboolean action_interface_do_action (AtkAction *action, gint i);
 static gint action_interface_get_n_actions (AtkAction *action);
 static G_CONST_RETURN gchar *
-action_interface_get_description(AtkAction *action, gint i);
+action_interface_get_description (AtkAction *action, gint i);
 static G_CONST_RETURN gchar *
 action_interface_get_keybinding (AtkAction *action, gint i);
 static G_CONST_RETURN gchar *
-action_interface_action_get_name(AtkAction *action, gint i);
+action_interface_action_get_name (AtkAction *action, gint i);
 
 static gpointer parent_class = NULL;
 
@@ -185,7 +185,7 @@ ea_cal_view_get_parent (AtkObject *accessible)
 	cal_view = E_CALENDAR_VIEW (widget);
 	gnomeCalendar = e_calendar_view_get_calendar (cal_view);
 
-	return gtk_widget_get_accessible (GTK_WIDGET(gnomeCalendar));
+	return gtk_widget_get_accessible (GTK_WIDGET (gnomeCalendar));
 }
 
 static void
@@ -197,7 +197,7 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view, ECalendarViewEvent *event
 
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
+	atk_obj = gtk_widget_get_accessible (GTK_WIDGET (cal_view));
 	if (!EA_IS_CAL_VIEW (atk_obj))
 		return;
 
@@ -235,7 +235,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view, ECalendarViewEvent *event,
 
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
-	atk_obj = gtk_widget_get_accessible (GTK_WIDGET(cal_view));
+	atk_obj = gtk_widget_get_accessible (GTK_WIDGET (cal_view));
 	if (!EA_IS_CAL_VIEW (atk_obj))
 		return;
 
@@ -274,7 +274,7 @@ idle_dates_changed (gpointer data)
 	g_return_val_if_fail (data, FALSE);
 	g_return_val_if_fail (EA_IS_CAL_VIEW (data), FALSE);
 
-	ea_cal_view = ATK_OBJECT(data);
+	ea_cal_view = ATK_OBJECT (data);
 
 	if (ea_cal_view->name) {
 		g_free (ea_cal_view->name);
@@ -382,7 +382,7 @@ action_interface_get_n_actions (AtkAction *action)
 }
 
 static G_CONST_RETURN gchar *
-action_interface_get_description(AtkAction *action, gint index)
+action_interface_get_description (AtkAction *action, gint index)
 {
 	return action_interface_action_get_name (action, index);
 }
@@ -425,7 +425,7 @@ action_interface_get_keybinding (AtkAction *action, gint index)
 }
 
 static G_CONST_RETURN gchar *
-action_interface_action_get_name(AtkAction *action, gint i)
+action_interface_action_get_name (AtkAction *action, gint i)
 {
 	if (i >= 0 && i < CAL_VIEW_ACTION_NUM)
 		return action_name[i];
diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index e8d91df217..05285da26f 100644
--- a/calendar/gui/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
@@ -55,7 +55,7 @@ ea_calendar_helpers_get_accessible_for (GnomeCanvasItem *canvas_item)
                 if (E_IS_TEXT (canvas_item)) {
 		atk_obj = ea_cal_view_event_new (g_obj);
                 }
-                else if (GNOME_IS_CANVAS_PIXBUF(canvas_item)) {
+                else if (GNOME_IS_CANVAS_PIXBUF (canvas_item)) {
                         atk_obj = ea_jump_button_new (g_obj);
                 }
                 else
@@ -86,7 +86,7 @@ ea_calendar_helpers_get_cal_view_from (GnomeCanvasItem *canvas_item)
 	/* canvas_item->canvas is the ECanvas for day view */
 	/* parent of canvas_item->canvas is the EDayView or EWeekView widget */
 	canvas = canvas_item->canvas;
-	view_widget = gtk_widget_get_parent (GTK_WIDGET(canvas));
+	view_widget = gtk_widget_get_parent (GTK_WIDGET (canvas));
 	if (!view_widget || !E_IS_CALENDAR_VIEW (view_widget))
 		return NULL;
 
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 84ce9d8f6b..68b6abb28a 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -59,7 +59,7 @@ gnome_calendar_a11y_init (void)
 	/* we only add focus watcher when accessibility is enabled
 	 */
 	if (atk_get_root ()) {
-		EA_SET_FACTORY (gnome_calendar_get_type(), ea_gnome_calendar);
+		EA_SET_FACTORY (gnome_calendar_get_type (), ea_gnome_calendar);
 
 		/* force loading some types */
 		e_text_type = g_type_class_ref (E_TYPE_TEXT);
@@ -76,11 +76,11 @@ gnome_calendar_a11y_init (void)
                                             0, ea_calendar_focus_watcher,
                                             NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event-after",
-							     e_day_view_get_type()),
+							     e_day_view_get_type ()),
 					    0, ea_calendar_focus_watcher,
 					    NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_day_view_main_item_get_type()),
+							     e_day_view_main_item_get_type ()),
 					    0, ea_calendar_focus_watcher,
 					    NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event-after",
@@ -88,7 +88,7 @@ gnome_calendar_a11y_init (void)
 					    0, ea_calendar_focus_watcher,
 					    NULL, (GDestroyNotify) NULL);
 		g_signal_add_emission_hook (g_signal_lookup ("event",
-							     e_week_view_main_item_get_type()),
+							     e_week_view_main_item_get_type ()),
 					    0, ea_calendar_focus_watcher,
 					    NULL, (GDestroyNotify) NULL);
 
@@ -98,13 +98,13 @@ gnome_calendar_a11y_init (void)
 void
 e_cal_view_a11y_init (void)
 {
-	EA_SET_FACTORY (e_calendar_view_get_type(), ea_cal_view);
+	EA_SET_FACTORY (e_calendar_view_get_type (), ea_cal_view);
 }
 
 void
 e_day_view_a11y_init (void)
 {
-	EA_SET_FACTORY (e_day_view_get_type(), ea_day_view);
+	EA_SET_FACTORY (e_day_view_get_type (), ea_day_view);
 }
 
 void
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 609b515526..84f0c4d115 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -246,7 +246,7 @@ ea_day_view_cell_ref_state_set (AtkObject *obj)
   gint parent_x, parent_y, parent_width, parent_height;
 
   state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
+  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
   if (!g_obj)
 	  return state_set;
 
@@ -337,7 +337,7 @@ component_interface_get_extents (AtkComponent *component,
 
 	g_return_if_fail (EA_IS_DAY_VIEW_CELL (component));
 
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component));
 	if (!g_obj)
 		/* defunct object*/
 		return;
diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index 861b83746b..a4cb0267d9 100644
--- a/calendar/gui/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
@@ -29,7 +29,7 @@
 #include <glib/gi18n.h>
 
 /* EaDayViewMainItem */
-static void	ea_day_view_main_item_class_init(EaDayViewMainItemClass *klass);
+static void	ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass);
 
 static void	ea_day_view_main_item_finalize	(GObject *object);
 static G_CONST_RETURN gchar *
@@ -191,7 +191,7 @@ ea_day_view_main_item_get_type (void)
 		 */
 
 		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_day_view_main_item_get_type());
+						    e_day_view_main_item_get_type ());
 		derived_atk_type = atk_object_factory_get_accessible_type (factory);
 		g_type_query (derived_atk_type, &query);
 
@@ -370,7 +370,7 @@ ea_day_view_main_item_ref_child (AtkObject *accessible, gint index)
 		ea_cell_table_set_cell_at_index (cell_data, index, cell);
 		g_object_unref (cell);
 	}
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
+	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT (cell)));
 }
 
 static AtkObject *
@@ -597,12 +597,12 @@ ea_day_view_main_item_get_cell_data (EaDayViewMainItem *ea_main_item)
 	main_item = E_DAY_VIEW_MAIN_ITEM (g_obj);
 	day_view = e_day_view_main_item_get_day_view (main_item);
 
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
+	cell_data = g_object_get_data (G_OBJECT (ea_main_item),
 				       "ea-day-view-cell-table");
 	if (!cell_data) {
 		cell_data = ea_cell_table_create (day_view->rows,
 						  day_view->days_shown, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
+		g_object_set_data (G_OBJECT (ea_main_item),
 				   "ea-day-view-cell-table", cell_data);
 	}
 	return cell_data;
@@ -615,10 +615,10 @@ ea_day_view_main_item_destory_cell_data (EaDayViewMainItem *ea_main_item)
 
 	g_return_if_fail (ea_main_item);
 
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
+	cell_data = g_object_get_data (G_OBJECT (ea_main_item),
 				       "ea-day-view-cell-table");
 	if (cell_data) {
-		g_object_set_data (G_OBJECT(ea_main_item),
+		g_object_set_data (G_OBJECT (ea_main_item),
 				   "ea-day-view-cell-table", NULL);
 		ea_cell_table_destroy (cell_data);
 	}
@@ -648,7 +648,7 @@ component_interface_get_extents (AtkComponent *component,
 
 	g_return_if_fail (EA_IS_DAY_VIEW_MAIN_ITEM (component));
 
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component));
 	if (!g_obj)
 		/* defunct object*/
 		return;
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 47969205a8..e34eaa6366 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -70,7 +70,7 @@ ea_day_view_get_type (void)
 		 */
 
 		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_calendar_view_get_type());
+						    e_calendar_view_get_type ());
 		derived_atk_type = atk_object_factory_get_accessible_type (factory);
 		g_type_query (derived_atk_type, &query);
 
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index 9c7d9f8601..e7492a07ee 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -302,7 +302,7 @@ ea_gnome_calendar_ref_child (AtkObject *obj, gint i)
 		break;
 	}
 	if (child)
-		g_object_ref(child);
+		g_object_ref (child);
 	return child;
 }
 
@@ -316,7 +316,7 @@ ea_gcal_dates_change_cb (GnomeCalendar *gcal, gpointer data)
 	g_return_if_fail (EA_IS_GNOME_CALENDAR (data));
 
 	new_name = ea_gnome_calendar_get_label_description (gcal);
-	atk_object_set_name (ATK_OBJECT(data), new_name);
+	atk_object_set_name (ATK_OBJECT (data), new_name);
 	g_signal_emit_by_name (data, "visible_data_changed");
 
 #ifdef ACC_DEBUG
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index de4c244ebf..32f5fb1f75 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -258,7 +258,7 @@ ea_week_view_cell_ref_state_set (AtkObject *obj)
   gint parent_x, parent_y, parent_width, parent_height;
 
   state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(obj));
+  g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
   if (!g_obj)
 	  return state_set;
 
@@ -348,7 +348,7 @@ component_interface_get_extents (AtkComponent *component,
 
 	g_return_if_fail (EA_IS_WEEK_VIEW_CELL (component));
 
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component));
 	if (!g_obj)
 		/* defunct object*/
 		return;
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index 1db4d8b5be..84a4ea1191 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -39,7 +39,7 @@ static G_CONST_RETURN gchar *
 static gint	ea_week_view_main_item_get_n_children
 						(AtkObject *accessible);
 static AtkObject *
-		ea_week_view_main_item_ref_child(AtkObject *accessible,
+		ea_week_view_main_item_ref_child (AtkObject *accessible,
 						 gint i);
 static AtkObject *
 		ea_week_view_main_item_get_parent
@@ -72,7 +72,7 @@ static gint	table_interface_get_index_at	(AtkTable *table,
 static gint	table_interface_get_column_at_index
 						(AtkTable *table,
 						 gint index);
-static gint	table_interface_get_row_at_index(AtkTable *table,
+static gint	table_interface_get_row_at_index (AtkTable *table,
 						 gint index);
 static AtkObject *
 		table_interface_ref_at		(AtkTable *table,
@@ -226,7 +226,7 @@ ea_week_view_main_item_get_type (void)
 		 */
 
 		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_week_view_main_item_get_type());
+						    e_week_view_main_item_get_type ());
 		derived_atk_type = atk_object_factory_get_accessible_type (factory);
 		g_type_query (derived_atk_type, &query);
 
@@ -405,7 +405,7 @@ ea_week_view_main_item_ref_child (AtkObject *accessible, gint index)
 		g_object_unref (cell);
 	}
 
-	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT(cell)));
+	return g_object_ref (atk_gobject_accessible_for_object (G_OBJECT (cell)));
 }
 
 static AtkObject *
@@ -607,11 +607,11 @@ ea_week_view_main_item_get_cell_data (EaWeekViewMainItem *ea_main_item)
 	main_item = E_WEEK_VIEW_MAIN_ITEM (g_obj);
 	week_view = e_week_view_main_item_get_week_view (main_item);
 
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
+	cell_data = g_object_get_data (G_OBJECT (ea_main_item),
 				       "ea-week-view-cell-table");
 	if (!cell_data) {
 		cell_data = ea_cell_table_create (week_view->weeks_shown, 7, TRUE);
-		g_object_set_data (G_OBJECT(ea_main_item),
+		g_object_set_data (G_OBJECT (ea_main_item),
 				   "ea-week-view-cell-table", cell_data);
 	}
 	return cell_data;
@@ -624,10 +624,10 @@ ea_week_view_main_item_destory_cell_data (EaWeekViewMainItem *ea_main_item)
 
 	g_return_if_fail (ea_main_item);
 
-	cell_data = g_object_get_data (G_OBJECT(ea_main_item),
+	cell_data = g_object_get_data (G_OBJECT (ea_main_item),
 				       "ea-week-view-cell-table");
 	if (cell_data) {
-		g_object_set_data (G_OBJECT(ea_main_item),
+		g_object_set_data (G_OBJECT (ea_main_item),
 				   "ea-week-view-cell-table", NULL);
 		ea_cell_table_destroy (cell_data);
 	}
@@ -657,7 +657,7 @@ component_interface_get_extents (AtkComponent *component,
 
 	g_return_if_fail (EA_IS_WEEK_VIEW_MAIN_ITEM (component));
 
-	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
+	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component));
 	if (!g_obj)
 		/* defunct object*/
 		return;
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index e6683f5ddd..e34894f9ce 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -70,7 +70,7 @@ ea_week_view_get_type (void)
 		 */
 
 		factory = atk_registry_get_factory (atk_get_default_registry (),
-						    e_calendar_view_get_type());
+						    e_calendar_view_get_type ());
 		derived_atk_type = atk_object_factory_get_accessible_type (factory);
 		g_type_query (derived_atk_type, &query);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 1195e04612..8feaa3f850 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1379,7 +1379,7 @@ process_completed_tasks (GnomeCalendar *gcal, gboolean config_changed)
 #if 0 /* KILL-BONOBO */
 	GnomeCalendarPrivate *priv;
 
-	g_return_if_fail (GNOME_IS_CALENDAR(gcal));
+	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
 	priv = gcal->priv;
 
@@ -1596,7 +1596,7 @@ gnome_calendar_goto_date (GnomeCalendar *gcal,
 	gboolean need_updating = FALSE;
 	icaltimezone *timezone;
 
-	g_return_if_fail (GNOME_IS_CALENDAR(gcal));
+	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 
 	model = gnome_calendar_get_model (gcal);
 	week_start_day = e_cal_model_get_week_start_day (model);
@@ -1920,9 +1920,9 @@ gnome_calendar_display_view (GnomeCalendar *gcal,
 }
 
 static void
-non_intrusive_error_remove(GtkWidget *w, gpointer data)
+non_intrusive_error_remove (GtkWidget *w, gpointer data)
 {
-	g_hash_table_remove(non_intrusive_error_table, data);
+	g_hash_table_remove (non_intrusive_error_table, data);
 }
 
 GtkWidget *
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 52047a0e19..042282bc70 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -135,7 +135,7 @@ void		gnome_calendar_next		(GnomeCalendar *gcal);
 void		gnome_calendar_previous		(GnomeCalendar *gcal);
 void		gnome_calendar_goto		(GnomeCalendar *gcal,
 						 time_t new_time);
-void		gnome_calendar_update_view_times(GnomeCalendar *gcal,
+void		gnome_calendar_update_view_times (GnomeCalendar *gcal,
 						 time_t start_time);
 void		gnome_calendar_dayjump		(GnomeCalendar *gcal,
 						 time_t time);
@@ -149,7 +149,7 @@ void		gnome_calendar_display_view	(GnomeCalendar *gcal,
 						 GnomeCalendarViewType view_type);
 
 struct _ECalendarView *
-		gnome_calendar_get_calendar_view(GnomeCalendar *gcal,
+		gnome_calendar_get_calendar_view (GnomeCalendar *gcal,
 						 GnomeCalendarViewType view_type);
 
 gboolean	gnome_calendar_get_range_selected
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 1c4ced6105..448d394d9a 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -78,7 +78,7 @@ itip_addresses_get (void)
 EAccount *
 itip_addresses_get_default (void)
 {
-	return (EAccount *)e_account_list_get_default(itip_addresses_get());
+	return (EAccount *)e_account_list_get_default (itip_addresses_get ());
 }
 
 gboolean
@@ -109,7 +109,7 @@ itip_organizer_is_user_ex (ECalComponent *comp, ECal *client, gboolean skip_cap_
 			return FALSE;
 		}
 
-		user_org = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+		user_org = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
 	}
 
 	return user_org;
@@ -134,7 +134,7 @@ itip_sentby_is_user (ECalComponent *comp, ECal *client)
 	e_cal_component_get_organizer (comp, &organizer);
 	if (organizer.sentby != NULL) {
 		strip = itip_strip_mailto (organizer.sentby);
-		user_sentby = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
+		user_sentby = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, strip) != NULL;
 	}
 
 	return user_sentby;
@@ -229,10 +229,10 @@ itip_get_comp_attendee (ECalComponent *comp, ECal *client)
 		address = NULL;
 	}
 
-	for (it = e_list_get_iterator((EList *)al);
-			e_iterator_is_valid(it);
-			e_iterator_next(it)) {
-		a = (EAccount *) e_iterator_get(it);
+	for (it = e_list_get_iterator ((EList *)al);
+			e_iterator_is_valid (it);
+			e_iterator_next (it)) {
+		a = (EAccount *) e_iterator_get (it);
 
 		if (!a->enabled)
 			continue;
@@ -881,7 +881,7 @@ comp_limit_attendees (ECalComponent *comp)
 		attendee_text = g_strdup (itip_strip_mailto (attendee));
 		g_free (attendee);
 		attendee_text = g_strstrip (attendee_text);
-		found = match = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, attendee_text) != NULL;
+		found = match = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, attendee_text) != NULL;
 
 		if (!found) {
 			param = icalproperty_get_first_parameter (prop, ICAL_SENTBY_PARAMETER);
@@ -889,11 +889,11 @@ comp_limit_attendees (ECalComponent *comp)
 				attendee_sentby = icalparameter_get_sentby (param);
 				attendee_sentby_text = g_strdup (itip_strip_mailto (attendee_sentby));
 				attendee_sentby_text = g_strstrip (attendee_sentby_text);
-				found = match = e_account_list_find(itip_addresses_get(), E_ACCOUNT_FIND_ID_ADDRESS, attendee_sentby_text) != NULL;
+				found = match = e_account_list_find (itip_addresses_get (), E_ACCOUNT_FIND_ID_ADDRESS, attendee_sentby_text) != NULL;
 			}
 		}
 
-		g_free(attendee_text);
+		g_free (attendee_text);
 		g_free (attendee_sentby_text);
 
 		if (!match)
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 84ad29c8b9..5457f0a305 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -438,7 +438,7 @@ print_text (GtkPrintContext *context, PangoFontDescription *desc,
 	cairo_move_to (cr, x1, y1);
 	pango_cairo_show_layout (cr, layout);
 
-	cairo_stroke(cr);
+	cairo_stroke (cr);
 
 	cairo_restore (cr);
 
@@ -518,7 +518,7 @@ static const gchar *days[] = {
   format the date 'nicely' and consistently for various headers
 */
 static gchar *
-format_date(time_t time, gint flags, gchar *buffer, gint bufflen)
+format_date (time_t time, gint flags, gchar *buffer, gint bufflen)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	gchar fmt[64];
@@ -533,7 +533,7 @@ format_date(time_t time, gint flags, gchar *buffer, gint bufflen)
 	if (flags & DATE_DAY) {
 		if (flags & DATE_DAYNAME)
 			strcat(fmt, " ");
-		strcat(fmt, gettext(days[tm.tm_mday-1]));
+		strcat (fmt, gettext (days[tm.tm_mday-1]));
 	}
 	if (flags & DATE_MONTH) {
 		if (flags & (DATE_DAY|DATE_DAYNAME))
@@ -547,7 +547,7 @@ format_date(time_t time, gint flags, gchar *buffer, gint bufflen)
 			strcat(fmt, " ");
 		strcat(fmt, "%Y");
 	}
-	e_utf8_strftime(buffer, bufflen, fmt, &tm);
+	e_utf8_strftime (buffer, bufflen, fmt, &tm);
 	buffer[bufflen - 1] = '\0';
 
 	return buffer;
@@ -1401,7 +1401,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		max_font_size = ((top - bottom) / pdi.rows) - 4;
 	else
 		max_font_size = ((bottom - top ) / pdi.rows) - 4;
-	font_size = MIN(DAY_NORMAL_FONT_SIZE, max_font_size);
+	font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);
 	font = get_font_for_size (font_size, PANGO_WEIGHT_NORMAL);
 
 	for (i = 0; i < pdi.events[0]->len; i++) {
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 69ba5b79f3..699bfb21b9 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -431,7 +431,7 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 	priv = wp->priv;
 
 	if (event->type == GDK_KEY_PRESS)
-		return handle_key_press_event(wp, event);
+		return handle_key_press_event (wp, event);
 
 	if (!(event->type == GDK_BUTTON_PRESS && event->button.button == 1))
 		return FALSE;
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
index 7874a809fd..1bc16f120d 100644
--- a/calendar/importers/evolution-calendar-importer.h
+++ b/calendar/importers/evolution-calendar-importer.h
@@ -26,10 +26,10 @@
 
 G_BEGIN_DECLS
 
-struct _EImportImporter *ical_importer_peek(void);
-struct _EImportImporter *vcal_importer_peek(void);
+struct _EImportImporter *ical_importer_peek (void);
+struct _EImportImporter *vcal_importer_peek (void);
 
-struct _EImportImporter *gnome_calendar_importer_peek(void);
+struct _EImportImporter *gnome_calendar_importer_peek (void);
 
 G_END_DECLS
 
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index 38db4cad92..45de793778 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -97,13 +97,13 @@ is_icalcomp_usable (icalcomponent *icalcomp)
 }
 
 static void
-ivcal_import_done(ICalImporter *ici)
+ivcal_import_done (ICalImporter *ici)
 {
 	g_object_unref (ici->client);
 	icalcomponent_free (ici->icalcomp);
 
-	e_import_complete(ici->import, ici->target);
-	g_object_unref(ici->import);
+	e_import_complete (ici->import, ici->target);
+	g_object_unref (ici->import);
 	g_free (ici);
 }
 
@@ -206,22 +206,22 @@ static void
 button_toggled_cb (GtkWidget *widget, struct _selector_data *sd)
 {
 	g_datalist_set_data_full(&sd->target->data, "primary-source",
-				 g_object_ref(e_source_selector_peek_primary_selection((ESourceSelector *)sd->selector)),
+				 g_object_ref (e_source_selector_peek_primary_selection ((ESourceSelector *)sd->selector)),
 				 g_object_unref);
 	g_datalist_set_data(&sd->target->data, "primary-type", GINT_TO_POINTER(import_type_map[sd->page]));
-	gtk_notebook_set_current_page((GtkNotebook *)sd->notebook, sd->page);
+	gtk_notebook_set_current_page ((GtkNotebook *)sd->notebook, sd->page);
 }
 
 static void
 primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
 {
 	g_datalist_set_data_full(&target->data, "primary-source",
-				 g_object_ref(e_source_selector_peek_primary_selection(selector)),
+				 g_object_ref (e_source_selector_peek_primary_selection (selector)),
 				 g_object_unref);
 }
 
 static GtkWidget *
-ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
+ivcal_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *vbox, *hbox, *first = NULL;
 	GSList *group = NULL;
@@ -251,9 +251,9 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 		selector = e_source_selector_new (source_list);
 		e_source_selector_show_selection (E_SOURCE_SELECTOR (selector), FALSE);
-		scrolled = gtk_scrolled_window_new(NULL, NULL);
-		gtk_scrolled_window_set_policy((GtkScrolledWindow *)scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-		gtk_container_add((GtkContainer *)scrolled, selector);
+		scrolled = gtk_scrolled_window_new (NULL, NULL);
+		gtk_scrolled_window_set_policy ((GtkScrolledWindow *)scrolled, GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+		gtk_container_add ((GtkContainer *)scrolled, selector);
 		gtk_notebook_append_page (GTK_NOTEBOOK (nb), scrolled, NULL);
 
 		/* FIXME What if no sources? */
@@ -265,7 +265,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 		rb = gtk_radio_button_new_with_label (group, _(import_type_strings[i]));
 		gtk_box_pack_start (GTK_BOX (hbox), rb, FALSE, FALSE, 6);
 
-		sd = g_malloc0(sizeof(*sd));
+		sd = g_malloc0 (sizeof (*sd));
 		sd->target = target;
 		sd->selector = selector;
 		sd->notebook = nb;
@@ -283,7 +283,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 		g_object_unref (source_list);
 	}
 	if (first)
-		gtk_toggle_button_set_active((GtkToggleButton *)first, TRUE);
+		gtk_toggle_button_set_active ((GtkToggleButton *)first, TRUE);
 
 	gtk_widget_show_all (vbox);
 
@@ -291,7 +291,7 @@ ivcal_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static gboolean
-ivcal_import_items(gpointer d)
+ivcal_import_items (gpointer d)
 {
 	ICalImporter *ici = d;
 
@@ -312,24 +312,24 @@ ivcal_import_items(gpointer d)
 		g_return_val_if_reached (FALSE);
 	}
 
-	ivcal_import_done(ici);
+	ivcal_import_done (ici);
 	ici->idle_id = 0;
 
 	return FALSE;
 }
 
 static void
-ivcal_opened(ECal *ecal, const GError *error, ICalImporter *ici)
+ivcal_opened (ECal *ecal, const GError *error, ICalImporter *ici)
 {
 	if (!ici->cancelled && !error) {
 		e_import_status(ici->import, ici->target, _("Importing..."), 0);
-		ici->idle_id = g_idle_add(ivcal_import_items, ici);
+		ici->idle_id = g_idle_add (ivcal_import_items, ici);
 	} else
-		ivcal_import_done(ici);
+		ivcal_import_done (ici);
 }
 
 static void
-ivcal_import(EImport *ei, EImportTarget *target, icalcomponent *icalcomp)
+ivcal_import (EImport *ei, EImportTarget *target, icalcomponent *icalcomp)
 {
 	ECal *client;
 	ECalSourceType type;
@@ -338,27 +338,27 @@ ivcal_import(EImport *ei, EImportTarget *target, icalcomponent *icalcomp)
 
 	client = e_auth_new_cal_from_source (g_datalist_get_data(&target->data, "primary-source"), type);
 	if (client) {
-		ICalImporter *ici = g_malloc0(sizeof(*ici));
+		ICalImporter *ici = g_malloc0 (sizeof (*ici));
 
 		ici->import = ei;
 		g_datalist_set_data(&target->data, "ivcal-data", ici);
-		g_object_ref(ei);
+		g_object_ref (ei);
 		ici->target = target;
 		ici->icalcomp = icalcomp;
 		ici->client = client;
 		ici->source_type = type;
 		e_import_status(ei, target, _("Opening calendar"), 0);
 		g_signal_connect(client, "cal-opened-ex", G_CALLBACK(ivcal_opened), ici);
-		e_cal_open_async(client, TRUE);
+		e_cal_open_async (client, TRUE);
 		return;
 	} else {
-		icalcomponent_free(icalcomp);
-		e_import_complete(ei, target);
+		icalcomponent_free (icalcomp);
+		e_import_complete (ei, target);
 	}
 }
 
 static void
-ivcal_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
+ivcal_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	ICalImporter *ici = g_datalist_get_data(&target->data, "ivcal-data");
 
@@ -372,7 +372,7 @@ ivcal_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
  */
 
 static gboolean
-ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
+ical_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	gchar *contents;
@@ -414,7 +414,7 @@ ical_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static void
-ical_import(EImport *ei, EImportTarget *target, EImportImporter *im)
+ical_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	gchar *contents;
@@ -423,13 +423,13 @@ ical_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (!filename) {
-		e_import_complete(ei, target);
+		e_import_complete (ei, target);
 		return;
 	}
 
 	if (!g_file_get_contents (filename, &contents, NULL, NULL)) {
 		g_free (filename);
-		e_import_complete(ei, target);
+		e_import_complete (ei, target);
 		return;
 	}
 	g_free (filename);
@@ -438,9 +438,9 @@ ical_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 	g_free (contents);
 
 	if (icalcomp)
-		ivcal_import(ei, target, icalcomp);
+		ivcal_import (ei, target, icalcomp);
 	else
-		e_import_complete(ei, target);
+		e_import_complete (ei, target);
 }
 
 static GtkWidget *
@@ -488,7 +488,7 @@ static EImportImporter ical_importer = {
 };
 
 EImportImporter *
-ical_importer_peek(void)
+ical_importer_peek (void)
 {
 	ical_importer.name = _("iCalendar files (.ics)");
 	ical_importer.description = _("Evolution iCalendar importer");
@@ -502,7 +502,7 @@ ical_importer_peek(void)
  */
 
 static gboolean
-vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
+vcal_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	gchar *contents;
@@ -525,7 +525,7 @@ vcal_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 
 	/* Z: Wow, this is *efficient* */
 
-	if (g_file_get_contents(filename, &contents, NULL, NULL)) {
+	if (g_file_get_contents (filename, &contents, NULL, NULL)) {
 		VObject *vcal;
 		icalcomponent *icalcomp;
 
@@ -599,24 +599,24 @@ load_vcalendar_file (const gchar *filename)
 }
 
 static void
-vcal_import(EImport *ei, EImportTarget *target, EImportImporter *im)
+vcal_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	icalcomponent *icalcomp;
 	EImportTargetURI *s = (EImportTargetURI *)target;
 
-	filename = g_filename_from_uri(s->uri_src, NULL, NULL);
+	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (!filename) {
-		e_import_complete(ei, target);
+		e_import_complete (ei, target);
 		return;
 	}
 
-	icalcomp = load_vcalendar_file(filename);
+	icalcomp = load_vcalendar_file (filename);
 	g_free (filename);
 	if (icalcomp)
-		ivcal_import(ei, target, icalcomp);
+		ivcal_import (ei, target, icalcomp);
 	else
-		e_import_complete(ei, target);
+		e_import_complete (ei, target);
 }
 
 static GtkWidget *
@@ -657,7 +657,7 @@ static EImportImporter vcal_importer = {
 };
 
 EImportImporter *
-vcal_importer_peek(void)
+vcal_importer_peek (void)
 {
 	vcal_importer.name = _("vCalendar files (.vcs)");
 	vcal_importer.description = _("Evolution vCalendar importer");
@@ -668,7 +668,7 @@ vcal_importer_peek(void)
 /* ********************************************************************** */
 
 static gboolean
-gnome_calendar_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
+gnome_calendar_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	gchar *filename;
 	gboolean res;
@@ -677,14 +677,14 @@ gnome_calendar_supported(EImport *ei, EImportTarget *target, EImportImporter *im
 		return FALSE;
 
 	filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL);
-	res = g_file_test(filename, G_FILE_TEST_IS_REGULAR);
+	res = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
 	g_free (filename);
 
 	return res;
 }
 
 static void
-gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im)
+gnome_calendar_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	icalcomponent *icalcomp = NULL;
 	gchar *filename;
@@ -728,7 +728,7 @@ gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 	if (!icalcomp)
 		goto out;
 
-	ici = g_malloc0(sizeof(*ici));
+	ici = g_malloc0 (sizeof (*ici));
 	g_datalist_set_data_full(&target->data, "gnomecal-data", ici, g_free);
 
 	/* Wait for client to finish opening the calendar & tasks folders. */
@@ -752,7 +752,7 @@ gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 		    && tasks_state == E_CAL_LOAD_LOADED)
 			break;
 
-		g_usleep(1000000);
+		g_usleep (1000000);
 		if (ici->cancelled)
 			goto out;
 	}
@@ -788,23 +788,23 @@ gnome_calendar_import(EImport *ei, EImportTarget *target, EImportImporter *im)
 	if (tasks_client)
 		g_object_unref (tasks_client);
 
-	e_import_complete(ei, target);
+	e_import_complete (ei, target);
 }
 
 static void
-calendar_toggle_cb(GtkToggleButton *tb, EImportTarget *target)
+calendar_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
 {
 	g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
 }
 
 static void
-tasks_toggle_cb(GtkToggleButton *tb, EImportTarget *target)
+tasks_toggle_cb (GtkToggleButton *tb, EImportTarget *target)
 {
 	g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
 }
 
 static GtkWidget *
-gnome_calendar_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im)
+gnome_calendar_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	GtkWidget *hbox, *w;
 	GConfClient *gconf;
@@ -813,7 +813,7 @@ gnome_calendar_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im
 	gconf = gconf_client_get_default ();
 	done_cal = gconf_client_get_bool (gconf, "/apps/evolution/importer/gnome-calendar/calendar", NULL);
 	done_tasks = gconf_client_get_bool (gconf, "/apps/evolution/importer/gnome-calendar/tasks", NULL);
-	g_object_unref(gconf);
+	g_object_unref (gconf);
 
 	g_datalist_set_data(&target->data, "gnomecal-do-cal", GINT_TO_POINTER(!done_cal));
 	g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(!done_tasks));
@@ -821,12 +821,12 @@ gnome_calendar_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im
 	hbox = gtk_hbox_new (FALSE, 2);
 
 	w = gtk_check_button_new_with_label (_("Calendar Events"));
-	gtk_toggle_button_set_active((GtkToggleButton *)w, !done_cal);
+	gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_cal);
 	g_signal_connect (w, "toggled", G_CALLBACK (calendar_toggle_cb), target);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 
 	w = gtk_check_button_new_with_label (_("Tasks"));
-	gtk_toggle_button_set_active((GtkToggleButton *)w, !done_tasks);
+	gtk_toggle_button_set_active ((GtkToggleButton *)w, !done_tasks);
 	g_signal_connect (w, "toggled", G_CALLBACK (tasks_toggle_cb), target);
 	gtk_box_pack_start (GTK_BOX (hbox), w, FALSE, FALSE, 0);
 
@@ -836,7 +836,7 @@ gnome_calendar_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im
 }
 
 static void
-gnome_calendar_cancel(EImport *ei, EImportTarget *target, EImportImporter *im)
+gnome_calendar_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
 {
 	ICalIntelligentImporter *ici = g_datalist_get_data(&target->data, "gnomecal-data");
 
@@ -855,7 +855,7 @@ static EImportImporter gnome_calendar_importer = {
 };
 
 EImportImporter *
-gnome_calendar_importer_peek(void)
+gnome_calendar_importer_peek (void)
 {
 	gnome_calendar_importer.name = _("Gnome Calendar");
 	gnome_calendar_importer.description = _("Evolution Calendar intelligent importer");