add and adapt Thomas Link's subject simplification patch

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index eaf930b2e0504a0831003a4f205578b98bfbc47b..b8fd33a6c8fc5b310e2f7a0c0f4c2cc1f6135779 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -48,6 +48,7 @@
 #include "manage_window.h"
 #include "alertpanel.h"
 #include "menu.h"
+#include "stock_pixmap.h"
 #include "procmsg.h"
 #include "utils.h"
 #include "gtkutils.h"
@@ -57,16 +58,6 @@
 #include "folder.h"
 #include "inc.h"
 
-#include "pixmaps/inbox.xpm"
-#include "pixmaps/inbox-hrm.xpm"
-#include "pixmaps/outbox.xpm"
-#include "pixmaps/outbox-hrm.xpm"
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/dir-open-hrm.xpm"
-#include "pixmaps/trash.xpm"
-#include "pixmaps/trash-hrm.xpm"
-
 typedef enum
 {
        COL_FOLDER      = 0,
@@ -455,16 +446,14 @@ void folderview_init(FolderView *folderview)
 {
        GtkWidget *ctree = folderview->ctree;
 
-       PIXMAP_CREATE(ctree, inboxxpm, inboxxpmmask, inbox_xpm);
-       PIXMAP_CREATE(ctree, inboxhrmxpm, inboxhrmxpmmask, inbox_hrm_xpm);
-       PIXMAP_CREATE(ctree, outboxxpm, outboxxpmmask, outbox_xpm);
-       PIXMAP_CREATE(ctree, outboxhrmxpm, outboxhrmxpmmask, outbox_hrm_xpm);
-       PIXMAP_CREATE(ctree, folderxpm, folderxpmmask, dir_close_xpm);
-       PIXMAP_CREATE(ctree, folderopenxpm, folderopenxpmmask, dir_open_xpm);
-       PIXMAP_CREATE(ctree, folderopenhrmxpm, folderopenhrmxpmmask,
-                     dir_open_hrm_xpm);
-       PIXMAP_CREATE(ctree, trashxpm, trashxpmmask, trash_xpm);
-       PIXMAP_CREATE(ctree, trashhrmxpm, trashhrmxpmmask, trash_hrm_xpm);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_INBOX, &inboxxpm, &inboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_OUTBOX,
+                        &outboxxpm, &outboxxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE,
+                        &folderxpm, &folderxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_DIR_OPEN,
+                        &folderopenxpm, &folderopenxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_TRASH, &trashxpm, &trashxpmmask);
 
        if (!normalfont)
                normalfont = gdk_fontset_load(NORMAL_FONT);
@@ -2363,7 +2352,9 @@ static void folderview_processing_cb(FolderView *folderview, guint action,
        prefs_filtering_open(item);
 }
 
-static void folderview_property_cb(FolderView *folderview, guint action, GtkWidget *widget) {
+static void folderview_property_cb(FolderView *folderview, guint action, 
+                                  GtkWidget *widget) 
+{
        GtkCTree *ctree = GTK_CTREE(folderview->ctree);
        FolderItem *item;
 
@@ -2373,10 +2364,11 @@ static void folderview_property_cb(FolderView *folderview, guint action, GtkWidg
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
-       prefs_folder_item_create(item);
+       prefs_folder_item_create(folderview, item);
 }
 
-void folderview_set_target_folder_color(gint color_op) {
+void folderview_set_target_folder_color(gint color_op) 
+{
        gint firstone = 1;
        GList *list;
        FolderView *folderview;