Coding style and whitespace cleanup.

28 files changed, 107 insertions, 108 deletions

diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 2f1ad05caf..148bfa973f 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1724,7 +1724,7 @@ popup_notification (time_t trigger,
 	if (!qa)
 		return;
 	if (!notify_is_initted ())
-		notify_init("Evolution Alarm Notify");
+		notify_init ("Evolution Alarm Notify");
 
 	/* get a sensible description for the event */
 	e_cal_component_get_summary (comp, &text);
@@ -2048,7 +2048,7 @@ alarm_queue_init (gpointer data)
 	g_timeout_add_seconds (1800, (GSourceFunc) check_midnight_refresh, NULL);
 
 #ifdef HAVE_LIBNOTIFY
-	notify_init("Evolution Alarms");
+	notify_init ("Evolution Alarms");
 #endif
 
 	alarm_queue_inited = TRUE;
diff --git a/calendar/alarm-notify/util.c b/calendar/alarm-notify/util.c
index 0eee6d5510..d06df4db05 100644
--- a/calendar/alarm-notify/util.c
+++ b/calendar/alarm-notify/util.c
@@ -67,17 +67,17 @@ calculate_time (time_t start,
 		hours = difference / 3600;
 		difference %= 3600;
 
-		times[i++] = g_strdup_printf (ngettext("%d hour", "%d hours", hours), hours);
+		times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours);
 	}
 	if (difference >= 60) {
 		minutes = difference / 60;
 		difference %= 60;
 
-		times[i++] = g_strdup_printf (ngettext("%d minute", "%d minutes", minutes), minutes);
+		times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes);
 	}
 	if (i == 0 || difference != 0) {
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
+		times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference);
 	}
 
 	times[i] = NULL;
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index dbf3cd0104..31fdf6f6b3 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -3620,7 +3620,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 			camel_mime_part_get_content_id (mime_part));
 
 		disp = camel_mime_part_get_disposition (mime_part);
-		if (disp && !g_ascii_strcasecmp(disp, "inline"))
+		if (disp && !g_ascii_strcasecmp (disp, "inline"))
 			cal_mime_attach->disposition = TRUE;
 
 		attach_list = g_slist_append (attach_list, cal_mime_attach);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index d8d0711ab1..f590b9f37f 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1918,9 +1918,9 @@ event_page_set_delegate (EventPage *page,
 	g_return_if_fail (IS_EVENT_PAGE (page));
 
 	if (set)
-		gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("_Delegatees"));
+		gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("_Delegatees"));
 	else
-		gtk_label_set_text_with_mnemonic ((GtkLabel *)page->priv->attendees_label, _("Atte_ndees"));
+		gtk_label_set_text_with_mnemonic ((GtkLabel *) page->priv->attendees_label, _("Atte_ndees"));
 }
 
 static void
@@ -2223,7 +2223,7 @@ remove_clicked_cb (GtkButton *btn,
 			g_warning ("Cannot delete attendee\n");
 			continue;
 		} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
-			g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));
+			g_warning ("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address (ia));
 			continue;
 		}
 
