2007-10-08 [paul] 3.0.2cvs32

[claws.git] / src / stock_pixmap.c

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index dda4d16c1666137ec9f7f1ebf999df100881c132..33addfe21383685a49dd7f06b3405b69b87037cf 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -45,6 +45,7 @@
 #include "pixmaps/edit_extern.xpm"
 #include "pixmaps/forwarded.xpm"
 #include "pixmaps/group.xpm"
+#include "pixmaps/insert_file.xpm"
 #include "pixmaps/interface.xpm"
 #include "pixmaps/jpilot.xpm"
 #include "pixmaps/key.xpm"
@@ -249,7 +250,7 @@ static StockPixmapData pixmaps[] =
        {inbox_close_hrm_mark_xpm               , NULL, NULL, "inbox_close_hrm_mark", NULL},
        {inbox_open_mark_xpm                    , NULL, NULL, "inbox_open_mark", NULL},
        {inbox_open_hrm_mark_xpm                , NULL, NULL, "inbox_open_hrm_mark", NULL},
-       {paste_xpm                              , NULL, NULL, "insert_file", NULL},
+       {insert_file_xpm                        , NULL, NULL, "insert_file", NULL},
        {interface_xpm                          , NULL, NULL, "interface", NULL},
        {jpilot_xpm                             , NULL, NULL, "jpilot", NULL},
        {key_xpm                                , NULL, NULL, "key", NULL},
@@ -502,7 +503,7 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
        DIR *dp;
        
        if ((dp = opendir(dirname)) == NULL) {
-               debug_print("dir %s not found, skipping theme scan", dirname);
+               debug_print("dir %s not found, skipping theme scan", dirname?dirname:"(null)");
                return;
        }
        
@@ -543,7 +544,7 @@ GList *stock_pixmap_themes_list_new(void)
        
        defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
        userthemes   = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                  RC_DIR, G_DIR_SEPARATOR_S, 
+                                  get_rc_dir(), G_DIR_SEPARATOR_S, 
                                   PIXMAP_THEME_DIR, NULL);
        systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
                                   PIXMAP_THEME_DIR, NULL);