From c6c52bcbdfc2d8715eb5ca22f19335ddc345129b Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 11 Feb 2006 09:50:50 +0000 Subject: [PATCH] 2006-02-11 [colin] 2.0.0cvs43 * src/summaryview.c don't allow drag/drop from ourself --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/summaryview.c | 6 ++++++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e9153704..12a77b104 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-11 [colin] 2.0.0cvs43 + + * src/summaryview.c + don't allow drag/drop from ourself + 2006-02-10 [wwp] 2.0.0cvs42 * src/exporthtml.c diff --git a/PATCHSETS b/PATCHSETS index f66ec97d6..20c13f875 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1226,3 +1226,4 @@ ( cvs diff -u -r 1.4.2.28 -r 1.4.2.29 src/gtk/about.c; cvs diff -u -r 1.382.2.239 -r 1.382.2.240 src/compose.c; cvs diff -u -r 1.105.2.48 -r 1.105.2.49 src/prefs_account.c; cvs diff -u -r 1.5.2.6 -r 1.5.2.7 src/prefs_gtk.h; cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/editaddress.c; ) > 2.0.0cvs40.patchset ( cvs diff -u -r 1.395.2.167 -r 1.395.2.168 src/summaryview.c; ) > 2.0.0cvs41.patchset ( cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/exporthtml.c; cvs diff -u -r 1.12.2.12 -r 1.12.2.13 src/html.c; cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/html.h; cvs diff -u -r 1.49.2.71 -r 1.49.2.72 src/procmime.c; cvs diff -u -r 1.96.2.94 -r 1.96.2.95 src/textview.c; ) > 2.0.0cvs42.patchset +( cvs diff -u -r 1.395.2.168 -r 1.395.2.169 src/summaryview.c; ) > 2.0.0cvs43.patchset diff --git a/configure.ac b/configure.ac index 6a00bfea0..dcfbcb327 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/summaryview.c b/src/summaryview.c index 45b54726a..a129c3cb5 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -5250,6 +5250,12 @@ static gboolean summary_drag_motion_cb(GtkWidget *widget, return FALSE; } else if (gtk_drag_get_source_widget(context) == mainwindow_get_mainwindow()->folderview->ctree) { + /* no folders */ + gdk_drag_status(context, 0, time); + return FALSE; + } else if (gtk_drag_get_source_widget(context) == + summaryview->ctree) { + /* not from same folder */ gdk_drag_status(context, 0, time); return FALSE; } else { -- 2.25.1