@@ -3420,19 +3420,19 @@ init_widgets (EventPage *epage)
 	switch (priv->alarm_units) {
 	case E_DURATION_DAYS:
 		if (priv->alarm_interval != 1) {
-			combo_label = g_strdup_printf (ngettext("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
+			combo_label = g_strdup_printf (ngettext ("%d day before appointment", "%d days before appointment", priv->alarm_interval), priv->alarm_interval);
 		}
 		break;
 
 	case E_DURATION_HOURS:
 		if (priv->alarm_interval != 1) {
-			combo_label = g_strdup_printf (ngettext("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
+			combo_label = g_strdup_printf (ngettext ("%d hour before appointment", "%d hours before appointment", priv->alarm_interval), priv->alarm_interval);
 		}
 		break;
 
 	case E_DURATION_MINUTES:
 		if (priv->alarm_interval != 15) {
-			combo_label = g_strdup_printf (ngettext("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
+			combo_label = g_strdup_printf (ngettext ("%d minute before appointment", "%d minutes before appointment", priv->alarm_interval), priv->alarm_interval);
 		}
 		break;
 	}
@@ -3736,8 +3736,8 @@ event_page_get_alarm_page (EventPage *epage)
 
 	priv = epage->priv;
 
-	tmp = GW("dialog-vbox1");
-	alarm_page = GW("vbox2");
+	tmp = GW ("dialog-vbox1");
+	alarm_page = GW ("vbox2");
 	g_object_ref (alarm_page);
 	gtk_container_remove ((GtkContainer *) tmp, alarm_page);
 
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 6e46de188a..14c1a23b3c 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -862,7 +862,7 @@ get_widgets (MemoPage *mpage)
 
 	priv->main = GW ("memo-page");
 	if (!priv->main) {
-		g_warning("couldn't find memo-page!");
+		g_warning ("couldn't find memo-page!");
 		return FALSE;
 	}
 
@@ -1171,7 +1171,7 @@ get_to_entry (ENameSelector *name_selector)
 
 	name_selector_model = e_name_selector_peek_model (name_selector);
 	e_name_selector_model_add_section (name_selector_model, "To", _("To"), NULL);
-	name_selector_entry = (ENameSelectorEntry *)e_name_selector_peek_section_list (name_selector, "To");
+	name_selector_entry = (ENameSelectorEntry *) e_name_selector_peek_section_list (name_selector, "To");
 
 	return GTK_WIDGET (name_selector_entry);
 }
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 297e1f4313..9f1542ced3 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1284,7 +1284,7 @@ remove_clicked_cb (GtkButton *btn,
 			g_warning ("Cannot delete attendee\n");
 			continue;
 		} else if (e_meeting_attendee_get_edit_level (ia) != E_MEETING_ATTENDEE_EDIT_FULL) {
-			g_warning("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address(ia));
+			g_warning ("Not enough rights to delete attendee: %s\n", e_meeting_attendee_get_address (ia));
 			continue;
 		}
 
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index e03a9f2528..bbfb66326d 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -355,31 +355,31 @@ get_alarm_duration_string (struct icaldurationtype *duration)
 
 	if (duration->days >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d days before start of appointment" */
-		g_string_printf (string, ngettext("%d day", "%d days", duration->days), duration->days);
+		g_string_printf (string, ngettext ("%d day", "%d days", duration->days), duration->days);
 		have_something = TRUE;
 	}
 
 	if (duration->weeks >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d weeks before start of appointment" */
-		g_string_printf (string, ngettext("%d week","%d weeks", duration->weeks), duration->weeks);
+		g_string_printf (string, ngettext ("%d week","%d weeks", duration->weeks), duration->weeks);
 		have_something = TRUE;
 	}
 
 	if (duration->hours >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d hours before start of appointment" */
-		g_string_printf (string, ngettext("%d hour", "%d hours", duration->hours), duration->hours);
+		g_string_printf (string, ngettext ("%d hour", "%d hours", duration->hours), duration->hours);
 		have_something = TRUE;
 	}
 
 	if (duration->minutes >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d minutes before start of appointment" */
-		g_string_printf (string, ngettext("%d minute", "%d minutes", duration->minutes), duration->minutes);
+		g_string_printf (string, ngettext ("%d minute", "%d minutes", duration->minutes), duration->minutes);
 		have_something = TRUE;
 	}
 
 	if (duration->seconds >= 1) {
 		/* Translator: Entire string is like "Pop up an alert %d seconds before start of appointment" */
-		g_string_printf (string, ngettext("%d second", "%d seconds", duration->seconds), duration->seconds);
+		g_string_printf (string, ngettext ("%d second", "%d seconds", duration->seconds), duration->seconds);
 		have_something = TRUE;
 	}
 
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 0eef0d2a64..99263ff158 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -96,9 +96,9 @@ clear_comp_info (ECalComponentPreview *preview)
 static gboolean
 update_comp_info (ECalComponentPreview *preview,
                   ECalClient *client,
-		  ECalComponent *comp,
-		  icaltimezone *zone,
-		  gboolean use_24_hour_format)
+                  ECalComponent *comp,
+                  icaltimezone *zone,
+                  gboolean use_24_hour_format)
 {
 	ECalComponentPreviewPrivate *priv;
 	gboolean changed;
@@ -195,7 +195,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
 
 static void
 cal_component_preview_write_html (ECalComponentPreview *preview,
-				  GString *buffer)
+                                  GString *buffer)
 {
 	ECalClient *client;
 	ECalComponent *comp;
@@ -413,7 +413,6 @@ load_comp (ECalComponentPreview *preview)
 		return;
 	}
 
-
 	buffer = g_string_sized_new (4096);
 	cal_component_preview_write_html (preview, buffer);
 	e_web_view_load_string (E_WEB_VIEW (preview), buffer->str);
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 7ce31d2956..09a58941e7 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -126,7 +126,7 @@ ecmm_set_value_at (ETableModel *etm,
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data) {
-		g_warning("couldn't get component data: row == %d", row);
+		g_warning ("couldn't get component data: row == %d", row);
 		return;
 	}
 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 273e452c88..246d3dc2bd 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1572,7 +1572,7 @@ ecm_initialize_value (ETableModel *etm,
 
 	switch (col) {
 	case E_CAL_MODEL_FIELD_CATEGORIES :
-		return g_strdup (priv->default_category?priv->default_category:"");
+		return g_strdup (priv->default_category ? priv->default_category:"");
 	case E_CAL_MODEL_FIELD_CLASSIFICATION :
 	case E_CAL_MODEL_FIELD_DESCRIPTION :
 	case E_CAL_MODEL_FIELD_SUMMARY :
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 795aacabc4..a2eb33cacd 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2040,7 +2040,7 @@ e_calendar_view_get_tooltips (const ECalendarViewEventData *data)
 	tmp = calculate_time (t_start, t_end);
 
 	/* To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"*/
-	tmp2 = g_strdup_printf(_("Time: %s %s"), tmp1, tmp);
+	tmp2 = g_strdup_printf (_("Time: %s %s"), tmp1, tmp);
 	if (zone && !cal_comp_util_compare_event_timezones (newcomp, client, default_zone)) {
 		g_free (tmp);
 		g_free (tmp1);
@@ -2181,7 +2181,7 @@ e_calendar_view_get_icalcomponent_summary (ECalClient *client,
 
 void
 e_calendar_view_emit_user_created (ECalendarView *cal_view,
-				   ECalClient *where_was_created)
+                                   ECalClient *where_was_created)
 {
 	g_return_if_fail (E_IS_CALENDAR_VIEW (cal_view));
 
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 2b8f7a8b31..76d3b019d3 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1115,7 +1115,7 @@ e_day_view_init (EDayView *day_view)
 				       "clip", TRUE,
 				       "max_lines", 1,
 				       "editable", TRUE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
+				       "fill_color_rgba", GNOME_CANVAS_COLOR (0, 0, 0),
 				       NULL);
 	gnome_canvas_item_hide (day_view->drag_long_event_item);
 
@@ -1192,7 +1192,7 @@ e_day_view_init (EDayView *day_view)
 				       "line_wrap", TRUE,
 				       "clip", TRUE,
 				       "editable", TRUE,
-				       "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0),
+				       "fill_color_rgba", GNOME_CANVAS_COLOR (0, 0, 0),
 				       NULL);
 	gnome_canvas_item_hide (day_view->drag_item);
 
@@ -2931,7 +2931,7 @@ e_day_view_recalc_work_week (EDayView *day_view)
 	if (!day_view->work_week_view)
 		return;
 
-	e_day_view_recalc_work_week_days_shown	(day_view);
+	e_day_view_recalc_work_week_days_shown (day_view);
 
 	/* If the date isn't set, just return. */
 	if (day_view->lower == 0 && day_view->upper == 0)
@@ -3350,7 +3350,7 @@ e_day_view_on_time_canvas_scroll (GtkWidget *widget,
                                   GdkEventScroll *scroll,
                                   EDayView *day_view)
 {
-	GtkWidget *tool_window = g_object_get_data ((GObject *)day_view, "tooltip-window");
+	GtkWidget *tool_window = g_object_get_data ((GObject *) day_view, "tooltip-window");
 
 	if (tool_window) {
 		gtk_widget_destroy (tool_window);
@@ -6286,8 +6286,8 @@ tooltip_destroy (EDayView *day_view,
 
 	if (item) {
 		EDayViewEvent *pevent;
-		gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
-		gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+		gint event_num = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-num"));
+		gint day = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-day"));
 
 		pevent = tooltip_get_view_event (day_view, day, event_num);
 		if (pevent) {
@@ -6451,14 +6451,14 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 	case GDK_MOTION_NOTIFY:
 		{
 			EDayViewEvent *pevent;
-			gint event_num = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-num"));
-			gint day = GPOINTER_TO_INT(g_object_get_data ((GObject *)item, "event-day"));
+			gint event_num = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-num"));
+			gint day = GPOINTER_TO_INT (g_object_get_data ((GObject *) item, "event-day"));
 
 			pevent = tooltip_get_view_event (day_view, day, event_num);
 
 			pevent->x = ((GdkEventMotion *) event)->x_root;
 			pevent->y = ((GdkEventMotion *) event)->y_root;
-			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (day_view), "tooltip-window");
+			pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (day_view), "tooltip-window");
 
 			if (pevent->tooltip) {
 				e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -6531,8 +6531,8 @@ e_day_view_event_move (ECalendarView *cal_view,
 		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
 		start_time = icaltime_from_timet (start_dt, 0);
 		end_time = icaltime_from_timet (end_dt, 0);
-		icaltime_adjust	(&start_time ,-1,0,0,0);
-		icaltime_adjust	(&end_time ,-1,0,0,0);
+		icaltime_adjust (&start_time ,-1,0,0,0);
+		icaltime_adjust (&end_time ,-1,0,0,0);
 		start_dt = icaltime_as_timet (start_time);
 		end_dt = icaltime_as_timet (end_time);
 		break;
@@ -6543,8 +6543,8 @@ e_day_view_event_move (ECalendarView *cal_view,
 		end_dt = e_day_view_convert_grid_position_to_time (day_view, day, resize_end_row + 1);
 		start_time = icaltime_from_timet (start_dt, 0);
 		end_time = icaltime_from_timet (end_dt, 0);
-		icaltime_adjust	(&start_time ,1,0,0,0);
-		icaltime_adjust	(&end_time ,1,0,0,0);
+		icaltime_adjust (&start_time ,1,0,0,0);
+		icaltime_adjust (&end_time ,1,0,0,0);
 		start_dt = icaltime_as_timet (start_time);
 		end_dt = icaltime_as_timet (end_time);
 		break;
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 68da39760f..19358ef02a 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -405,7 +405,7 @@ attendee_edited_cb (GtkCellRenderer *renderer,
 			}
 
 			attendee = e_meeting_store_add_attendee_with_defaults (model);
-			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *)l->data));
+			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (gchar *) l->data));
 			e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
 			if (existing_attendee) {
 				/* FIXME Should we copy anything else? */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 4810f0c82d..711c4b13c4 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -649,7 +649,7 @@ month_scrol_by_week_changed_cb (GSettings *settings,
 
 	if (week_view->multi_week_view && week_view->month_scroll_by_week != calendar_config_get_month_scroll_by_week ()) {
 		week_view->multi_week_view = FALSE;
-		e_week_view_set_multi_week_view	(week_view, TRUE);
+		e_week_view_set_multi_week_view (week_view, TRUE);
 	}
 }
 
@@ -3015,7 +3015,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
 				G_PRIORITY_DEFAULT, 500,
 				(GSourceFunc) e_calendar_view_get_tooltips,
 				data, (GDestroyNotify) g_free);
-			g_object_set_data ((GObject *)view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
+			g_object_set_data ((GObject *) view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
 			return TRUE;
 		} else {
@@ -3024,7 +3024,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
 		case GDK_MOTION_NOTIFY:
 			pevent->x = ((GdkEventMotion *) event)->x_root;
 			pevent->y = ((GdkEventMotion *) event)->y_root;
-			pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (view), "tooltip-window");
+			pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (view), "tooltip-window");
 
 			if (pevent->tooltip) {
 				e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -3168,7 +3168,7 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 					       NULL);
 	}
 
-	g_object_set_data ((GObject *)span->background_item, "event-num", GINT_TO_POINTER (event_num));
+	g_object_set_data ((GObject *) span->background_item, "event-num", GINT_TO_POINTER (event_num));
 	g_signal_connect (
 		span->background_item, "event",
 		G_CALLBACK (tooltip_event_cb), week_view);
@@ -3657,7 +3657,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 		    || !e_week_view_find_event_from_item (week_view, item, &nevent, &nspan))
 			return FALSE;
 
-		g_object_set_data ((GObject *)item, "event-num", GINT_TO_POINTER (nevent));
+		g_object_set_data ((GObject *) item, "event-num", GINT_TO_POINTER (nevent));
 
 		pevent = tooltip_get_view_event (week_view, -1, nevent);
 
@@ -3675,7 +3675,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 			G_PRIORITY_DEFAULT, 500,
 			(GSourceFunc) e_calendar_view_get_tooltips,
 			data, (GDestroyNotify) g_free);
-		g_object_set_data ((GObject *)week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
+		g_object_set_data ((GObject *) week_view, "tooltip-timeout", GUINT_TO_POINTER (pevent->timeout));
 
 		return TRUE;
 	}
@@ -3686,7 +3686,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 	case GDK_MOTION_NOTIFY:
 		pevent->x = ((GdkEventMotion *) gdkevent)->x_root;
 		pevent->y = ((GdkEventMotion *) gdkevent)->y_root;
-		pevent->tooltip = (GtkWidget *)g_object_get_data (G_OBJECT (week_view), "tooltip-window");
+		pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (week_view), "tooltip-window");
 
 		if (pevent->tooltip) {
 			e_calendar_view_move_tip (pevent->tooltip, pevent->x + 16, pevent->y + 16);
@@ -3757,8 +3757,8 @@ static gboolean e_week_view_event_move (ECalendarView *cal_view, ECalViewMoveDir
 		break;
 	}
 
-	icaltime_adjust	(&start_time ,adjust_days,0,0,0);
-	icaltime_adjust	(&end_time ,adjust_days,0,0,0);
+	icaltime_adjust (&start_time ,adjust_days,0,0,0);
+	icaltime_adjust (&end_time ,adjust_days,0,0,0);
 	start_dt = icaltime_as_timet_with_zone (start_time,
 		e_calendar_view_get_timezone (E_CALENDAR_VIEW (week_view)));
 	end_dt = icaltime_as_timet_with_zone (end_time,
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index cd777949ab..220e4415eb 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -313,7 +313,7 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 
 	ATK_OBJECT_CLASS (parent_class)->set_name (accessible, name_string);
 #ifdef ACC_DEBUG
-	printf("EvoAcc:  name for event accobj=%p, is %s\n",
+	printf ("EvoAcc:  name for event accobj=%p, is %s\n",
 	       (gpointer) accessible, new_name);
 #endif
 	g_free (name_string);
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 415e72bb0d..d7c700893e 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -228,9 +228,9 @@ ea_cal_view_event_changed_cb (ECalendarView *cal_view,
 	}
 	if (event_atk_obj) {
 #ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p changed\n", (gpointer)event);
+		printf ("AccDebug: event=%p changed\n", (gpointer) event);
 #endif
-		g_object_notify (G_OBJECT(event_atk_obj), "accessible-name");
+		g_object_notify (G_OBJECT (event_atk_obj), "accessible-name");
 		g_signal_emit_by_name (event_atk_obj, "visible_data_changed");
 	}
 
@@ -274,7 +274,7 @@ ea_cal_view_event_added_cb (ECalendarView *cal_view,
 		if (index < 0)
 			return;
 #ifdef ACC_DEBUG
-		printf ("AccDebug: event=%p added\n", (gpointer)event);
+		printf ("AccDebug: event=%p added\n", (gpointer) event);
 #endif
 		g_signal_emit_by_name (atk_obj, "children_changed::add",
 				       index, event_atk_obj, NULL);
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index 0215435c08..2aa7daac88 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -188,7 +188,7 @@ ea_calendar_focus_watcher (GSignalInvocationHint *ihint,
 				/* focus out */
 				ea_event = NULL;
 #ifdef ACC_DEBUG
-			printf ("EvoAcc: focus notify on day main item %p\n", (gpointer)object);
+			printf ("EvoAcc: focus notify on day main item %p\n", (gpointer) object);
 #endif
 			atk_focus_tracker_notify (ea_event);
 		}
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index 419e11426e..8410e00a92 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -85,7 +85,7 @@ e_day_view_cell_new (EDayView *day_view,
 	cell->column = column;
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer)cell);
+	printf ("EvoAcc: e_day_view_cell created %p\n", (gpointer) cell);
 #endif
 
 	return cell;
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 4c5ffb0199..c053258531 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -113,7 +113,7 @@ ea_day_view_new (GtkWidget *widget)
 	atk_object_initialize (accessible, widget);
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_day_view created %p\n", (gpointer)accessible);
+	printf ("EvoAcc: ea_day_view created %p\n", (gpointer) accessible);
 #endif
 
 	return accessible;
diff --git a/calendar/gui/ea-gnome-calendar.c b/calendar/gui/ea-gnome-calendar.c
index 3c7ef014b7..b7ffb20597 100644
--- a/calendar/gui/ea-gnome-calendar.c
+++ b/calendar/gui/ea-gnome-calendar.c
@@ -134,7 +134,7 @@ ea_gnome_calendar_new (GtkWidget *widget)
 		G_CALLBACK (ea_gcal_dates_change_cb), accessible);
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer)accessible);
+	printf ("EvoAcc: ea-gnome-calendar created: %p\n", (gpointer) accessible);
 #endif
 
 	return accessible;
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index fce7a9def1..e8fffd8500 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -85,7 +85,7 @@ e_week_view_cell_new (EWeekView *week_view,
 	cell->column = column;
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer)cell);
+	printf ("EvoAcc: e_week_view_cell created %p\n", (gpointer) cell);
 #endif
 
 	return cell;
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index e33d630f00..2fe8b239c4 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -1097,25 +1097,25 @@ table_interface_get_column_description (AtkTable *table,
 
 		switch (in_col) {
 		case 0:
-			g_snprintf(buffer,128,"Monday");
+			g_snprintf (buffer,128,"Monday");
 			break;
 		case 1:
-			g_snprintf(buffer,128,"Tuesday");
+			g_snprintf (buffer,128,"Tuesday");
 			break;
 		case 2:
-			g_snprintf(buffer,128,"Wednesday");
+			g_snprintf (buffer,128,"Wednesday");
 			break;
 		case 3:
-			g_snprintf(buffer,128,"Thursday");
+			g_snprintf (buffer,128,"Thursday");
 			break;
 		case 4:
-			g_snprintf(buffer,128,"Friday");
+			g_snprintf (buffer,128,"Friday");
 			break;
 		case 5:
-			g_snprintf(buffer,128,"Saturday");
+			g_snprintf (buffer,128,"Saturday");
 			break;
 		case 6:
-			g_snprintf(buffer,128,"Sunday");
+			g_snprintf (buffer,128,"Sunday");
 			break;
 		default:
 			break;
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 679f201d95..fad264888d 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -115,7 +115,7 @@ ea_week_view_new (GtkWidget *widget)
 	atk_object_initialize (accessible, widget);
 
 #ifdef ACC_DEBUG
-	printf ("EvoAcc: ea_week_view created %p\n", (gpointer)accessible);
+	printf ("EvoAcc: ea_week_view created %p\n", (gpointer) accessible);
 #endif
 
 	return accessible;
@@ -250,7 +250,7 @@ ea_week_view_get_n_children (AtkObject *accessible)
 	count++;
 
 #ifdef ACC_DEBUG
-	printf("AccDebug: week view %p has %d children\n", (gpointer)week_view, count);
+	printf ("AccDebug: week view %p has %d children\n", (gpointer) week_view, count);
 #endif
 	return count;
 }
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 7975d2752b..dbd779b0a2 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1273,7 +1273,7 @@ gnome_calendar_set_search_query (GnomeCalendar *gcal,
 	start = start_range;
 	end = end_range;
 
-	d(g_print ("Changing the queries %s \n", sexp));
+	d (g_print ("Changing the queries %s \n", sexp));
 
 	gnome_calendar_update_query (gcal);
 
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index b5d350c86b..350fb5d850 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -753,7 +753,7 @@ comp_to_list (ESourceRegistry *registry,
 			e_destination_set_email (
 				destination, itip_strip_mailto (att->value));
 			g_ptr_array_add (array, destination);
-			d(printf ("itip-utils.c: comp_to_list: name: %s, email: %s\n",
+			d (printf ("itip-utils.c: comp_to_list: name: %s, email: %s\n",
 				  e_destination_get_name (destination),
 				  e_destination_get_email (destination)));
 		}
@@ -1112,10 +1112,10 @@ comp_server_send (ECalComponentItipMethod method,
 	GError *error = NULL;
 
 	top_level = comp_toplevel_with_zones (method, comp, cal_client, zones);
-	d(printf ("itip-utils.c: comp_server_send: calling e_cal_send_objects... \n"));
+	d (printf ("itip-utils.c: comp_server_send: calling e_cal_send_objects... \n"));
 	if (!e_cal_client_send_objects_sync (cal_client, top_level, users, &returned_icalcomp, NULL, &error)) {
 		/* FIXME Really need a book problem status code */
-		d(printf ("itip-utils.c: return value from e_cal_send_objects is: %d", error->code));
+		d (printf ("itip-utils.c: return value from e_cal_send_objects is: %d", error->code));
 		if (error) {
 			if (g_error_matches (error, E_CAL_CLIENT_ERROR, E_CAL_CLIENT_ERROR_OBJECT_ID_ALREADY_EXISTS)) {
 				e_notice (
@@ -1133,7 +1133,7 @@ comp_server_send (ECalComponentItipMethod method,
 			retval = FALSE;
 		}
 	} else {
-	  d(printf ("itip-utils.c: e_cal_send_objects returned without errors\n"));
+	  d (printf ("itip-utils.c: e_cal_send_objects returned without errors\n"));
 	}
 
 	g_clear_error (&error);
@@ -1690,7 +1690,7 @@ itip_send_comp (ESourceRegistry *registry,
 
 	/* Give the server a chance to manipulate the comp */
 	if (method != E_CAL_COMPONENT_METHOD_PUBLISH) {
-		d(printf ("itip-utils.c: itip_send_comp: calling comp_server_send... \n"));
+		d (printf ("itip-utils.c: itip_send_comp: calling comp_server_send... \n"));
 		if (!comp_server_send (method, send_comp, cal_client, zones, &users))
 			goto cleanup;
 	}
@@ -2187,7 +2187,7 @@ itip_publish_comp (ECalClient *cal_client,
 	/* send message to server */
 	soup_session_send_message (session, msg);
 	if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
-		g_warning(G_STRLOC ": Could not publish Free/Busy: %d: %s",
+		g_warning (G_STRLOC ": Could not publish Free/Busy: %d: %s",
 			  msg->status_code,
 			  msg->reason_phrase);
 		g_object_unref (msg);
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index f67ab9142e..ed0f401db2 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -93,17 +93,17 @@ calculate_time (time_t start,
 		hours = difference / 3600;
 		difference %= 3600;
 
-		times[i++] = g_strdup_printf (ngettext("%d hour", "%d hours", hours), hours);
+		times[i++] = g_strdup_printf (ngettext ("%d hour", "%d hours", hours), hours);
 	}
 	if (difference >= 60) {
 		minutes = difference / 60;
 		difference %= 60;
 
-		times[i++] = g_strdup_printf (ngettext("%d minute", "%d minutes", minutes), minutes);
+		times[i++] = g_strdup_printf (ngettext ("%d minute", "%d minutes", minutes), minutes);
 	}
 	if (i == 0 || difference != 0) {
 		/* TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third") */
-		times[i++] = g_strdup_printf (ngettext("%d second", "%d seconds", difference), (gint)difference);
+		times[i++] = g_strdup_printf (ngettext ("%d second", "%d seconds", difference), (gint) difference);
 	}
 
 	times[i] = NULL;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index a81b709f7e..d0d8713f6f 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -608,24 +608,24 @@ format_date (struct tm *tm,
 
 	fmt[0] = 0;
 	if (flags & DATE_DAYNAME) {
-		strcat(fmt, "%A");
+		strcat (fmt, "%A");
 	}
 	if (flags & DATE_DAY) {
 		if (flags & DATE_DAYNAME)
-			strcat(fmt, " ");
+			strcat (fmt, " ");
 		strcat (fmt, gettext (days[tm->tm_mday - 1]));
 	}
 	if (flags & DATE_MONTH) {
 		if (flags & (DATE_DAY | DATE_DAYNAME))
-			strcat(fmt, " ");
-		strcat(fmt, "%B");
+			strcat (fmt, " ");
+		strcat (fmt, "%B");
 		if ((flags & (DATE_DAY | DATE_YEAR)) == (DATE_DAY | DATE_YEAR))
-			strcat(fmt, ",");
+			strcat (fmt, ",");
 	}
 	if (flags & DATE_YEAR) {
 		if (flags & (DATE_DAY | DATE_DAYNAME | DATE_MONTH))
-			strcat(fmt, " ");
-		strcat(fmt, "%Y");
+			strcat (fmt, " ");
+		strcat (fmt, "%Y");
 	}
 	e_utf8_strftime (buffer, bufflen, fmt, tm);
 	buffer[bufflen - 1] = '\0';
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index f2b65f0798..265656dfe6 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -361,7 +361,7 @@ ivcal_getwidget (EImport *ei,
 		sd->selector = selector;
 		sd->notebook = nb;
 		sd->page = i;
-		g_object_set_data_full((GObject *)rb, "selector-data", sd, g_free);
+		g_object_set_data_full ((GObject *) rb, "selector-data", sd, g_free);
 		g_signal_connect (
 			rb, "toggled",
 			G_CALLBACK (button_toggled_cb), sd);
@@ -369,8 +369,8 @@ ivcal_getwidget (EImport *ei,
 		if (!group)
 			group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (rb));
 		if (first == NULL) {
-			g_datalist_set_data_full(&target->data, "primary-source", g_object_ref (source), g_object_unref);
-			g_datalist_set_data(&target->data, "primary-type", GINT_TO_POINTER(import_type_map[i]));
+			g_datalist_set_data_full (&target->data, "primary-source", g_object_ref (source), g_object_unref);
+			g_datalist_set_data (&target->data, "primary-type", GINT_TO_POINTER (import_type_map[i]));
 			first = rb;
 		}
 	}
@@ -443,7 +443,7 @@ ivcal_opened (GObject *source_object,
 
 	ici->cal_client = E_CAL_CLIENT (client);
 
-	e_import_status(ici->import, ici->target, _("Importing..."), 0);
+	e_import_status (ici->import, ici->target, _("Importing..."), 0);
 	ici->idle_id = g_idle_add (ivcal_import_items, ici);
 }
 
@@ -455,10 +455,10 @@ ivcal_import (EImport *ei,
 	EClientSourceType type;
 	ICalImporter *ici = g_malloc0 (sizeof (*ici));
 
-	type = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "primary-type"));
+	type = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "primary-type"));
 
 	ici->import = ei;
-	g_datalist_set_data(&target->data, "ivcal-data", ici);
+	g_datalist_set_data (&target->data, "ivcal-data", ici);
 	g_object_ref (ei);
 	ici->target = target;
 	ici->icalcomp = icalcomp;
@@ -477,7 +477,7 @@ ivcal_cancel (EImport *ei,
               EImportTarget *target,
               EImportImporter *im)
 {
-	ICalImporter *ici = g_datalist_get_data(&target->data, "ivcal-data");
+	ICalImporter *ici = g_datalist_get_data (&target->data, "ivcal-data");
 
 	if (ici)
 		g_cancellable_cancel (ici->cancellable);
@@ -505,7 +505,7 @@ ical_supported (EImport *ei,
 	if (s->uri_src == NULL)
 		return TRUE;
 
-	if (strncmp(s->uri_src, "file:///", 8) != 0)
+	if (strncmp (s->uri_src, "file:///", 8) != 0)
 		return FALSE;
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -641,7 +641,7 @@ vcal_supported (EImport *ei,
 	if (s->uri_src == NULL)
 		return TRUE;
 
-	if (strncmp(s->uri_src, "file:///", 8) != 0)
+	if (strncmp (s->uri_src, "file:///", 8) != 0)
 		return FALSE;
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -807,7 +807,7 @@ gnome_calendar_supported (EImport *ei,
 	if (target->type != E_IMPORT_TARGET_HOME)
 		return FALSE;
 
-	filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL);
+	filename = g_build_filename (g_get_home_dir (), "user-cal.vcf", NULL);
 	res = g_file_test (filename, G_FILE_TEST_IS_REGULAR);
 	g_free (filename);
 
@@ -995,15 +995,15 @@ gnome_calendar_import (EImport *ei,
 	/* This is pretty shitty, everything runs in the gui thread and can block
 	 * for quite some time */
 
-	do_calendar = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-cal"));
-	do_tasks = GPOINTER_TO_INT(g_datalist_get_data(&target->data, "gnomecal-do-tasks"));
+	do_calendar = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "gnomecal-do-cal"));
+	do_tasks = GPOINTER_TO_INT (g_datalist_get_data (&target->data, "gnomecal-do-tasks"));
 
 	/* If neither is selected, just return. */
 	if (!do_calendar && !do_tasks)
 		return;
 
 	/* Load the Gnome Calendar file and convert to iCalendar. */
-	filename = g_build_filename(g_get_home_dir (), "user-cal.vcf", NULL);
+	filename = g_build_filename (g_get_home_dir (), "user-cal.vcf", NULL);
 	icalcomp = load_vcalendar_file (filename);
 	g_free (filename);
 
@@ -1018,7 +1018,7 @@ gnome_calendar_import (EImport *ei,
 	ici->icalcomp = icalcomp;
 	icalcomp = NULL;
 
-	g_datalist_set_data_full(&target->data, "gnomecal-data", ici, free_ici);
+	g_datalist_set_data_full (&target->data, "gnomecal-data", ici, free_ici);
 
 	prepare_events (ici->icalcomp, &ici->tasks);
 	if (do_calendar) {
@@ -1043,14 +1043,14 @@ static void
 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)));
+	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)
 {
-	g_datalist_set_data(&target->data, "gnomecal-do-tasks", GINT_TO_POINTER(gtk_toggle_button_get_active(tb)));
+	g_datalist_set_data (&target->data, "gnomecal-do-tasks", GINT_TO_POINTER (gtk_toggle_button_get_active (tb)));
 }
 
 static GtkWidget *
@@ -1067,8 +1067,8 @@ gnome_calendar_getwidget (EImport *ei,
 	done_tasks = g_settings_get_boolean (settings, "gnome-calendar-done-tasks");
 	g_object_unref (settings);
 
-	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));
+	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));
 
 	hbox = gtk_hbox_new (FALSE, 2);
 
@@ -1096,7 +1096,7 @@ gnome_calendar_cancel (EImport *ei,
                        EImportTarget *target,
                        EImportImporter *im)
 {
-	ICalIntelligentImporter *ici = g_datalist_get_data(&target->data, "gnomecal-data");
+	ICalIntelligentImporter *ici = g_datalist_get_data (&target->data, "gnomecal-data");
 
 	if (ici)
 		g_cancellable_cancel (ici->cancellable);