aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-11-23 07:22:14 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-11-23 09:43:04 +0800
commite64d6fe05c30c2cc1d7625a202afba3ba2da07cd (patch)
treef99df204ecdd5629acdc9f7e7b00d1c0d7903d6d /modules
parent2e60b6a4a21105bb4a1e2badd1be51b3e684d165 (diff)
downloadgsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.gz
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.tar.zst
gsoc2013-evolution-e64d6fe05c30c2cc1d7625a202afba3ba2da07cd.zip
Miscellaneous cleanups.
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/e-book-shell-view-private.c4
-rw-r--r--modules/calendar/e-cal-shell-backend.c2
-rw-r--r--modules/calendar/e-memo-shell-backend.c3
-rw-r--r--modules/calendar/e-task-shell-backend.c4
-rw-r--r--modules/online-accounts/e-online-accounts-google.c2
-rw-r--r--modules/spamassassin/evolution-spamassassin.c4
6 files changed, 7 insertions, 12 deletions
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,