Bug 624913 - Disallow drag-and-drop within the same attachment bar

Adds a boolean "dragging" property to the EAttachmentView interface,
which becomes TRUE when the user start a drag from the attachment view.
e_attachment_view_drag_motion() and e_attachment_view_drag_drop() both
return FALSE when this property is set.

Also, do not register the entire EMsgComposer window as a drag
destination.  Just intercept drag signals from the GtkHTML widget.

Requires gtkhtml commit 344eb5e to fully work correctly.

1 files changed, 4 insertions, 0 deletions

diff --git a/widgets/misc/e-attachment-view.h b/widgets/misc/e-attachment-view.h
index 071de0705a..79dbacb151 100644
--- a/widgets/misc/e-attachment-view.h
+++ b/widgets/misc/e-attachment-view.h
@@ -109,6 +109,7 @@ struct _EAttachmentViewPrivate {
 	gint start_x;
 	gint start_y;
 
+	guint dragging : 1;
 	guint editable : 1;
 };
 
@@ -122,6 +123,9 @@ EAttachmentViewPrivate *
 		e_attachment_view_get_private	(EAttachmentView *view);
 EAttachmentStore *
 		e_attachment_view_get_store	(EAttachmentView *view);
+gboolean	e_attachment_view_get_dragging	(EAttachmentView *view);
+void		e_attachment_view_set_dragging	(EAttachmentView *view,
+						 gboolean dragging);
 gboolean	e_attachment_view_get_editable	(EAttachmentView *view);
 void		e_attachment_view_set_editable	(EAttachmentView *view,
 						 gboolean editable);