Ignore double-clicks on "active" columns (the ones where clicking does

	* folder-browser.c (on_double_click): Ignore double-clicks on
	"active" columns (the ones where clicking does something
	beyond "select"), fixing bug #811

svn path=/trunk/; revision=6910

3 files changed, 12 insertions, 1 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 184b72ead3..617e4c24f8 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -9,7 +9,9 @@
 	rather than bonobo methods to destroy the message list.
 	(on_right_click, on_double_click): These are being attached to the
 	ETable directly now, so fix the first argument (which isn't being
-	used anyway, but...)
+	used anyway, but...). Ignore double-clicks on "active" columns
+	(the ones where clicking does something beyond "select"), fixing
+	bug #811, which is what got me started on this to begin with...
 	(folder_browser_gui_init): simplify now that MessageList itself is
 	a widget. Also use message_list->table rather than
 	e_table_scrolled_get_table.
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index a557f64a98..e2013bc52d 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -633,6 +633,12 @@ etable_key (ETable *table, int row, int col, GdkEvent *ev, FolderBrowser *fb)
 static void
 on_double_click (ETable *table, gint row, gint col, GdkEvent *event, FolderBrowser *fb)
 {
+	/* Ignore double-clicks on columns where single-click doesn't
+	 * just select.
+	 */
+	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
+		return;
+
 	view_msg (NULL, fb);
 }
 
diff --git a/mail/message-list.h b/mail/message-list.h
index d377384732..0cdf0f78ea 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -38,6 +38,9 @@ enum {
 	COL_COLOUR,
 };
 
+#define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \
+					    col == COL_FLAGGED)
+
 struct _MessageList {
 	ETableScrolled parent;