aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-03-04 01:19:53 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-03-04 01:19:53 +0800
commit273fbcd7685fac0f489d00db6048dcf43d5c2bb6 (patch)
treec8a03705fa53f9f29c8825c474a796c54235b565
parent904787b813fdc1e310201c6d44020666a1131823 (diff)
downloadgsoc2013-evolution-273fbcd7685fac0f489d00db6048dcf43d5c2bb6.tar.gz
gsoc2013-evolution-273fbcd7685fac0f489d00db6048dcf43d5c2bb6.tar.zst
gsoc2013-evolution-273fbcd7685fac0f489d00db6048dcf43d5c2bb6.zip
Re-fix bug #351672 since my patch for bug #362638 accidentally reverted
2008-03-03 Matthew Barnes <mbarnes@redhat.com> * 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
-rw-r--r--mail/ChangeLog6
-rw-r--r--mail/em-folder-tree.c19
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 <mbarnes@redhat.com>
+
+ * 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 <sragavan@novell.com>
** 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
@@ -938,23 +938,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)
{
g_object_unref(m->context);
@@ -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
};