From 273fbcd7685fac0f489d00db6048dcf43d5c2bb6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 3 Mar 2008 17:19:53 +0000 Subject: [PATCH] Re-fix bug #351672 since my patch for bug #362638 accidentally reverted 2008-03-03 Matthew Barnes * mail/em-folder-tree.c (emft_drop_async__done): Re-fix bug #351672 since my patch for bug #362638 accidentally reverted the original solution. svn path=/trunk/; revision=35124 --- mail/ChangeLog | 6 ++++++ mail/em-folder-tree.c | 19 +------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 4a0f802b4a..32ebad578f 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2008-03-03 Matthew Barnes + + * em-folder-tree.c (emft_drop_async__done): + Re-fix bug #351672 since my patch for bug #362638 accidentally + reverted the original solution. + 2008-03-03 Srinivasa Ragavan ** Fix for BNC bug #282466 diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index a0af89920f..87a2ad9c4b 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -937,23 +937,6 @@ emft_drop_async__exec (struct _DragDataReceivedAsync *m) } } -static void -emft_drop_async__done (struct _DragDataReceivedAsync *m) -{ - gboolean success, delete; - - /* ?? */ - if (m->aborted) { - success = FALSE; - delete = FALSE; - } else { - success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - - gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); -} - static void emft_drop_async__free (struct _DragDataReceivedAsync *m) { @@ -969,7 +952,7 @@ static MailMsgInfo emft_drop_async_info = { sizeof (struct _DragDataReceivedAsync), (MailMsgDescFunc) emft_drop_async__desc, (MailMsgExecFunc) emft_drop_async__exec, - (MailMsgDoneFunc) emft_drop_async__done, + (MailMsgDoneFunc) NULL, (MailMsgFreeFunc) emft_drop_async__free };