aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Ewing <lewing@ximian.com>2001-10-25 08:03:17 +0800
committerLarry Ewing <lewing@src.gnome.org>2001-10-25 08:03:17 +0800
commit162035d40040367823e14103440eb5018d802edb (patch)
tree920450a17e4ab6dc9c0fab9de974c977f17eaa90
parent7a2d1a768b010b6c1c62c9e7ebdcf2aad563700a (diff)
downloadgsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar.gz
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar.bz2
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar.lz
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar.xz
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.tar.zst
gsoc2013-evolution-162035d40040367823e14103440eb5018d802edb.zip
rework this so that we don't end up freeing the cid then reading from it.
2001-10-24 Larry Ewing <lewing@ximian.com> * e-msg-composer.c (e_msg_composer_add_inline_image_from_mime_part): rework this so that we don't end up freeing the cid then reading from it. svn path=/trunk/; revision=14077
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer.c5
2 files changed, 8 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index a958afc762..8146c6a073 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-24 Larry Ewing <lewing@ximian.com>
+
+ * e-msg-composer.c
+ (e_msg_composer_add_inline_image_from_mime_part): rework this so
+ that we don't end up freeing the cid then reading from it.
+
2001-10-22 Jon Trowbridge <trow@ximian.com>
* e-msg-composer-hdrs.c (create_from_optionmenu): Check that
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index aba81f2d6d..9b2d859c1a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3084,9 +3084,8 @@ e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer,
cid = (char *)camel_mime_part_get_content_id (part);
if (!cid) {
- cid = header_msgid_generate ();
- camel_mime_part_set_content_id (part, cid);
- g_free (cid);
+ camel_mime_part_set_content_id (part, NULL);
+ cid = (char *)camel_mime_part_get_content_id (part);
}
url = g_strdup_printf ("cid:%s", cid);