aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/message-list.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b57857f38c..ddae6fcb3d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-27 Milan Crha <mcrha@redhat.com>
+
+ ** Fix for bug #303937
+
+ * message-list.c: (ml_tree_drag_data_received):
+ Don't do anything when ml->folder is NULL.
+
2007-07-27 Hiroyuki Ikezoe <poincare@ikezoe.net>
* em-utils.c: (em_utils_save_parts): Do not free const pointer.
diff --git a/mail/message-list.c b/mail/message-list.c
index 7147961c1b..07d1f5b3cc 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -1982,7 +1982,7 @@ ml_tree_drag_data_received (ETree *tree, int row, ETreePath path, int col,
struct _drop_msg *m;
/* this means we are receiving no data */
- if (data->data == NULL || data->length == -1)
+ if (!ml->folder || data->data == NULL || data->length == -1)
return;
m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m));