aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/bogofilter/evolution-bogofilter.c5
-rw-r--r--modules/calendar/e-cal-shell-backend.c14
-rw-r--r--modules/calendar/e-memo-shell-backend.c14
-rw-r--r--modules/calendar/e-task-shell-backend.c14
-rw-r--r--modules/mail/em-mailer-prefs.c22
5 files changed, 36 insertions, 33 deletions
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 4521b7a6a1..0b6340296a 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -507,7 +507,10 @@ e_bogofilter_init (EBogofilter *extension)
GSettings *settings;
settings = g_settings_new ("org.gnome.evolution.eplugin.bogo-junk");
- g_settings_bind (settings, "utf8-for-spam-filter", G_OBJECT (extension), "convert-to-unicode", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (
+ settings, "utf8-for-spam-filter",
+ G_OBJECT (extension), "convert-to-unicode",
+ G_SETTINGS_BIND_DEFAULT);
g_object_unref (settings);
}
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");
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 4dabd0dacf..da715f3a7d 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -135,15 +135,15 @@ jh_tree_refill (EMMailerPrefs *prefs)
{
GtkListStore *store = prefs->junk_header_list_store;
gchar **strv;
- gint i;
+ gint ii;
strv = g_settings_get_strv (prefs->settings, "junk-custom-header");
gtk_list_store_clear (store);
- for (i = 0; strv[i] != NULL; i++) {
+ for (ii = 0; strv[ii] != NULL; ii++) {
GtkTreeIter iter;
- gchar **tokens = g_strsplit (strv[i], "=", 2);
+ gchar **tokens = g_strsplit (strv[ii], "=", 2);
gtk_list_store_append (store, &iter);
gtk_list_store_set (
@@ -200,15 +200,15 @@ jh_add_cb (GtkWidget *widget,
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) {
gchar **strv;
GPtrArray *array;
- gint i;
+ gint ii;
name = gtk_entry_get_text (GTK_ENTRY (e_builder_get_widget (builder, "junk-header-name")));
value = gtk_entry_get_text (GTK_ENTRY (e_builder_get_widget (builder, "junk-header-content")));
strv = g_settings_get_strv (prefs->settings, "junk-custom-header");
array = g_ptr_array_new ();
- for (i = 0; strv[i] != NULL; i++)
- g_ptr_array_add (array, strv[i]);
+ for (ii = 0; strv[ii] != NULL; ii++)
+ g_ptr_array_add (array, strv[ii]);
tok = g_strdup_printf ("%s=%s", name, value);
g_ptr_array_add (array, tok);
g_ptr_array_add (array, NULL);
@@ -237,17 +237,17 @@ jh_remove_cb (GtkWidget *widget,
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (prefs->junk_header_tree));
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
+ GPtrArray *array = g_ptr_array_new ();
gchar *name = NULL, *value = NULL;
gchar **strv;
- GPtrArray *array = g_ptr_array_new ();
- gint i;
+ gint ii;
strv = g_settings_get_strv (prefs->settings, "junk-custom-header");
gtk_tree_model_get (model, &iter, JH_LIST_COLUMN_NAME, &name, JH_LIST_COLUMN_VALUE, &value, -1);
- for (i = 0; strv[i] != NULL; i++) {
+ for (ii = 0; strv[ii] != NULL; ii++) {
gchar *test;
gint len = strlen (name);
- test = strncmp (strv[i], name, len) == 0 ? (gchar *) strv[i] + len : NULL;
+ test = strncmp (strv[ii], name, len) == 0 ? (gchar *) strv[ii] + len : NULL;
if (test) {
test++;
@@ -255,7 +255,7 @@ jh_remove_cb (GtkWidget *widget,
continue;
}
- g_ptr_array_add (array, strv[i]);
+ g_ptr_array_add (array, strv[ii]);
}
g_ptr_array_add (array, NULL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 14:54:56 +0800