Miscellaneous cleanups.

3 files changed, 21 insertions, 21 deletions

diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 625969871f..3e753904f3 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -902,9 +902,9 @@ GSList *
 e_cal_shell_backend_get_selected_calendars (ECalShellBackend *cal_shell_backend)
 {
 	GSettings *settings;
-	char **strv;
-	gint i;
 	GSList *selected_calendars = NULL;
+	char **strv;
+	gint ii;
 
 	g_return_val_if_fail (
 		E_IS_CAL_SHELL_BACKEND (cal_shell_backend), NULL);
@@ -914,8 +914,8 @@ e_cal_shell_backend_get_selected_calendars (ECalShellBackend *cal_shell_backend)
 	g_object_unref (settings);
 
 	if (strv != NULL) {
-		for (i = 0; strv[i] != NULL; i++)
-			selected_calendars = g_slist_append (selected_calendars, g_strdup (strv[i]));
+		for (ii = 0; strv[ii] != NULL; ii++)
+			selected_calendars = g_slist_append (selected_calendars, g_strdup (strv[ii]));
 
 		g_strfreev (strv);
 	}
@@ -928,13 +928,13 @@ e_cal_shell_backend_set_selected_calendars (ECalShellBackend *cal_shell_backend,
                                             GSList *selected_calendars)
 {
 	GSettings *settings;
-	GSList *l;
+	GSList *link;
 	GPtrArray *array = g_ptr_array_new ();
 
 	g_return_if_fail (E_IS_CAL_SHELL_BACKEND (cal_shell_backend));
 
-	for (l = selected_calendars; l != NULL; l = l->next)
-		g_ptr_array_add (array, l->data);
+	for (link = selected_calendars; link != NULL; link = link->next)
+		g_ptr_array_add (array, link->data);
 	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index abbfdf7e0f..05b76cdd88 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -646,9 +646,9 @@ GSList *
 e_memo_shell_backend_get_selected_memo_lists (EMemoShellBackend *memo_shell_backend)
 {
 	GSettings *settings;
-	char **strv;
-	gint i;
 	GSList *selected_memo_lists = NULL;
+	char **strv;
+	gint ii;
 
 	g_return_val_if_fail (
 		E_IS_MEMO_SHELL_BACKEND (memo_shell_backend), NULL);
@@ -659,8 +659,8 @@ e_memo_shell_backend_get_selected_memo_lists (EMemoShellBackend *memo_shell_back
 
 
 	if (strv != NULL) {
-		for (i = 0; strv[i] != NULL; i++)
-			selected_memo_lists = g_slist_append (selected_memo_lists, g_strdup (strv[i]));
+		for (ii = 0; strv[ii] != NULL; ii++)
+			selected_memo_lists = g_slist_append (selected_memo_lists, g_strdup (strv[ii]));
 
 		g_strfreev (strv);
 	}
@@ -673,13 +673,13 @@ e_memo_shell_backend_set_selected_memo_lists (EMemoShellBackend *memo_shell_back
                                               GSList *selected_memo_lists)
 {
 	GSettings *settings;
-	GSList *l;
+	GSList *link;
 	GPtrArray *array = g_ptr_array_new ();
 
 	g_return_if_fail (E_IS_MEMO_SHELL_BACKEND (memo_shell_backend));
 
-	for (l = selected_memo_lists; l != NULL; l = l->next)
-		g_ptr_array_add (array, l->data);
+	for (link = selected_memo_lists; link != NULL; link = link->next)
+		g_ptr_array_add (array, link->data);
 	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 39dcf4e726..68545a287e 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -651,9 +651,9 @@ GSList *
 e_task_shell_backend_get_selected_task_lists (ETaskShellBackend *task_shell_backend)
 {
 	GSettings *settings;
-	char **strv;
-	gint i;
 	GSList *selected_task_lists = NULL;
+	char **strv;
+	gint ii;
 
 	g_return_val_if_fail (
 		E_IS_TASK_SHELL_BACKEND (task_shell_backend), NULL);
@@ -663,8 +663,8 @@ e_task_shell_backend_get_selected_task_lists (ETaskShellBackend *task_shell_back
 	g_object_unref (G_OBJECT (settings));
 
 	if (strv != NULL) {
-		for (i = 0; strv[i] != NULL; i++)
-			selected_task_lists = g_slist_append (selected_task_lists, g_strdup (strv[i]));
+		for (ii = 0; strv[ii] != NULL; ii++)
+			selected_task_lists = g_slist_append (selected_task_lists, g_strdup (strv[ii]));
 
 		g_strfreev (strv);
 	}
@@ -677,13 +677,13 @@ e_task_shell_backend_set_selected_task_lists (ETaskShellBackend *task_shell_back
                                               GSList *selected_task_lists)
 {
 	GSettings *settings;
-	GSList *l;
+	GSList *link;
 	GPtrArray *array = g_ptr_array_new ();
 
 	g_return_if_fail (E_IS_TASK_SHELL_BACKEND (task_shell_backend));
 
-	for (l = selected_task_lists; l != NULL; l = l->next)
-		g_ptr_array_add (array, l->data);
+	for (link = selected_task_lists; link != NULL; link = link->next)
+		g_ptr_array_add (array, link->data);
 	g_ptr_array_add (array, NULL);
 
 	settings = g_settings_new ("org.gnome.evolution.calendar");