From 35966afbd4e83fa9c2c7a0e5ebcd0f3bd7ef9ff6 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Mon, 17 Mar 2014 07:07:34 +0000
Subject: disabled auto-expand for GTK+ < 2.14.0 because of GTK+ Bug #316087.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3344 ee746299-78ed-0310-b773-934348b2243d
---
 ChangeLog          | 8 ++++++++
 src/folderview.c   | 2 ++
 src/query_search.c | 2 ++
 src/rpop3.c        | 2 ++
 src/summaryview.c  | 2 ++
 5 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3d9df315..4cb01755 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-17
+
+	* src/rpop3.c
+	  src/query_search.c
+	  src/summaryview.c
+	  src/folderview.c: disabled auto-expand for GTK+ < 2.14.0 because
+	  of GTK+ Bug #316087 (Resizing columns is chaotic).
+
 2014-03-17
 
 	* src/rpop3.c
diff --git a/src/folderview.c b/src/folderview.c
index a1ad9e03..14beecc0 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -388,7 +388,9 @@ FolderView *folderview_create(void)
 	gtk_tree_view_column_set_fixed_width
 		(column, prefs_common.folder_col_folder);
 	gtk_tree_view_column_set_resizable(column, TRUE);
+#if GTK_CHECK_VERSION(2, 14, 0)
 	gtk_tree_view_column_set_expand(column, TRUE);
+#endif
 
 	renderer = gtk_cell_renderer_pixbuf_new();
 	g_object_set(renderer, "ypad", 0, NULL);
diff --git a/src/query_search.c b/src/query_search.c
index c59d15a0..f75c717c 100644
--- a/src/query_search.c
+++ b/src/query_search.c
@@ -400,7 +400,9 @@ static void query_search_create(void)
 
 	APPEND_COLUMN(_("Folder"), COL_FOLDER, 0);
 	APPEND_COLUMN(_("Subject"), COL_SUBJECT, 200);
+#if GTK_CHECK_VERSION(2, 14, 0)
 	gtk_tree_view_column_set_expand(column, TRUE);
+#endif
 	APPEND_COLUMN(_("From"), COL_FROM, 180);
 	APPEND_COLUMN(_("Date"), COL_DATE, 0);
 
diff --git a/src/rpop3.c b/src/rpop3.c
index 326731c5..7f530854 100644
--- a/src/rpop3.c
+++ b/src/rpop3.c
@@ -432,7 +432,9 @@ static void rpop3_window_create(PrefsAccount *account)
 
         APPEND_COLUMN(_("No."), COL_NUMBER, 0);
         APPEND_COLUMN(_("Subject"), COL_SUBJECT, 200);
+#if GTK_CHECK_VERSION(2, 14, 0)
 	gtk_tree_view_column_set_expand(column, TRUE);
+#endif
         APPEND_COLUMN(_("From"), COL_FROM, 160);
         APPEND_COLUMN(_("Date"), COL_DATE, 0);
         APPEND_COLUMN(_("Size"), COL_SIZE, 0);
diff --git a/src/summaryview.c b/src/summaryview.c
index 78b21bf7..6c126d25 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5514,7 +5514,9 @@ static GtkWidget *summary_tree_view_create(SummaryView *summaryview)
 
 	ADD_COLUMN(_("Subject"), text, S_COL_SUBJECT, TRUE,
 		   prefs_common.summary_col_size[S_COL_SUBJECT], 0.0);
+#if GTK_CHECK_VERSION(2, 14, 0)
 	gtk_tree_view_column_set_expand(column, TRUE);
+#endif
 	gtk_tree_view_set_expander_column(GTK_TREE_VIEW(treeview), column);
 	ADD_COLUMN(_("From"), text, S_COL_FROM, TRUE,
 		   prefs_common.summary_col_size[S_COL_FROM], 0.0);
-- 
cgit v1.2.3