* src/summaryview.c
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 9 Nov 2003 20:26:39 +0000 (20:26 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Sun, 9 Nov 2003 20:26:39 +0000 (20:26 +0000)
don't crash when gtkut_font_load() returns invalid font (has
something to do with locale settings)
Patch submitted by David Chalmers <davidc|AT|ccmi.salk.edu>.

AUTHORS
ChangeLog.claws
configure.ac
src/summaryview.c

diff --git a/AUTHORS b/AUTHORS
index d72cc29..f3fb6c8 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -198,3 +198,4 @@ contributors (beside the above; based on Changelog)
        Bogdan Sumanariu
        David Relson
        Matthias Förste
+       David Chalmers
index 3445cdb..7e2d0b0 100644 (file)
@@ -1,3 +1,10 @@
+2003-11-01 [alfons]    0.9.6claws71
+
+       * src/summaryview.c
+               don't crash when gtkut_font_load() returns invalid font (has
+               something to do with locale settings)
+               Patch submitted by David Chalmers <davidc|AT|ccmi.salk.edu>.
+
 2003-11-09 [alfons]    0.9.6claws70
 
        * src/procmime.c
index bb25fa2..ef8fb41 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=70
+EXTRA_VERSION=71
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
index dea04f9..1ed6bd7 100644 (file)
@@ -771,7 +771,8 @@ void summary_init(SummaryView *summaryview)
                        (gtk_widget_get_style(summaryview->ctree));
                if (!smallfont)
                        smallfont = gtkut_font_load(SMALL_FONT);
-               small_style->font = smallfont;
+               if (smallfont)
+                       small_style->font = smallfont;
                small_marked_style = gtk_style_copy(small_style);
                small_marked_style->fg[GTK_STATE_NORMAL] =
                        summaryview->color_marked;
@@ -2746,7 +2747,7 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
        } else {
                gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MIME], NULL);
        }
-        if (!style)
+       if (!style)
                style = small_style;
 
        gtk_ctree_node_set_row_style(ctree, row, style);