aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-05-25 13:10:40 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-05-25 13:10:40 +0800
commitcf3cb0c83e928b217a027d13d9a4206882cceb5d (patch)
treef13cb7eab7c5f96400e34ac743cc11a9cc373572
parent253a05d03cb3d827a0da0002cb48231bd238caa3 (diff)
downloadgsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar.gz
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar.bz2
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar.lz
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar.xz
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.tar.zst
gsoc2013-evolution-cf3cb0c83e928b217a027d13d9a4206882cceb5d.zip
Committed fix for bug #342092
svn path=/trunk/; revision=32021
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-popup.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 5725fa6901..53ec958e50 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,12 @@
2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
+ ** fixes bug #342092
+
+ * em-popup.c: (emp_standard_menu_factory): Read the mime
+ from the right file.
+
+2006-05-25 Srinivasa Ragavan <sragavan@novell.com>
+
Added support for collapsible headers for To/Cc/Bcc fields.
* em-folder-view.c: (emfv_format_link_clicked), (emfv_on_url_cb):
diff --git a/mail/em-popup.c b/mail/em-popup.c
index eaa73e045d..5d9a898237 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -707,7 +707,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
break; }
case EM_POPUP_TARGET_PART: {
EMPopupTargetPart *t = (EMPopupTargetPart *)emp->target;
- mime_type = g_strdup(t->mime_type);
+ mime_type = camel_data_wrapper_get_mime_type((CamelDataWrapper *)t->part);
filename = camel_mime_part_get_filename(t->part);
items = emp_standard_object_popups;
@@ -736,7 +736,7 @@ emp_standard_menu_factory(EPopup *emp, void *data)
items = NULL;
len = 0;
}
-
+
if (mime_type) {
apps = gnome_vfs_mime_get_all_applications(mime_type);