diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-05-12 11:59:57 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-05-12 12:00:33 +0800 |
| commit | 0a39131fdfb5ef87525d668751651a2c9d075ebf (patch) | |
| tree | ede9c92c0a02b6600d172843777eb6919244b4fc /widgets/misc | |
| parent | 9638b78a83918ddb54afc15580f01a3fce17c0fd (diff) | |
| download | gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar.gz gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar.bz2 gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar.lz gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar.xz gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.tar.zst gsoc2013-evolution-0a39131fdfb5ef87525d668751651a2c9d075ebf.zip | |
Bug 615291 - Preview pane's attachment bar accepts drop
Diffstat (limited to 'widgets/misc')
| -rw-r--r-- | widgets/misc/e-attachment-view.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 9725604865..5a5db57e07 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -826,7 +826,6 @@ e_attachment_view_init (EAttachmentView *view) attachment_view_init_handlers (view); e_attachment_view_drag_source_set (view); - e_attachment_view_drag_dest_set (view); /* Connect built-in drag and drop handlers. */ @@ -927,6 +926,11 @@ e_attachment_view_set_editable (EAttachmentView *view, priv = e_attachment_view_get_private (view); priv->editable = editable; + if (editable) + e_attachment_view_drag_dest_set (view); + else + e_attachment_view_drag_dest_unset (view); + g_object_notify (G_OBJECT (view), "editable"); } @@ -1315,6 +1319,11 @@ e_attachment_view_drag_begin (EAttachmentView *view, { g_return_if_fail (E_IS_ATTACHMENT_VIEW (view)); g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); + + /* Prevent the user from dragging and dropping to + * the same attachment view, which would duplicate + * the attachment. */ + e_attachment_view_drag_dest_unset (view); } void @@ -1323,6 +1332,10 @@ e_attachment_view_drag_end (EAttachmentView *view, { g_return_if_fail (E_IS_ATTACHMENT_VIEW (view)); g_return_if_fail (GDK_IS_DRAG_CONTEXT (context)); + + /* Restore the previous drag destination state. */ + if (e_attachment_view_get_editable (view)) + e_attachment_view_drag_dest_set (view); } static void @@ -1465,10 +1478,6 @@ e_attachment_view_drag_drop (EAttachmentView *view, g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), FALSE); g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE); - /* Disallow drops if we're not editable. */ - if (!e_attachment_view_get_editable (view)) - return FALSE; - return TRUE; } |