diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-12 10:08:12 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-13 01:59:00 +0800 |
| commit | ed45d23b84053e1c341db3eb5520311d314ca1ae (patch) | |
| tree | c91d6e794d79d9f1fe443a69a327c58212ea3ae2 /mail/message-list.c | |
| parent | 4118d671d44b71592f0e91abb63f2468baaa9318 (diff) | |
| download | gsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.tar.gz gsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.tar.zst gsoc2013-evolution-ed45d23b84053e1c341db3eb5520311d314ca1ae.zip | |
Remove mail_tools_folder_to_url().
Use camel_folder_get_uri() instead.
Diffstat (limited to 'mail/message-list.c')
| -rw-r--r-- | mail/message-list.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mail/message-list.c b/mail/message-list.c index 5a9af96b6c..6200e8956a 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -1646,7 +1646,8 @@ ml_tree_value_at_ex (ETreeModel *etm, CamelURL *curl; EAccount *account; gchar *location = NULL; - gchar *euri, *url; + const gchar *uri; + gchar *euri; if (CAMEL_IS_VEE_FOLDER (message_list->folder)) { folder = camel_vee_folder_get_location ((CamelVeeFolder *)message_list->folder, (CamelVeeMessageInfo *)msg_info, NULL); @@ -1654,24 +1655,23 @@ ml_tree_value_at_ex (ETreeModel *etm, folder = message_list->folder; } - url = mail_tools_folder_to_url (folder); - euri = em_uri_from_camel (url); + uri = camel_folder_get_uri (folder); + euri = em_uri_from_camel (uri); - account = mail_config_get_account_by_source_url (url); + account = mail_config_get_account_by_source_url (uri); if (account) { - curl = camel_url_new (url, NULL); + curl = camel_url_new (uri, NULL); location = g_strconcat (account->name, ":", curl->path, NULL); } else { /* Local account */ - euri = em_uri_from_camel (url); + euri = em_uri_from_camel (uri); curl = camel_url_new (euri, NULL); if (curl->host && !strcmp(curl->host, "local") && curl->user && !strcmp(curl->user, "local")) location = g_strconcat (_("On This Computer"), ":",curl->path, NULL); } camel_url_free (curl); - g_free (url); g_free (euri); return location; |