evolution r36741 - trunk/composer

[mbarnes svn gnome org]

Author: mbarnes
Date: Tue Nov  4 20:57:35 2008
New Revision: 36741
URL: http://svn.gnome.org/viewvc/evolution?rev=36741&view=rev

Log:
2008-11-04  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #554450

	* composer/e-msg-composer.c (msg_composer_init):
	Get drag-and-drop to the attachment bar working again, but see
	my note in the source code.  I'm still not sure why it broke.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-msg-composer.c

Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c	(original)
+++ trunk/composer/e-msg-composer.c	Tue Nov  4 20:57:35 2008
@@ -2792,6 +2792,27 @@
 		drop_types, G_N_ELEMENTS (drop_types),
 		GDK_ACTION_COPY | GDK_ACTION_ASK | GDK_ACTION_MOVE);
 
+	/* XXX I'm not sure why we have to explicitly configure the
+	 *     attachment bar as a drag destination when CompEditor
+	 *     doesn't and previous Evolution releases (2.22 and
+	 *     prior) don't, but this is the only way I could figure
+	 *     out how to get drag-and-drop to the attachment bar
+	 *     working again.  I'm probably overlooking something
+	 *     simple... */
+
+	gtk_drag_dest_set (
+		composer->priv->attachment_bar, GTK_DEST_DEFAULT_ALL,
+		drop_types, G_N_ELEMENTS (drop_types),
+		GDK_ACTION_COPY | GDK_ACTION_ASK | GDK_ACTION_MOVE);
+
+	g_signal_connect (
+		composer->priv->attachment_bar, "drag-motion",
+		G_CALLBACK (msg_composer_drag_motion), NULL);
+
+	g_signal_connect (
+		composer->priv->attachment_bar, "drag-data-received",
+		G_CALLBACK (msg_composer_drag_data_received), NULL);
+
 	g_signal_connect (
 		html, "drag-data-received",
 		G_CALLBACK (msg_composer_drag_data_received), NULL);