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-view.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-view.c')
| -rw-r--r-- | modules/mail/e-mail-shell-view.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 1db444e936..ebbbcef65f 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -605,15 +605,16 @@ all_accounts: /* Create a new search folder. */ /* FIXME Complete lack of error checking here. */ - service = camel_session_get_service ( + service = camel_session_ref_service ( CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID); camel_service_connect_sync (service, NULL, NULL); search_folder = (CamelVeeFolder *) camel_vee_folder_new ( - CAMEL_STORE (service), _("All Account Search"), - 0); + CAMEL_STORE (service), _("All Account Search"), 0); priv->search_account_all = search_folder; + g_object_unref (service); + camel_vee_folder_set_expression (search_folder, query); all_accounts_setup: @@ -701,15 +702,16 @@ current_account: /* Create a new search folder. */ /* FIXME Complete lack of error checking here. */ - service = camel_session_get_service ( + service = camel_session_ref_service ( CAMEL_SESSION (session), E_MAIL_SESSION_VFOLDER_UID); camel_service_connect_sync (service, NULL, NULL); search_folder = (CamelVeeFolder *) camel_vee_folder_new ( - CAMEL_STORE (service), _("Account Search"), - 0); + CAMEL_STORE (service), _("Account Search"), 0); priv->search_account_current = search_folder; + g_object_unref (service); + camel_vee_folder_set_expression (search_folder, query); current_accout_setup: |