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 f7ba05c6edca75e7f02e531a25a74a55c98f83bc..91210ffb1bc476a8bbf02e3c49c2830bf485807c 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -131,6 +131,10 @@ static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
 static GdkPixmap *unreadxpm;
 static GdkBitmap *unreadxpmmask;
+static GdkPixmap *draftsxpm;
+static GdkBitmap *draftsxpmmask;
+static GdkPixmap *draftsopenxpm;
+static GdkBitmap *draftsopenxpmmask;
 
 static void folderview_select_node      (FolderView    *folderview,
                                          GtkCTreeNode  *node);
@@ -543,6 +547,8 @@ void folderview_init(FolderView *folderview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm, &queuehrmxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm, &queueopenxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm, &queueopenhrmxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm, &draftsxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm, &draftsopenxpmmask);
 
        /* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
         * instead text (text overflows making them unreadable and ugly) */
@@ -567,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;
@@ -1135,15 +1156,10 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
                                item->name);
                break;
        case F_DRAFT:
-               xpm = folderxpm;
-               mask = folderxpmmask;
-               if (item->hide_read_msgs) {
-                       openxpm = folderopenhrmxpm;
-                       openmask = folderopenhrmxpmmask;
-               } else {
-                       openxpm = folderopenxpm;
-                       openmask = folderopenxpmmask;
-               }
+               xpm = draftsxpm;
+               mask = draftsxpmmask;
+               openxpm = draftsopenxpm;
+               openmask = draftsopenxpmmask;
                name = g_strdup(FOLDER_IS_LOCAL(item->folder) &&
                                !strcmp2(item->name, DRAFT_DIR) ? _("Drafts") :
                                item->name);
@@ -1758,7 +1774,7 @@ static void folderview_selected(GtkCTree *ctree, GtkCTreeNode *row,
        /* Show messages */
        summary_set_prefs_from_folderitem(folderview->summaryview, item);
        opened = summary_show(folderview->summaryview, item);
-
+       
        folder_clean_cache_memory();
 
        if (!opened) {
@@ -2465,6 +2481,8 @@ static void folderview_rm_news_group_cb(FolderView *folderview, guint action,
        folder_item_remove(item);
        gtk_ctree_remove_node(ctree, folderview->selected);
        folder_write_list();
+       
+       prefs_filtering_delete_path(name);
 }
 
 static void folderview_rm_news_server_cb(FolderView *folderview, guint action,
@@ -2532,9 +2550,10 @@ static void folderview_property_cb(FolderView *folderview, guint action,
 
        if (item->parent == NULL && item->folder->account)
                account_open(item->folder->account);
-       else
+       else {
                summary_save_prefs_to_folderitem(folderview->summaryview, item);
                prefs_folder_item_create(folderview, item);
+       }
 }
 
 static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *node)