diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-02-20 22:56:59 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-02-20 22:56:59 +0800 |
| commit | 69cdae0bcb0a0824b594bade4620b4093a605b2f (patch) | |
| tree | 02c426b35480d71a369cac1b1ab172993b7e09aa | |
| parent | 3c5d98af4ebd0377b0e7bd6367ee1f19df80cee5 (diff) | |
| download | gsoc2013-evolution-69cdae0bcb0a0824b594bade4620b4093a605b2f.tar.gz gsoc2013-evolution-69cdae0bcb0a0824b594bade4620b4093a605b2f.tar.zst gsoc2013-evolution-69cdae0bcb0a0824b594bade4620b4093a605b2f.zip | |
** Part of fix for bug #515744
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.
svn path=/trunk/; revision=35063
| -rw-r--r-- | calendar/ChangeLog | 7 | ||||
| -rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 10 | ||||
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 5 |
4 files changed, 17 insertions, 12 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9c004bf36b..e57cd09a73 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -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 diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 5a8be391ee..17b24091d8 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -279,21 +279,16 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele 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 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele str, "attachment"); camel_url_free (url); - g_free (str); } } diff --git a/composer/ChangeLog b/composer/ChangeLog index 8e6555f207..925e0244f1 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -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 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 613b29a515..ae82e9b262 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -2953,13 +2953,10 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk 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); |