aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-11-05 04:57:35 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-11-05 04:57:35 +0800
commit7007a0191dfcfeb1769d76a2b3085be0bc4f10fb (patch)
tree768ae9df047db175200ee3be13472729af496f0f
parent90d4156ad06c297cb0030c5d3def03c771a5a78f (diff)
downloadgsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar.gz
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar.bz2
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar.lz
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar.xz
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.tar.zst
gsoc2013-evolution-7007a0191dfcfeb1769d76a2b3085be0bc4f10fb.zip
** Fixes bug #554450
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. svn path=/trunk/; revision=36741
-rw-r--r--composer/ChangeLog8
-rw-r--r--composer/e-msg-composer.c21
2 files changed, 29 insertions, 0 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index aa88a29e94..185de38ec4 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-04 Matthew Barnes <mbarnes@redhat.com>
+
+ ** Fixes bug #554450
+
+ * 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.
+
2008-11-02 Matthew Barnes <mbarnes@redhat.com>
** Fixes bug #559028
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index b54333d192..44e24e70e9 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2792,6 +2792,27 @@ msg_composer_init (EMsgComposer *composer)
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);