evolution r35063 - in trunk: calendar calendar/gui/dialogs composer
- From: mcrha svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r35063 - in trunk: calendar calendar/gui/dialogs composer
- Date: Wed, 20 Feb 2008 14:57:00 +0000 (GMT)
Author: mcrha
Date: Wed Feb 20 14:56:59 2008
New Revision: 35063
URL: http://svn.gnome.org/viewvc/evolution?rev=35063&view=rev
Log:
2008-02-20 Milan Crha <mcrha redhat com>
** Part of fix for bug #515744
* composer/e-msg-composer.c: (drop_action):
* calendar/gui/dialogs/comp-editor.c: (drop_action):
Fixing previous fix - do not double free.
Modified:
trunk/calendar/ChangeLog
trunk/calendar/gui/dialogs/comp-editor.c
trunk/composer/ChangeLog
trunk/composer/e-msg-composer.c
Modified: trunk/calendar/gui/dialogs/comp-editor.c
==============================================================================
--- trunk/calendar/gui/dialogs/comp-editor.c (original)
+++ trunk/calendar/gui/dialogs/comp-editor.c Wed Feb 20 14:56:59 2008
@@ -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);
}
}
Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c (original)
+++ trunk/composer/e-msg-composer.c Wed Feb 20 14:56:59 2008
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]