aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2009-11-10 21:26:19 +0800
committerMilan Crha <mcrha@redhat.com>2009-11-10 21:26:19 +0800
commit26889bef61bc32efd202bad6e736ac2fcaf586e0 (patch)
treefef364c5a2b05e1a5a911ff10bd8e1436cf5e788 /calendar
parentb9953ceaed91acfcca24a54240ff51847526e6a8 (diff)
downloadgsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar.gz
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar.bz2
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar.lz
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar.xz
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.tar.zst
gsoc2013-evolution-26889bef61bc32efd202bad6e736ac2fcaf586e0.zip
Bug #601218 - Accepted meeting doesn't show attachments in calendar view
Diffstat (limited to 'calendar')
-rw-r--r--calendar/gui/dialogs/comp-editor.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 4d3c0af523..99dc3ea851 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2452,6 +2452,12 @@ attachment_loaded_cb (EAttachment *attachment,
*/
file_info = e_attachment_get_file_info (attachment);
+ if (!file_info) {
+ /* failed to load an attachment file */
+ e_attachment_load_handle_error (attachment, result, parent);
+ return;
+ }
+
display_name = g_file_info_get_display_name (file_info);
uid = g_object_get_data (G_OBJECT (attachment), "uid");
@@ -2703,12 +2709,13 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
for (attach = mime_attach_list; attach; attach = attach->next) {
struct CalMimeAttach *cma = (struct CalMimeAttach *) attach->data;
- attach_list = g_slist_append (attach_list, cma->content_id);
+ attach_list = g_slist_append (attach_list, g_strconcat ("cid:", cma->content_id, NULL));
}
if (attach_list) {
e_cal_component_set_attachment_list (send_comp, attach_list);
+ g_slist_foreach (attach_list, (GFunc) g_free, NULL);
g_slist_free (attach_list);
}