Index: composer/ChangeLog
===================================================================
--- composer/ChangeLog	(revision 35060)
+++ composer/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-02-20  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #515744
+
+	* e-msg-composer.c: (drop_action):
+	Fixing previous fix - do not double free.
+
 2008-02-18  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #515744
Index: composer/e-msg-composer.c
===================================================================
--- composer/e-msg-composer.c	(revision 35060)
+++ composer/e-msg-composer.c	(working copy)
@@ -2953,13 +2953,10 @@
 
 		for (i = 0; urls[i] != NULL; i++) {
 			str = g_strstrip (urls[i]);
-			if (str[0] == '#' || str[0] == '\0') {
-				g_free (str);
+			if (str[0] == '#' || str[0] == '\0')
 				continue;
-			}
 
 			handle_uri (composer, str, html_dnd);
-			g_free (str);
 		}
 
 		g_strfreev (urls);
Index: calendar/gui/dialogs/comp-editor.c
===================================================================
--- calendar/gui/dialogs/comp-editor.c	(revision 35060)
+++ calendar/gui/dialogs/comp-editor.c	(working copy)
@@ -279,21 +279,16 @@
 
 		for (i = 0; urls[i] != NULL; i++) {
 			str = g_strstrip (urls[i]);
-			if (urls[i][0] == '#') {
-				g_free(str);
+			if (urls[i][0] == '#')
 				continue;
-			}
 
 			if (!g_ascii_strncasecmp (str, "mailto:", 7)) {
 				/* TODO does not handle mailto now */
-				g_free (str);
 			} else {
 				url = camel_url_new (str, NULL);
 
-				if (url == NULL) {
-					g_free (str);
+				if (url == NULL)
 					continue;
-				}
 
 				if (!g_ascii_strcasecmp (url->protocol, "file"))
 					e_attachment_bar_attach
@@ -306,7 +301,6 @@
 						 str, "attachment");
 
 				camel_url_free (url);
-				g_free (str);
 			}
 		}
 
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 35060)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-02-20  Milan Crha  <mcrha@redhat.com>
+
+	** Part of fix for bug #515744
+
+	* gui/dialogs/comp-editor.c: (drop_action):
+	Fixing previous fix - do not double free.
+
 2008-02-18  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #515744
