diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-06-15 10:55:03 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-06-15 11:21:41 +0800 |
commit | 5b1742b202ca9505ccd818918b4afe82fc61b63b (patch) | |
tree | 6653da03ad3e8139e938e79ed3571c5fea4c818a /plugins/templates | |
parent | cf669f10f22de13ab4ee9b323d274325af22b0b9 (diff) | |
download | gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar.gz gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar.bz2 gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar.lz gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar.xz gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.tar.zst gsoc2013-evolution-5b1742b202ca9505ccd818918b4afe82fc61b63b.zip |
Add e_mail_reader_ref_folder().
Replaces e_mail_reader_get_folder().
Diffstat (limited to 'plugins/templates')
-rw-r--r-- | plugins/templates/templates.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 7a176b4b70..d83e1fbe17 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -994,7 +994,8 @@ action_reply_with_template_cb (GtkAction *action, EActivity *activity; AsyncContext *context; GCancellable *cancellable; - CamelFolder *folder, *template_folder; + CamelFolder *folder; + CamelFolder *template_folder; EShellContent *shell_content; EMailReader *reader; GPtrArray *uids; @@ -1004,9 +1005,6 @@ action_reply_with_template_cb (GtkAction *action, shell_content = e_shell_view_get_shell_content (shell_view); reader = E_MAIL_READER (shell_content); - folder = e_mail_reader_get_folder (reader); - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - uids = e_mail_reader_get_selected_uids (reader); g_return_if_fail (uids != NULL && uids->len == 1); message_uid = g_ptr_array_index (uids, 0); @@ -1025,11 +1023,14 @@ action_reply_with_template_cb (GtkAction *action, context->template_folder = g_object_ref (template_folder); context->template_message_uid = g_strdup (template_message_uid); + folder = e_mail_reader_ref_folder (reader); + em_utils_get_real_folder_uri_and_message_uid ( folder, message_uid, - &context->source_folder_uri, &context->message_uid); + &context->source_folder_uri, + &context->message_uid); - if (!context->message_uid) + if (context->message_uid == NULL) context->message_uid = g_strdup (message_uid); camel_folder_get_message ( @@ -1037,6 +1038,8 @@ action_reply_with_template_cb (GtkAction *action, cancellable, (GAsyncReadyCallback) template_got_source_message, context); + g_clear_object (&folder); + em_utils_uids_free (uids); } |