remove icons that will never be displayed

[claws.git] / src / stock_pixmap.c

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 84ec1da66d1757b69d286a35ffe41c482726b1d5..429fb6146312a18aad9556dadbf16acb29f1e82e 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -173,7 +173,12 @@
 #include "pixmaps/trash_hrm_mark.xpm"
 #include "pixmaps/drafts_close_mark.xpm"
 #include "pixmaps/drafts_open_mark.xpm"
-#include "pixmaps/dir_noselect.xpm"
+#include "pixmaps/dir_noselect_close.xpm"
+#include "pixmaps/dir_noselect_close_mark.xpm"
+#include "pixmaps/dir_noselect_open.xpm"
+#include "pixmaps/dir_subs_close_mark.xpm"
+#include "pixmaps/dir_subs_close.xpm"
+#include "pixmaps/dir_subs_open.xpm"
 #include "pixmaps/spam.xpm"
 #include "pixmaps/spam_btn.xpm"
 #include "pixmaps/ham_btn.xpm"
@@ -377,7 +382,12 @@ static StockPixmapData pixmaps[] =
 #else
        {claws_mail_logo_small_xpm              , NULL, NULL, "claws_mail_logo_small", NULL},
 #endif
-        {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL},
+        {dir_noselect_close_xpm                 , NULL, NULL, "dir_noselect_close" , NULL},
+        {dir_noselect_close_mark_xpm            , NULL, NULL, "dir_noselect_close_mark" , NULL},
+        {dir_noselect_open_xpm                  , NULL, NULL, "dir_noselect_open" , NULL},
+        {dir_subs_close_mark_xpm                , NULL, NULL, "dir_subs_close_mark" , NULL},
+        {dir_subs_close_xpm                     , NULL, NULL, "dir_subs_close" , NULL},
+        {dir_subs_open_xpm                      , NULL, NULL, "dir_subs_open" , NULL},
         {spam_xpm                               , NULL, NULL, "spam" , NULL},
         {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
         {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
@@ -399,14 +409,13 @@ static StockPixmapData pixmaps[] =
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */
-GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
+GtkWidget *stock_pixmap_widget(StockPixmap icon)
 {
        GdkPixbuf *pixbuf;
 
-       cm_return_val_if_fail(window != NULL, NULL);
        cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
 
-       if (stock_pixbuf_gdk(window, icon, &pixbuf) != -1)
+       if (stock_pixbuf_gdk(icon, &pixbuf) != -1)
                return gtk_image_new_from_pixbuf(pixbuf);
        
        return NULL;
@@ -415,7 +424,7 @@ GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
 /*!
  *\brief       
  */
-gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
+gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
 {
        StockPixmapData *pix_d;
        static const char *extension[]={".png", ".xpm", NULL};
@@ -539,7 +548,7 @@ gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme)
        return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
                           PIXMAP_THEME_DIR, sep, theme, NULL);
 #else
-       return g_strconcat(get_themes_dir(), sep, theme, NULL);
+       return g_strconcat(w32_get_themes_dir(), sep, theme, NULL);
 #endif
 }
 
@@ -756,7 +765,7 @@ static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
  * \param border_x size of the border around the base icon (left and right)
  * \param border_y size of the border around the base icon (top and bottom)
  */
-GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
+GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
                                            StockPixmap overlay, OverlayPosition pos,
                                            gint border_x, gint border_y)
 {
@@ -769,7 +778,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
        
        data = g_new0(OverlayData, 1);
 
-       stock_wid = stock_pixmap_widget(window, icon);
+       stock_wid = stock_pixmap_widget(icon);
        gtk_widget_get_requisition(stock_wid, &requisition);
 
 #if !GTK_CHECK_VERSION(3, 0, 0)
@@ -792,7 +801,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
                if (pos == OVERLAY_NONE) {
                        data->overlay_pixmap = NULL;
                } else {
-                       stock_wid = stock_pixmap_widget(window, overlay);
+                       stock_wid = stock_pixmap_widget(overlay);
                        cr = gdk_cairo_create(gtk_widget_get_window(stock_wid));
                        stock_pixmap = cairo_get_target(cr);
                        cairo_surface_reference(stock_pixmap);
@@ -814,7 +823,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
                if (pos == OVERLAY_NONE) {
                        data->overlay_pixmap = NULL;
                } else {
-                       stock_wid = stock_pixmap_widget(window, overlay);
+                       stock_wid = stock_pixmap_widget(overlay);
                        stock_pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(stock_wid));
                        g_object_ref(stock_pixbuf);
                        data->overlay_pixbuf = stock_pixbuf;