diff options
| -rw-r--r-- | mail/em-account-editor.c | 12 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 1 |
2 files changed, 8 insertions, 5 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index cca18a8310..2036025ce3 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -4937,9 +4937,11 @@ setup_google_calendar (EMAccountEditor *emae) array = g_ptr_array_new (); for (i = 0; ids[i] != NULL; i++) g_ptr_array_add (array, ids[i]); - g_ptr_array_add (array, e_source_peek_uid (calendar)); + g_ptr_array_add (array, (gpointer) e_source_peek_uid (calendar)); g_ptr_array_add (array, NULL); - g_settings_set_strv (settings, SELECTED_CALENDARS, array->pdata); + g_settings_set_strv ( + settings, SELECTED_CALENDARS, + (const gchar * const *) array->pdata); g_strfreev (ids); g_ptr_array_free (array, TRUE); @@ -5007,9 +5009,11 @@ setup_yahoo_calendar (EMAccountEditor *emae) array = g_ptr_array_new (); for (i = 0; ids[i] != NULL; i++) g_ptr_array_add (array, ids[i]); - g_ptr_array_add (array, e_source_peek_uid (calendar)); + g_ptr_array_add (array, (gpointer) e_source_peek_uid (calendar)); g_ptr_array_add (array, NULL); - g_settings_set_strv (settings, SELECTED_CALENDARS, array->pdata); + g_settings_set_strv ( + settings, SELECTED_CALENDARS, + (const gchar * const *) array->pdata); g_strfreev (ids); g_ptr_array_free (array, TRUE); diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 2427fc1ffd..7bed18d8b8 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -1635,7 +1635,6 @@ e_mail_shell_view_actions_init (EMailShellView *mail_shell_view) GtkAction *action; GSettings *settings; GObject *object; - const gchar *key; g_return_if_fail (E_IS_MAIL_SHELL_VIEW (mail_shell_view)); |