From ed45d23b84053e1c341db3eb5520311d314ca1ae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Oct 2010 22:08:12 -0400 Subject: Remove mail_tools_folder_to_url(). Use camel_folder_get_uri() instead. --- modules/mail/e-mail-shell-view.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'modules/mail/e-mail-shell-view.c') diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 4696a39456..cdfdd59c5c 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -603,13 +603,11 @@ all_accounts: CAMEL_FOLDER (search_folder), list, priv->search_account_cancel); - uri = mail_tools_folder_to_url (CAMEL_FOLDER (search_folder)); + folder_uri = camel_folder_get_uri (CAMEL_FOLDER (search_folder)); mail_shell_view_show_search_results_folder ( E_MAIL_SHELL_VIEW (shell_view), - CAMEL_FOLDER (search_folder), uri); - - g_free (uri); + CAMEL_FOLDER (search_folder), folder_uri); goto execute; @@ -756,13 +754,11 @@ current_account: CAMEL_FOLDER (search_folder), list, priv->search_account_cancel); - uri = mail_tools_folder_to_url (CAMEL_FOLDER (search_folder)); + folder_uri = camel_folder_get_uri (CAMEL_FOLDER (search_folder)); mail_shell_view_show_search_results_folder ( E_MAIL_SHELL_VIEW (shell_view), - CAMEL_FOLDER (search_folder), uri); - - g_free (uri); + CAMEL_FOLDER (search_folder), folder_uri); execute: -- cgit v1.2.3