More code cleanup.

5 files changed, 6 insertions, 6 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 5284656d1d..ab411f9e7b 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -1105,7 +1105,7 @@ action_changed_cb (GtkWidget *action_combo, gpointer data)
 	gint page = 0, i;
 
 	action = e_dialog_combo_box_get (dialog->action_combo, action_map);
-	for (i = 0; action_map[i] != -1 ; i++) {
+	for (i = 0; action_map[i] != -1; i++) {
 		if (action == action_map[i]) {
 			page = i;
 			break;
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 9ddd9af6cb..af4c4b8e1a 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -421,7 +421,7 @@ ba_reminder_interval_changed (GtkWidget *widget, CalendarPrefsDialog *prefs)
 	gint value;
 
 	str = gtk_entry_get_text (GTK_ENTRY (widget));
-	value = (int) g_ascii_strtod (str, NULL);
+	value = (gint) g_ascii_strtod (str, NULL);
 
 	calendar_config_set_ba_reminder (NULL, &value, NULL);
 }
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ff08b7656c..e644a127a9 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2562,7 +2562,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 
 		num_attachments = e_cal_component_get_num_attachments (send_comp);
 
-		for (i = 0; i < num_attachments ; i++) {
+		for (i = 0; i < num_attachments; i++) {
 			attach_list = g_slist_append (attach_list, g_strdup ("CID:..."));
 		}
 		e_cal_component_set_attachment_list (send_comp, attach_list);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5e24495b5c..5fbf69df74 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -643,7 +643,7 @@ nth_weekday (gint pos, icalrecurrencetype_weekday weekday)
 {
 	g_assert (pos > 0 && pos <= 5);
 
-	return (pos << 3) | (int) weekday;
+	return (pos << 3) | (gint) weekday;
 }
 #endif
 
@@ -1312,7 +1312,7 @@ make_recurrence_special (RecurrencePage *rpage)
 }
 
 /* Counts the elements in the by_xxx fields of an icalrecurrencetype */
-static int
+static gint
 count_by_xxx (short *field, gint max_elements)
 {
 	gint i;
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 67aee1ecab..eeacc0774f 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -186,7 +186,7 @@ priority_value_to_index (gint priority_value)
 	return retval;
 }
 
-static int
+static gint
 priority_index_to_value (TaskEditorPriority priority)
 {
 	gint retval;