From e64d6fe05c30c2cc1d7625a202afba3ba2da07cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 18:22:14 -0500 Subject: Miscellaneous cleanups. --- modules/addressbook/e-book-shell-view-private.c | 4 ++-- modules/calendar/e-cal-shell-backend.c | 2 +- modules/calendar/e-memo-shell-backend.c | 3 +-- modules/calendar/e-task-shell-backend.c | 4 ++-- modules/online-accounts/e-online-accounts-google.c | 2 +- modules/spamassassin/evolution-spamassassin.c | 4 ---- 6 files changed, 7 insertions(+), 12 deletions(-) (limited to 'modules') diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c index b1895c4fb8..cb0cf60ab2 100644 --- a/modules/addressbook/e-book-shell-view-private.c +++ b/modules/addressbook/e-book-shell-view-private.c @@ -185,8 +185,8 @@ contacts_removed (EBookShellView *book_shell_view, static void model_query_changed_cb (EBookShellView *book_shell_view, - GParamSpec *param, - EAddressbookModel *model) + GParamSpec *param, + EAddressbookModel *model) { EBookShellContent *book_shell_content; EAddressbookView *current_view; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 3e753904f3..af1ca215fd 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -903,7 +903,7 @@ e_cal_shell_backend_get_selected_calendars (ECalShellBackend *cal_shell_backend) { GSettings *settings; GSList *selected_calendars = NULL; - char **strv; + gchar **strv; gint ii; g_return_val_if_fail ( diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c index 05b76cdd88..c31689fec9 100644 --- a/modules/calendar/e-memo-shell-backend.c +++ b/modules/calendar/e-memo-shell-backend.c @@ -647,7 +647,7 @@ e_memo_shell_backend_get_selected_memo_lists (EMemoShellBackend *memo_shell_back { GSettings *settings; GSList *selected_memo_lists = NULL; - char **strv; + gchar **strv; gint ii; g_return_val_if_fail ( @@ -657,7 +657,6 @@ e_memo_shell_backend_get_selected_memo_lists (EMemoShellBackend *memo_shell_back strv = g_settings_get_strv (settings, "selected-memos"); g_object_unref (settings); - if (strv != NULL) { for (ii = 0; strv[ii] != NULL; ii++) selected_memo_lists = g_slist_append (selected_memo_lists, g_strdup (strv[ii])); diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c index 68545a287e..deca594c08 100644 --- a/modules/calendar/e-task-shell-backend.c +++ b/modules/calendar/e-task-shell-backend.c @@ -652,7 +652,7 @@ e_task_shell_backend_get_selected_task_lists (ETaskShellBackend *task_shell_back { GSettings *settings; GSList *selected_task_lists = NULL; - char **strv; + gchar **strv; gint ii; g_return_val_if_fail ( @@ -690,5 +690,5 @@ e_task_shell_backend_set_selected_task_lists (ETaskShellBackend *task_shell_back g_settings_set_strv (settings, "selected-tasks", (const gchar *const *) array->pdata); g_object_unref (settings); - g_ptr_array_free (array, FALSE); + g_ptr_array_free (array, FALSE); } diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c index 07c8923609..e71b8d16cb 100644 --- a/modules/online-accounts/e-online-accounts-google.c +++ b/modules/online-accounts/e-online-accounts-google.c @@ -144,7 +144,7 @@ online_accounts_google_sync_mail (GoaObject *goa_object, if (account) { /* the account is already configured, - do not change user's changes */ + * do not change user's changes */ return; } diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c index e722b0cc2e..1b88d0f558 100644 --- a/modules/spamassassin/evolution-spamassassin.c +++ b/modules/spamassassin/evolution-spamassassin.c @@ -1073,10 +1073,6 @@ e_spam_assassin_class_init (ESpamAssassinClass *class) junk_filter_class->available = spam_assassin_available; junk_filter_class->new_config_widget = spam_assassin_new_config_widget; - /* XXX Argh, the boolean sense of the GSettings key is inverted from - * that of the checkbox widget. The checkbox wording is more - * natural, but GConfBridge doesn't support transform functions - * so the property has to match the sense of the GConf key. */ g_object_class_install_property ( object_class, PROP_LOCAL_ONLY, -- cgit