folderview.c: if configured font can't be loaded fall back to gtk default

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index bd9cd280658eebf189a9a7cf511ee66299e951ce..91210ffb1bc476a8bbf02e3c49c2830bf485807c 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -573,13 +573,28 @@ void folderview_init(FolderView *folderview)
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_NEW,hbox_new);
        gtk_clist_set_column_widget(GTK_CLIST(ctree),COL_UNREAD,hbox_unread);
                        
-
-
-       if (!normalfont)
-               normalfont = gtkut_font_load(NORMAL_FONT);
-       if (!boldfont)
-               boldfont = gtkut_font_load(BOLD_FONT);
-
+       if (!normalfont) {
+               if (gtkut_font_load(NORMAL_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       normalfont = style->font;
+                       gdk_font_ref(normalfont);
+                       gtk_style_unref(style);
+               } 
+               else 
+                       normalfont = gtkut_font_load(NORMAL_FONT);
+       }
+       
+       if (!boldfont) {
+               if (gtkut_font_load(BOLD_FONT) == NULL) {
+                       GtkStyle *style = gtk_style_new();
+                       boldfont = style->font;
+                       gdk_font_ref(boldfont);
+                       gtk_style_unref(style);
+               }
+               else
+                       boldfont = gtkut_font_load(BOLD_FONT);
+       }
+       
        if (!bold_style) {
                bold_style = gtk_style_copy(gtk_widget_get_style(ctree));
                bold_style->font = boldfont;
@@ -1760,10 +1775,6 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
        
-       /* messageview could have deleted messages in this folder */
-       if (prefs_common.immediate_exec)
-               summary_execute(folderview->summaryview);
-
        folder_clean_cache_memory();
 
        if (!opened) {