diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-08-12 20:58:50 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-08-12 23:44:37 +0800 |
| commit | 6be2668e483cfc7a2e75ae2efcd9675388d08601 (patch) | |
| tree | 3f0d28830d54da205467bf973eea9895f8003b35 /modules/mail/e-mail-shell-backend.c | |
| parent | 6456e814fae763ecd9dbdbe4d3caa952ddca0a3d (diff) | |
| download | gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar.gz gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar.bz2 gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar.lz gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar.xz gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.tar.zst gsoc2013-evolution-6be2668e483cfc7a2e75ae2efcd9675388d08601.zip | |
Adapt to CamelSession API changes.
These functions now return new references:
camel_session_add_service()
camel_session_list_services()
These functions have been renamed and also return new references:
camel_session_get_service() -> camel_session_ref_service()
camel_session_get_service_by_url() -> camel_session_ref_service_by_url()
Diffstat (limited to 'modules/mail/e-mail-shell-backend.c')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 8b00ccf0a2..7472a50f35 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -314,7 +314,7 @@ mail_shell_backend_mail_sync (EMailShellBackend *mail_shell_backend) mail_shell_backend); } - g_list_free (list); + g_list_free_full (list, (GDestroyNotify) g_object_unref); exit: return TRUE; @@ -481,8 +481,8 @@ mail_shell_backend_changes_committed_cb (EMailConfigWindow *window, original_source = e_mail_config_window_get_original_source (window); uid = e_source_get_uid (original_source); - service = camel_session_get_service (CAMEL_SESSION (session), uid); - g_return_if_fail (CAMEL_IS_STORE (service)); + service = camel_session_ref_service (CAMEL_SESSION (session), uid); + g_return_if_fail (service != NULL); shell_backend = E_SHELL_BACKEND (mail_shell_backend); @@ -511,6 +511,8 @@ mail_shell_backend_changes_committed_cb (EMailConfigWindow *window, mail_shell_backend_disconnect_done_cb, activity); g_object_unref (cancellable); + + g_object_unref (service); } static void @@ -589,11 +591,16 @@ mail_shell_backend_constructed (GObject *object) 500); mail_session = e_mail_backend_get_session (E_MAIL_BACKEND (object)); - vstore = camel_session_get_service (CAMEL_SESSION (mail_session), E_MAIL_SESSION_VFOLDER_UID); + vstore = camel_session_ref_service ( + CAMEL_SESSION (mail_session), E_MAIL_SESSION_VFOLDER_UID); + g_return_if_fail (vstore != NULL); + g_object_bind_property ( shell_settings, "mail-enable-unmatched-search-folder", vstore, "unmatched-enabled", G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL); + + g_object_unref (vstore); } static void |