From: Colin Leroy Date: Sun, 15 Feb 2009 10:40:02 +0000 (+0000) Subject: 2009-02-15 [colin] 3.7.0cvs65 X-Git-Tag: rel_3_7_1~14 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e442592493527f24658101f704399d7e58e6b9ef 2009-02-15 [colin] 3.7.0cvs65 * src/folderview.c * src/summaryview.c Fix font updating after changing prefs_common.derive_from_normal_font --- diff --git a/ChangeLog b/ChangeLog index f833e46a3..56e77fced 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-02-15 [colin] 3.7.0cvs65 + + * src/folderview.c + * src/summaryview.c + Fix font updating after changing + prefs_common.derive_from_normal_font + 2009-02-12 [paul] 3.7.0cvs64 * src/addressitem.h diff --git a/PATCHSETS b/PATCHSETS index bd3597da5..957cabcb1 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3726,3 +3726,4 @@ ( cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/spell_entry.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/spell_entry.h; ) > 3.7.0cvs62.patchset ( cvs diff -u -r 1.1.4.24 -r 1.1.4.25 src/gtk/progressdialog.c; cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/gtk/progressdialog.h; ) > 3.7.0cvs63.patchset ( cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/addressitem.h; cvs diff -u -r 1.1.16.5 -r 1.1.16.6 src/export.h; cvs diff -u -r 1.8.2.29 -r 1.8.2.30 src/headerview.c; cvs diff -u -r 1.2.2.5 -r 1.2.2.6 src/headerview.h; cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/common/version.h.in; cvs diff -u -r 1.1.4.2 -r 1.1.4.3 src/gtk/about.h; cvs diff -u -r 1.5.2.39 -r 1.5.2.40 src/gtk/menu.c; cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/gtk/menu.h; ) > 3.7.0cvs64.patchset +( cvs diff -u -r 1.207.2.211 -r 1.207.2.212 src/folderview.c; cvs diff -u -r 1.395.2.406 -r 1.395.2.407 src/summaryview.c; ) > 3.7.0cvs65.patchset diff --git a/configure.ac b/configure.ac index 80ea40624..e535d07c8 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=64 +EXTRA_VERSION=65 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folderview.c b/src/folderview.c index be74cab0c..3d57267f7 100644 --- a/src/folderview.c +++ b/src/folderview.c @@ -2619,6 +2619,8 @@ void folderview_set_target_folder_color(gint color_op) static gchar *last_smallfont = NULL; static gchar *last_normalfont = NULL; static gchar *last_boldfont = NULL; +static gboolean last_derive = 0; + void folderview_reflect_prefs_pixmap_theme(FolderView *folderview) { /* force reinit */ @@ -2641,7 +2643,8 @@ void folderview_reflect_prefs(void) if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) || !last_normalfont || strcmp(last_normalfont, NORMAL_FONT) || - !last_boldfont || strcmp(last_boldfont, BOLD_FONT)) + !last_boldfont || strcmp(last_boldfont, BOLD_FONT) || + last_derive != prefs_common.derive_from_normal_font) update_font = TRUE; g_free(last_smallfont); @@ -2650,6 +2653,7 @@ void folderview_reflect_prefs(void) last_normalfont = g_strdup(NORMAL_FONT); g_free(last_boldfont); last_boldfont = g_strdup(BOLD_FONT); + last_derive = prefs_common.derive_from_normal_font; if (update_font) { normal_style = normal_color_style = bold_style = diff --git a/src/summaryview.c b/src/summaryview.c index 2eee86b8a..b77944133 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -2720,6 +2720,7 @@ void summary_reflect_prefs(void) static gchar *last_smallfont = NULL; static gchar *last_normalfont = NULL; static gchar *last_boldfont = NULL; + static gboolean last_derive = 0; gboolean update_font = FALSE; SummaryView *summaryview = NULL; @@ -2729,7 +2730,8 @@ void summary_reflect_prefs(void) if (!last_smallfont || strcmp(last_smallfont, SMALL_FONT) || !last_normalfont || strcmp(last_normalfont, NORMAL_FONT) || - !last_boldfont || strcmp(last_boldfont, BOLD_FONT)) + !last_boldfont || strcmp(last_boldfont, BOLD_FONT) || + last_derive != prefs_common.derive_from_normal_font) update_font = TRUE; g_free(last_smallfont); @@ -2738,6 +2740,7 @@ void summary_reflect_prefs(void) last_normalfont = g_strdup(NORMAL_FONT); g_free(last_boldfont); last_boldfont = g_strdup(BOLD_FONT); + last_derive = prefs_common.derive_from_normal_font; if (update_font) { bold_style = bold_marked_style = bold_deleted_style =