From 762fcc69529a4ce1822f4d978e2d4f85eef4cacc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 5 May 2011 13:57:49 -0400 Subject: Simplify emae_account_folder(). EMFolderSelectionButton uses e_mail_folder_uri_parse(), so we can just hand it an 'email://' URI directly. --- mail/em-account-editor.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 5147b65635..1cbc635cea 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -1114,14 +1114,9 @@ emae_account_folder (EMAccountEditor *emae, const gchar *name, gint item, gint d account = em_account_editor_get_modified_account (emae); folder = (EMFolderSelectionButton *)e_builder_get_widget (builder, name); uri = e_account_get_string (account, item); - if (uri) { - gchar *tmp = em_uri_to_camel (uri); - - em_folder_selection_button_set_selection (folder, tmp); - g_free (tmp); + if (uri != NULL) { + em_folder_selection_button_set_selection (folder, uri); } else { - const gchar *uri; - uri = e_mail_local_get_folder_uri (deffolder); em_folder_selection_button_set_selection (folder, uri); } -- cgit v1.2.3