fixed long-standing drag begin bug on IMAP folders (#93).

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3159 ee746299-78ed-0310-b773-934348b2243d

2 files changed, 13 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 901373bc..ec37532e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-25
+
+	* src/summaryview.c: summary_button_pressed(): fixed long-standing
+	  drag begin bug on IMAP folders (#93).
+
 2012-09-13
 
 	* sylpheed.spec.in: fixed build on x86_64 platform.
diff --git a/src/summaryview.c b/src/summaryview.c
index ef483233..7e8675fc 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5929,6 +5929,12 @@ static gboolean summary_button_pressed(GtkWidget *treeview,
 					summaryview->display_msg = TRUE;
 			}
 		}
+
+		if (summaryview->on_button_press == FALSE) {
+			/* button released within sub event loop */
+			gtk_tree_path_free(path);
+			return TRUE;
+		}
 	} else if (event->button == 2) {
 		summary_select_row(summaryview, &iter, TRUE, FALSE);
 		summary_mark_displayed_read(summaryview, &iter);
@@ -6309,6 +6315,8 @@ static void summary_column_clicked(GtkWidget *button, SummaryView *summaryview)
 static void summary_drag_begin(GtkWidget *widget, GdkDragContext *drag_context,
 			       SummaryView *summaryview)
 {
+	if (!summaryview->on_button_press)
+		g_warning("summary_drag_begin: drag began without button press");
 	summaryview->on_drag = TRUE;
 	gtk_drag_set_icon_default(drag_context);
 }