aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@novell.com>2006-05-27 04:19:01 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2006-05-27 04:19:01 +0800
commitb8b49de6ce7a4fe5aad7d89f3a099a89d2022652 (patch)
tree9d4e7d006b3b283e3a5fc79318607920905dbc61
parent38b33781b73d2f82309ff8d5f8687f1c00fc9c8d (diff)
downloadgsoc2013-evolution-b8b49de6ce7a4fe5aad7d89f3a099a89d2022652.tar.gz
gsoc2013-evolution-b8b49de6ce7a4fe5aad7d89f3a099a89d2022652.tar.zst
gsoc2013-evolution-b8b49de6ce7a4fe5aad7d89f3a099a89d2022652.zip
If 'str' is empty, continue immediately rather than trying to parse it a
2006-05-26 Jeffrey Stedfast <fejj@novell.com> * e-msg-composer.c (drop_action): If 'str' is empty, continue immediately rather than trying to parse it a URL. svn path=/trunk/; revision=32040
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 317e305386..1834559fc4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-26 Jeffrey Stedfast <fejj@novell.com>
+
+ * e-msg-composer.c (drop_action): If 'str' is empty, continue
+ immediately rather than trying to parse it a URL.
+
2006-05-25 Jeffrey Stedfast <fejj@novell.com>
* e-msg-composer.c (drop_action): Instead of g_free()ing 'str' in
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index f77c947ea4..512acab0dc 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2924,8 +2924,9 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
CamelURL *url;
CamelMimeMessage *msg;
char *content_type;
- int i, success=FALSE, delete=FALSE;
+ int i, success = FALSE, delete = FALSE;
EMsgComposerPrivate *p = composer->priv;
+ gboolean is_image;
switch (info) {
case DND_TYPE_MESSAGE_RFC822:
@@ -2954,8 +2955,8 @@ drop_action(EMsgComposer *composer, GdkDragContext *context, guint32 action, Gtk
for (i = 0; urls[i] != NULL; i++) {
str = g_strstrip (urls[i]);
- if (urls[i][0] == '#') {
- g_free(str);
+ if (str[0] == '#' || str[0] == '\0') {
+ g_free (str);
continue;
}