From: Colin Leroy <colin@colino.net>
Date: Thu, 13 Oct 2005 17:49:51 +0000 (+0000)
Subject: 2005-10-13 [colin]	1.9.15cvs38
X-Git-Tag: rel_1_9_99~99
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=90a56a4e505d15603c6a30216d770f6cb75962dc;ds=sidebyside

2005-10-13 [colin]	1.9.15cvs38

	* src/summaryview.c
		Faster prefs apply
---

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 95e7690e3..b1d399f35 100644
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-10-13 [colin]	1.9.15cvs38
+
+	* src/summaryview.c
+		Faster prefs apply
+
 2005-10-13 [colin]	1.9.15cvs37
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
index c9b240c88..f0efe21d2 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -874,3 +874,4 @@
 ( cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/folder_item_prefs.c;  ) > 1.9.15cvs35.patchset
 ( cvs diff -u -r 1.213.2.63 -r 1.213.2.64 src/folder.c;  cvs diff -u -r 1.207.2.71 -r 1.207.2.72 src/folderview.c;  ) > 1.9.15cvs36.patchset
 ( cvs diff -u -r 1.83.2.42 -r 1.83.2.43 src/mimeview.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/noticeview.c;  cvs diff -u -r 1.3.8.3 -r 1.3.8.4 src/noticeview.h;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.15cvs37.patchset
+( cvs diff -u -r 1.395.2.135 -r 1.395.2.136 src/summaryview.c;  ) > 1.9.15cvs38.patchset
diff --git a/configure.ac b/configure.ac
index 7aa87e060..15af26c84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/summaryview.c b/src/summaryview.c
index 45e728e64..b3d209791 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -983,8 +983,6 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 
 	g_slist_free(mlist);
 
-	gtk_clist_thaw(GTK_CLIST(ctree));
-
 	if (is_refresh) {
 		summaryview->displayed =
 			summary_find_msg_by_msgnum(summaryview,
@@ -1044,6 +1042,8 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 	summary_status_show(summaryview);
 	summary_set_menu_sensitive(summaryview);
 	toolbar_main_set_sensitive(summaryview->mainwin);
+	
+	gtk_clist_thaw(GTK_CLIST(ctree));
 
 	debug_print("\n");
 	STATUSBAR_PUSH(summaryview->mainwin, _("Done."));
@@ -2071,13 +2071,28 @@ static void summary_set_column_titles(SummaryView *summaryview)
 
 void summary_reflect_prefs(void)
 {
+	static gchar *last_font = NULL;
+	gboolean update_font = TRUE;
 	SummaryView *summaryview = NULL;
+
 	if (!mainwindow_get_mainwindow())
 		return;
 	summaryview = mainwindow_get_mainwindow()->summaryview;
-	bold_style = bold_marked_style = bold_deleted_style = 
-		small_style = small_marked_style = small_deleted_style = NULL;
-	summary_set_fonts(summaryview);
+
+	if (last_font && !strcmp(last_font, NORMAL_FONT))
+		update_font = FALSE;
+
+	if (last_font)
+		g_free(last_font);
+	
+	last_font = g_strdup(NORMAL_FONT);
+
+	if (update_font) {	
+		bold_style = bold_marked_style = bold_deleted_style = 
+			small_style = small_marked_style = small_deleted_style = NULL;
+		summary_set_fonts(summaryview);
+	}
+
 	summary_set_column_titles(summaryview);
 	summary_show(summaryview, summaryview->folder_item);
 }