diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 01:57:49 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-05-06 03:20:23 +0800 |
| commit | 762fcc69529a4ce1822f4d978e2d4f85eef4cacc (patch) | |
| tree | c8f1bde30882b7f192b4984992bf52354270fc46 | |
| parent | 974924a8b8ceb3cabd6a4e517b1a1a1285fa137f (diff) | |
| download | gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar.gz gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar.bz2 gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar.lz gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar.xz gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.tar.zst gsoc2013-evolution-762fcc69529a4ce1822f4d978e2d4f85eef4cacc.zip | |
Simplify emae_account_folder().
EMFolderSelectionButton uses e_mail_folder_uri_parse(), so we can just
hand it an 'email://' URI directly.
| -rw-r--r-- | mail/em-account-editor.c | 9 |
1 files 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); } |