talons

commit d20dd703c89247ce5dea04cee7891f336ba49738
parent c7456ba3ad1a55c8806054927d4b6af94d383e32
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Tue, 23 Mar 2010 16:12:41 +0000

2010-03-23 [pawel]	3.7.5cvs37

	* src/mainwindow.c
	* src/mimeview.c
		Respect view->show_col_headers option
	* src/gtk/gtkcmctree.c
		Fix GtkCmcTree column width calculation when it has
		auto_resize set and new node is added

Diffstat:
M
ChangeLog
 | 
9
+++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/gtk/gtkcmctree.c
 | 
2
+-
M
src/mainwindow.c
 | 
3
+++
M
src/mimeview.c
 | 
8
+++++++-

6 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-23 [pawel]	3.7.5cvs37
+
+	* src/mainwindow.c
+	* src/mimeview.c
+		Respect view->show_col_headers option
+	* src/gtk/gtkcmctree.c
+		Fix GtkCmcTree column width calculation when it has
+		auto_resize set and new node is added
+
 2010-03-22 [pawel]	3.7.5cvs36
 
 	* src/grouplistdialog.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3977,3 +3977,4 @@
 ( cvs diff -u -r 1.115.2.225 -r 1.115.2.226 src/main.c;  cvs diff -u -r 1.1.2.89 -r 1.1.2.90 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/gtk/quicksearch.h;  ) > 3.7.5cvs34.patchset
 ( cvs diff -u -r 1.5.10.30 -r 1.5.10.31 src/addrgather.c;  cvs diff -u -r 1.83.2.160 -r 1.83.2.161 src/mimeview.c;  cvs diff -u -r 1.36.2.183 -r 1.36.2.184 src/common/utils.c;  ) > 3.7.5cvs35.patchset
 ( cvs diff -u -r 1.14.2.24 -r 1.14.2.25 src/grouplistdialog.c;  cvs diff -u -r 1.204.2.194 -r 1.204.2.195 src/prefs_common.c;  cvs diff -u -r 1.103.2.127 -r 1.103.2.128 src/prefs_common.h;  ) > 3.7.5cvs36.patchset
+( cvs diff -u -r 1.274.2.307 -r 1.274.2.308 src/mainwindow.c;  cvs diff -u -r 1.83.2.161 -r 1.83.2.162 src/mimeview.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/gtk/gtkcmctree.c;  ) > 3.7.5cvs37.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
@@ -3014,7 +3014,7 @@ set_cell_contents (GtkCMCList    *clist,
       GtkCMCTreeNode *parent;
 
       parent = ((GtkCMCTreeRow *)clist_row)->parent;
-      if (!parent || (parent && GTK_CMCTREE_ROW (parent)->expanded &&
+      if ((parent && GTK_CMCTREE_ROW (parent)->expanded &&
 		      gtk_cmctree_is_viewable (ctree, parent)))
 	{
 	  visible = TRUE;
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -4091,14 +4091,17 @@ static void toggle_col_headers_cb(GtkAction *gaction, gpointer data)
 	MainWindow *mainwin = (MainWindow *)data;
 	FolderView *folderview = mainwin->folderview;
 	SummaryView *summaryview = mainwin->summaryview;
+	MimeView *mimeview = mainwin->messageview->mimeview;
 
 	if (gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (gaction))) {
 		gtk_cmclist_column_titles_show(GTK_CMCLIST(folderview->ctree));
 		gtk_cmclist_column_titles_show(GTK_CMCLIST(summaryview->ctree));
+  		gtk_cmclist_column_titles_show(GTK_CMCLIST(mimeview->ctree));
 		prefs_common.show_col_headers = TRUE;
 	} else {
 		gtk_cmclist_column_titles_hide(GTK_CMCLIST(folderview->ctree));
 		gtk_cmclist_column_titles_hide(GTK_CMCLIST(summaryview->ctree));
+   		gtk_cmclist_column_titles_hide(GTK_CMCLIST(mimeview->ctree));		
 		prefs_common.show_col_headers = FALSE;
 	}
 }
diff --git a/src/mimeview.c b/src/mimeview.c
@@ -278,16 +278,22 @@ MimeView *mimeview_create(MainWindow *mainwin)
 				       GTK_POLICY_AUTOMATIC);
 
 	ctree = gtk_sctree_new_with_titles(N_MIMEVIEW_COLS, 0, titles);
-	gtk_widget_show(ctree);
+
+	if (prefs_common.show_col_headers == FALSE)
+		gtk_cmclist_column_titles_hide(GTK_CMCLIST(ctree));
+
 	gtk_cmclist_set_selection_mode(GTK_CMCLIST(ctree), GTK_SELECTION_BROWSE);
 	gtk_cmctree_set_line_style(GTK_CMCTREE(ctree), GTK_CMCTREE_LINES_NONE);
 	gtk_cmclist_set_column_justification(GTK_CMCLIST(ctree), COL_SIZE,
 					   GTK_JUSTIFY_RIGHT);
 	gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_MIMETYPE, 240);
 	gtk_cmclist_set_column_width(GTK_CMCLIST(ctree), COL_SIZE, 90);
+	gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_MIMETYPE, TRUE);
+	gtk_cmclist_set_column_auto_resize(GTK_CMCLIST(ctree), COL_NAME, TRUE);	
 	for (i = 0; i < N_MIMEVIEW_COLS; i++)
 		GTK_WIDGET_UNSET_FLAGS(GTK_CMCLIST(ctree)->column[i].button,
 				       GTK_CAN_FOCUS);
+	gtk_widget_show(ctree);
 	gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
 
 	g_signal_connect(G_OBJECT(ctree), "tree_select_row",