Remove extra entries, not yet in git.
[claws.git] / src / stock_pixmap.c
index 986535cab99d95a7c3dbdfb40becbad8997c4989..b4f9d5686feab864b26505ab97b4c5011b1766d0 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #include "defs.h"
@@ -23,6 +22,7 @@
 #include <string.h>
 #include <dirent.h>
 
+#include "config.h"
 #include "stock_pixmap.h"
 #include "gtkutils.h"
 #include "utils.h"
@@ -57,6 +57,7 @@
 #include "pixmaps/locked.xpm"
 #include "pixmaps/new.xpm"
 #include "pixmaps/replied.xpm"
+#include "pixmaps/replied_and_forwarded.xpm"
 #include "pixmaps/close.xpm"
 #include "pixmaps/down_arrow.xpm"
 #include "pixmaps/up_arrow.xpm"
 #include "pixmaps/queue_close_hrm.xpm"
 #include "pixmaps/queue_open.xpm"
 #include "pixmaps/queue_open_hrm.xpm"
-#include "pixmaps/claws-mail_icon.xpm"
+#include "pixmaps/claws_mail_icon.xpm"
+#include "pixmaps/claws_mail_icon_64.xpm"
+#include "pixmaps/claws_mail_compose_logo.xpm"
 #ifndef GENERIC_UMPC
-#include "pixmaps/claws-mail_logo.xpm"
+#include "pixmaps/claws_mail_logo.xpm"
 #else
-#include "pixmaps/claws-mail_logo-small.xpm"
+#include "pixmaps/claws_mail_logo_small.xpm"
 #endif
 #include "pixmaps/address_book.xpm"
 #include "pixmaps/unread.xpm"
 #include "pixmaps/privacy_failed.xpm"
 #include "pixmaps/privacy_unknown.xpm"
 #include "pixmaps/privacy_expired.xpm"
-#include "pixmaps/privacy_warn.xpm"                 
+#include "pixmaps/privacy_warn.xpm"
 #include "pixmaps/privacy_emblem_encrypted.xpm"
 #include "pixmaps/privacy_emblem_signed.xpm"
 #include "pixmaps/privacy_emblem_passed.xpm"
 #include "pixmaps/privacy_emblem_failed.xpm"
 #include "pixmaps/privacy_emblem_warn.xpm"
-#include "pixmaps/mime_message.xpm"                  
+#include "pixmaps/mime_message.xpm"
 #include "pixmaps/address_search.xpm"
 #include "pixmaps/check_spelling.xpm"
 
 #include "pixmaps/outbox_open_hrm.xpm"
 #include "pixmaps/outbox_close.xpm"
 #include "pixmaps/outbox_close_hrm.xpm"
-#include "pixmaps/trash.xpm"
+#include "pixmaps/trash_open.xpm"
+#include "pixmaps/trash_close.xpm"
 #include "pixmaps/delete_btn.xpm"
 #include "pixmaps/cancel.xpm"
 #include "pixmaps/trash_btn.xpm"
-#include "pixmaps/trash_hrm.xpm"
+#include "pixmaps/trash_open_hrm.xpm"
+#include "pixmaps/trash_close_hrm.xpm"
 #include "pixmaps/drafts_close.xpm"
 #include "pixmaps/drafts_open.xpm"
 #include "pixmaps/dir_close_mark.xpm"
 #include "pixmaps/outbox_open_hrm_mark.xpm"
 #include "pixmaps/outbox_close_mark.xpm"
 #include "pixmaps/outbox_close_hrm_mark.xpm"
-#include "pixmaps/trash_mark.xpm"
+#include "pixmaps/trash_open_mark.xpm"
+#include "pixmaps/trash_close_mark.xpm"
 #include "pixmaps/queue_close_mark.xpm"
 #include "pixmaps/queue_close_hrm_mark.xpm"
 #include "pixmaps/queue_open_mark.xpm"
 #include "pixmaps/queue_open_hrm_mark.xpm"
-#include "pixmaps/trash_hrm_mark.xpm"
+#include "pixmaps/trash_open_hrm_mark.xpm"
+#include "pixmaps/trash_close_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"
 #include "pixmaps/selection.xpm"
 #include "pixmaps/watchthread.xpm"
 #include "pixmaps/empty.xpm"
-#include "pixmaps/tray_newmail.offline.xpm"
+#include "pixmaps/tray_newmail_offline.xpm"
 #include "pixmaps/tray_newmail.xpm"
-#include "pixmaps/tray_newmarkedmail.offline.xpm"
+#include "pixmaps/tray_newmarkedmail_offline.xpm"
 #include "pixmaps/tray_newmarkedmail.xpm"
-#include "pixmaps/tray_nomail.offline.xpm"
+#include "pixmaps/tray_nomail_offline.xpm"
 #include "pixmaps/tray_nomail.xpm"
-#include "pixmaps/tray_unreadmail.offline.xpm"
+#include "pixmaps/tray_unreadmail_offline.xpm"
 #include "pixmaps/tray_unreadmail.xpm"
-#include "pixmaps/tray_unreadmarkedmail.offline.xpm"
+#include "pixmaps/tray_unreadmarkedmail_offline.xpm"
 #include "pixmaps/tray_unreadmarkedmail.xpm"
+#include "pixmaps/doc_index.xpm"
+#include "pixmaps/doc_index_close.xpm"
+#include "pixmaps/doc_info.xpm"
+#include "pixmaps/first_arrow.xpm"
+#include "pixmaps/last_arrow.xpm"
+#include "pixmaps/left_arrow.xpm"
+#include "pixmaps/right_arrow.xpm"
+#include "pixmaps/rotate_left.xpm"
+#include "pixmaps/rotate_right.xpm"
+#include "pixmaps/zoom_fit.xpm"
+#include "pixmaps/zoom_in.xpm"
+#include "pixmaps/zoom_out.xpm"
+#include "pixmaps/zoom_width.xpm"
 
 typedef struct _StockPixmapData        StockPixmapData;
 
@@ -227,181 +252,201 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
 
 static StockPixmapData pixmaps[] =
 {
-       {addr_one_xpm                           , NULL, NULL, "addr_one", NULL},
-       {addr_two_xpm                           , NULL, NULL, "addr_two", NULL},
-       {address_xpm                            , NULL, NULL, "address", NULL},
-       {address_book_xpm                       , NULL, NULL, "address_book", NULL},
-       {address_search_xpm                     , NULL, NULL, "address_search", NULL},
-       {anonymous_xpm                          , NULL, NULL, "anonymous", NULL},
-       {book_xpm                               , NULL, NULL, "book", NULL},
-       {category_xpm                           , NULL, NULL, "category", NULL},
-       {checkbox_off_xpm                       , NULL, NULL, "checkbox_off", NULL},
-       {checkbox_on_xpm                        , NULL, NULL, "checkbox_on", NULL},
-       {check_spelling_xpm                     , NULL, NULL, "check_spelling", NULL},
-       {clip_xpm                               , NULL, NULL, "clip", NULL},
-       {clipkey_xpm                            , NULL, NULL, "clipkey", NULL},
-       {clip_gpg_signed_xpm                    , NULL, NULL, "clip_gpg_signed", NULL},
-       {close_xpm                              , NULL, NULL, "close", NULL},
-       {complete_xpm                           , NULL, NULL, "complete", NULL},
-       {continue_xpm                           , NULL, NULL, "continue", NULL},
-       {deleted_xpm                            , NULL, NULL, "deleted", NULL},
-       {dir_close_xpm                          , NULL, NULL, "dir_close", NULL},
-       {dir_close_hrm_xpm                      , NULL, NULL, "dir_close_hrm", NULL},
-       {dir_open_xpm                           , NULL, NULL, "dir_open", NULL},
-       {dir_open_hrm_xpm                       , NULL, NULL, "dir_open_hrm", NULL},
-       {dir_close_mark_xpm                     , NULL, NULL, "dir_close_mark", NULL},
-       {dir_close_hrm_mark_xpm                 , NULL, NULL, "dir_close_hrm_mark", NULL},
-       {dir_open_mark_xpm                      , NULL, NULL, "dir_open_mark", NULL},
-       {dir_open_hrm_mark_xpm                  , NULL, NULL, "dir_open_hrm_mark", NULL},
-       {down_arrow_xpm                         , NULL, NULL, "down_arrow", NULL},
-       {up_arrow_xpm                           , NULL, NULL, "up_arrow", NULL},
-       {edit_extern_xpm                        , NULL, NULL, "edit_extern", NULL},
-       {error_xpm                              , NULL, NULL, "error", NULL},
-       {exec_xpm                               , NULL, NULL, "exec", NULL},
-       {forwarded_xpm                          , NULL, NULL, "forwarded", NULL},
-       {group_xpm                              , NULL, NULL, "group", NULL},
-       {ignorethread_xpm                       , NULL, NULL, "ignorethread", NULL},
-       {inbox_close_xpm                        , NULL, NULL, "inbox_close", NULL},
-       {inbox_close_hrm_xpm                    , NULL, NULL, "inbox_close_hrm", NULL},
-       {inbox_open_xpm                         , NULL, NULL, "inbox_open", NULL},
-       {inbox_open_hrm_xpm                     , NULL, NULL, "inbox_open_hrm", NULL},
-       {inbox_close_mark_xpm                   , NULL, NULL, "inbox_close_mark", NULL},
-       {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},
-       {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},
-       {key_gpg_signed_xpm                     , NULL, NULL, "key_gpg_signed_xpm", NULL},
-       {ldap_xpm                               , NULL, NULL, "ldap", NULL},
-       {linewrapcurrent_xpm                    , NULL, NULL, "linewrapcurrent", NULL},
-       {linewrap_xpm                           , NULL, NULL, "linewrap", NULL},
-       {locked_xpm                             , NULL, NULL, "locked", NULL},
-       {mail_xpm                               , NULL, NULL, "mail", NULL},
-       {mail_attach_xpm                        , NULL, NULL, "mail_attach", NULL},
-       {mail_compose_xpm                       , NULL, NULL, "mail_compose", NULL},
-       {mail_forward_xpm                       , NULL, NULL, "mail_forward", NULL},
-       {mail_receive_xpm                       , NULL, NULL, "mail_receive", NULL},
-       {mail_receive_all_xpm                   , NULL, NULL, "mail_receive_all", NULL},
-       {mail_reply_xpm                         , NULL, NULL, "mail_reply", NULL},
-       {mail_reply_to_all_xpm                  , NULL, NULL, "mail_reply_to_all", NULL},
-       {mail_reply_to_author_xpm               , NULL, NULL, "mail_reply_to_author", NULL},
-       {mail_reply_to_list_xpm                 , NULL, NULL, "mail_reply_to_list", NULL},
-       {mail_send_xpm                          , NULL, NULL, "mail_send", NULL},
-       {mail_send_queue_xpm                    , NULL, NULL, "mail_send_queue", NULL},
-       {mail_sign_xpm                          , NULL, NULL, "mail_sign", NULL},
-       {open_mail_xpm                          , NULL, NULL, "open_mail", NULL},
-       {mark_xpm                               , NULL, NULL, "mark", NULL},
-       {new_xpm                                , NULL, NULL, "new", NULL},
-       {news_compose_xpm                       , NULL, NULL, "news_compose", NULL},
-       {outbox_close_xpm                       , NULL, NULL, "outbox_close", NULL},
-       {outbox_close_hrm_xpm                   , NULL, NULL, "outbox_close_hrm", NULL},
-       {outbox_open_xpm                        , NULL, NULL, "outbox_open", NULL},
-       {outbox_open_hrm_xpm                    , NULL, NULL, "outbox_open_hrm", NULL},
-       {outbox_close_mark_xpm                  , NULL, NULL, "outbox_close_mark", NULL},
-       {outbox_close_hrm_mark_xpm              , NULL, NULL, "outbox_close_hrm_mark", NULL},
-       {outbox_open_mark_xpm                   , NULL, NULL, "outbox_open_mark", NULL},
-       {outbox_open_hrm_mark_xpm               , NULL, NULL, "outbox_open_hrm_mark", NULL},
-       {replied_xpm                            , NULL, NULL, "replied", NULL},
-       {paste_xpm                              , NULL, NULL, "paste", NULL},
-       {preferences_xpm                        , NULL, NULL, "preferences", NULL},
-       {properties_xpm                         , NULL, NULL, "properties", NULL},
-       {queue_close_xpm                        , NULL, NULL, "queue_close", NULL},
-       {queue_close_hrm_xpm                    , NULL, NULL, "queue_close_hrm", NULL},
-       {queue_open_xpm                         , NULL, NULL, "queue_open", NULL},
-       {queue_open_hrm_xpm                     , NULL, NULL, "queue_open_hrm", NULL},
-       {trash_xpm                              , NULL, NULL, "trash_open", NULL},
-       {trash_hrm_xpm                          , NULL, NULL, "trash_open_hrm", NULL},
-       {trash_xpm                              , NULL, NULL, "trash_close", NULL},
-       {trash_hrm_xpm                          , NULL, NULL, "trash_close_hrm", NULL},
-       {queue_close_mark_xpm                   , NULL, NULL, "queue_close_mark", NULL},
-       {queue_close_hrm_mark_xpm               , NULL, NULL, "queue_close_hrm_mark", NULL},
-       {queue_open_mark_xpm                    , NULL, NULL, "queue_open_mark", NULL},
-       {queue_open_hrm_mark_xpm                , NULL, NULL, "queue_open_hrm_mark", NULL},
-       {trash_mark_xpm                         , NULL, NULL, "trash_open_mark", NULL},
-       {trash_hrm_mark_xpm                     , NULL, NULL, "trash_open_hrm_mark", NULL},
-       {trash_mark_xpm                         , NULL, NULL, "trash_close_mark", NULL},
-       {trash_hrm_mark_xpm                     , NULL, NULL, "trash_close_hrm_mark", NULL},
-       {unread_xpm                             , NULL, NULL, "unread", NULL},
-       {vcard_xpm                              , NULL, NULL, "vcard", NULL},
-       {online_xpm                             , NULL, NULL, "online", NULL},
-       {offline_xpm                            , NULL, NULL, "offline", NULL},
-       {notice_warn_xpm                        , NULL, NULL, "notice_warn",  NULL},
-       {notice_error_xpm                       , NULL, NULL, "notice_error",  NULL},
-       {notice_note_xpm                        , NULL, NULL, "notice_note",  NULL},
-       {quicksearch_xpm                        , NULL, NULL, "quicksearch",  NULL},
-       {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", NULL},
-       {go_folders_xpm                         , NULL, NULL, "go_folders", NULL},
-       {drafts_close_xpm                       , NULL, NULL, "drafts_close", NULL},
-       {drafts_open_xpm                        , NULL, NULL, "drafts_open", NULL},
-       {drafts_close_mark_xpm                  , NULL, NULL, "drafts_close_mark", NULL},
-       {drafts_open_mark_xpm                   , NULL, NULL, "drafts_open_mark", NULL},
-       {mime_text_plain_xpm                    , NULL, NULL, "mime_text_plain", NULL},
-       {mime_text_html_xpm                     , NULL, NULL, "mime_text_html", NULL},
-       {mime_text_patch_xpm                    , NULL, NULL, "mime_text_patch", NULL},
-       {mime_application_xpm                   , NULL, NULL, "mime_application", NULL},
-       {mime_image_xpm                         , NULL, NULL, "mime_image", NULL},
-       {mime_audio_xpm                         , NULL, NULL, "mime_audio", NULL},
-       {mime_text_enriched_xpm                 , NULL, NULL, "mime_text_enriched", NULL},
-       {mime_unknown_xpm                       , NULL, NULL, "mime_unknown", NULL},    
-       {mime_pdf_xpm                           , NULL, NULL, "mime_pdf", NULL},        
-       {mime_ps_xpm                            , NULL, NULL, "mime_ps", NULL}, 
-       {mime_calendar_xpm                      , NULL, NULL, "mime_calendar", NULL},   
-       {mime_pgpsig_xpm                        , NULL, NULL, "mime_pgpsig", NULL},     
-       {printer_xpm                            , NULL, NULL, "printer", NULL},
-       {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", NULL},
-       {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", NULL},
-       {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", NULL},  
-       {privacy_unknown_xpm                    , NULL, NULL, "privacy_unknown", NULL},
-       {privacy_expired_xpm                    , NULL, NULL, "privacy_expired", NULL},
-       {privacy_warn_xpm                       , NULL, NULL, "privacy_warn", NULL},
-       {privacy_emblem_encrypted_xpm           , NULL, NULL, "privacy_emblem_encrypted", NULL},
-       {privacy_emblem_signed_xpm              , NULL, NULL, "privacy_emblem_signed", NULL},
-       {privacy_emblem_passed_xpm              , NULL, NULL, "privacy_emblem_passed", NULL},
-       {privacy_emblem_failed_xpm              , NULL, NULL, "privacy_emblem_failed", NULL},   
-       {privacy_emblem_warn_xpm                , NULL, NULL, "privacy_emblem_warn", NULL},
-       {mime_message_xpm                       , NULL, NULL, "mime_message", NULL},
-       {claws_mail_icon_xpm                    , NULL, NULL, "claws_mail_icon", NULL},
-       {read_xpm                               , NULL, NULL, "read", NULL},
-       {delete_btn_xpm                         , NULL, NULL, "delete_btn", NULL},
-       {cancel_xpm                             , NULL, NULL, "cancel", NULL},
-       {trash_btn_xpm                          , NULL, NULL, "trash_btn", NULL},
+    {addr_one_xpm                        , NULL, NULL, "addr_one", NULL, NULL},
+    {addr_two_xpm                        , NULL, NULL, "addr_two", NULL, NULL},
+    {address_xpm                         , NULL, NULL, "address", NULL, NULL},
+    {address_book_xpm                    , NULL, NULL, "address_book", NULL, NULL},
+    {address_search_xpm                  , NULL, NULL, "address_search", NULL, NULL},
+    {anonymous_xpm                       , NULL, NULL, "anonymous", NULL, NULL},
+    {book_xpm                            , NULL, NULL, "book", NULL, NULL},
+    {category_xpm                        , NULL, NULL, "category", NULL, NULL},
+    {checkbox_off_xpm                    , NULL, NULL, "checkbox_off", NULL, NULL},
+    {checkbox_on_xpm                     , NULL, NULL, "checkbox_on", NULL, NULL},
+    {check_spelling_xpm                  , NULL, NULL, "check_spelling", NULL, NULL},
+    {clip_xpm                            , NULL, NULL, "clip", NULL, NULL},
+    {clipkey_xpm                         , NULL, NULL, "clipkey", NULL, NULL},
+    {clip_gpg_signed_xpm                 , NULL, NULL, "clip_gpg_signed", NULL, NULL},
+    {close_xpm                           , NULL, NULL, "close", NULL, NULL},
+    {complete_xpm                        , NULL, NULL, "complete", NULL, NULL},
+    {continue_xpm                        , NULL, NULL, "continue", NULL, NULL},
+    {deleted_xpm                         , NULL, NULL, "deleted", NULL, NULL},
+    {dir_close_xpm                       , NULL, NULL, "dir_close", NULL, NULL},
+    {dir_close_hrm_xpm                   , NULL, NULL, "dir_close_hrm", NULL, NULL},
+    {dir_open_xpm                        , NULL, NULL, "dir_open", NULL, NULL},
+    {dir_open_hrm_xpm                    , NULL, NULL, "dir_open_hrm", NULL, NULL},
+    {dir_close_mark_xpm                  , NULL, NULL, "dir_close_mark", NULL, NULL},
+    {dir_close_hrm_mark_xpm              , NULL, NULL, "dir_close_hrm_mark", NULL, NULL},
+    {dir_open_mark_xpm                   , NULL, NULL, "dir_open_mark", NULL, NULL},
+    {dir_open_hrm_mark_xpm               , NULL, NULL, "dir_open_hrm_mark", NULL, NULL},
+    {down_arrow_xpm                      , NULL, NULL, "down_arrow", NULL, NULL},
+    {up_arrow_xpm                        , NULL, NULL, "up_arrow", NULL, NULL},
+    {edit_extern_xpm                     , NULL, NULL, "edit_extern", NULL, NULL},
+    {error_xpm                           , NULL, NULL, "error", NULL, NULL},
+    {exec_xpm                            , NULL, NULL, "exec", NULL, NULL},
+    {forwarded_xpm                       , NULL, NULL, "forwarded", NULL, NULL},
+    {group_xpm                           , NULL, NULL, "group", NULL, NULL},
+    {ignorethread_xpm                    , NULL, NULL, "ignorethread", NULL, NULL},
+    {inbox_close_xpm                     , NULL, NULL, "inbox_close", NULL, NULL},
+    {inbox_close_hrm_xpm                 , NULL, NULL, "inbox_close_hrm", NULL, NULL},
+    {inbox_open_xpm                      , NULL, NULL, "inbox_open", NULL, NULL},
+    {inbox_open_hrm_xpm                  , NULL, NULL, "inbox_open_hrm", NULL, NULL},
+    {inbox_close_mark_xpm                , NULL, NULL, "inbox_close_mark", NULL, NULL},
+    {inbox_close_hrm_mark_xpm            , NULL, NULL, "inbox_close_hrm_mark", NULL, NULL},
+    {inbox_open_mark_xpm                 , NULL, NULL, "inbox_open_mark", NULL, NULL},
+    {inbox_open_hrm_mark_xpm             , NULL, NULL, "inbox_open_hrm_mark", NULL, NULL},
+    {insert_file_xpm                     , NULL, NULL, "insert_file", NULL, NULL},
+    {interface_xpm                       , NULL, NULL, "interface", NULL, NULL},
+    {jpilot_xpm                          , NULL, NULL, "jpilot", NULL, NULL},
+    {key_xpm                             , NULL, NULL, "key", NULL, NULL},
+    {key_gpg_signed_xpm                  , NULL, NULL, "key_gpg_signed", NULL, NULL},
+    {ldap_xpm                            , NULL, NULL, "ldap", NULL, NULL},
+    {linewrapcurrent_xpm                 , NULL, NULL, "linewrapcurrent", NULL, NULL},
+    {linewrap_xpm                        , NULL, NULL, "linewrap", NULL, NULL},
+    {locked_xpm                          , NULL, NULL, "locked", NULL, NULL},
+    {mail_xpm                            , NULL, NULL, "mail", NULL, NULL},
+    {mail_attach_xpm                     , NULL, NULL, "mail_attach", NULL, NULL},
+    {mail_compose_xpm                    , NULL, NULL, "mail_compose", NULL, NULL},
+    {mail_forward_xpm                    , NULL, NULL, "mail_forward", NULL, NULL},
+    {mail_receive_xpm                    , NULL, NULL, "mail_receive", NULL, NULL},
+    {mail_receive_all_xpm                , NULL, NULL, "mail_receive_all", NULL, NULL},
+    {mail_reply_xpm                      , NULL, NULL, "mail_reply", NULL, NULL},
+    {mail_reply_to_all_xpm               , NULL, NULL, "mail_reply_to_all", NULL, NULL},
+    {mail_reply_to_author_xpm            , NULL, NULL, "mail_reply_to_author", NULL, NULL},
+    {mail_reply_to_list_xpm              , NULL, NULL, "mail_reply_to_list", NULL, NULL},
+    {mail_send_xpm                       , NULL, NULL, "mail_send", NULL, NULL},
+    {mail_send_queue_xpm                 , NULL, NULL, "mail_send_queue", NULL, NULL},
+    {mail_sign_xpm                       , NULL, NULL, "mail_sign", NULL, NULL},
+    {open_mail_xpm                       , NULL, NULL, "open_mail", NULL, NULL},
+    {mark_xpm                            , NULL, NULL, "mark", NULL, NULL},
+    {new_xpm                             , NULL, NULL, "new", NULL, NULL},
+    {news_compose_xpm                 , NULL, NULL, "news_compose", NULL, NULL},
+    {outbox_close_xpm                 , NULL, NULL, "outbox_close", NULL, NULL},
+    {outbox_close_hrm_xpm             , NULL, NULL, "outbox_close_hrm", NULL, NULL},
+    {outbox_open_xpm                  , NULL, NULL, "outbox_open", NULL, NULL},
+    {outbox_open_hrm_xpm              , NULL, NULL, "outbox_open_hrm", NULL, NULL},
+    {outbox_close_mark_xpm            , NULL, NULL, "outbox_close_mark", NULL, NULL},
+    {outbox_close_hrm_mark_xpm        , NULL, NULL, "outbox_close_hrm_mark", NULL, NULL},
+    {outbox_open_mark_xpm             , NULL, NULL, "outbox_open_mark", NULL, NULL},
+    {outbox_open_hrm_mark_xpm         , NULL, NULL, "outbox_open_hrm_mark", NULL, NULL},
+    {replied_xpm                      , NULL, NULL, "replied", NULL, NULL},
+    {replied_and_forwarded_xpm        , NULL, NULL, "replied_and_forwarded", NULL, NULL},
+    {paste_xpm                        , NULL, NULL, "paste", NULL, NULL},
+    {preferences_xpm                  , NULL, NULL, "preferences", NULL, NULL},
+    {properties_xpm                   , NULL, NULL, "properties", NULL, NULL},
+    {queue_close_xpm                  , NULL, NULL, "queue_close", NULL, NULL},
+    {queue_close_hrm_xpm              , NULL, NULL, "queue_close_hrm", NULL, NULL},
+    {queue_open_xpm                   , NULL, NULL, "queue_open", NULL, NULL},
+    {queue_open_hrm_xpm               , NULL, NULL, "queue_open_hrm", NULL, NULL},
+    {trash_open_xpm                   , NULL, NULL, "trash_open", NULL, NULL},
+    {trash_open_hrm_xpm               , NULL, NULL, "trash_open_hrm", NULL, NULL},
+    {trash_close_xpm                  , NULL, NULL, "trash_close", NULL, NULL},
+    {trash_close_hrm_xpm              , NULL, NULL, "trash_close_hrm", NULL, NULL},
+    {queue_close_mark_xpm             , NULL, NULL, "queue_close_mark", NULL, NULL},
+    {queue_close_hrm_mark_xpm         , NULL, NULL, "queue_close_hrm_mark", NULL, NULL},
+    {queue_open_mark_xpm              , NULL, NULL, "queue_open_mark", NULL, NULL},
+    {queue_open_hrm_mark_xpm          , NULL, NULL, "queue_open_hrm_mark", NULL, NULL},
+    {trash_open_mark_xpm              , NULL, NULL, "trash_open_mark", NULL, NULL},
+    {trash_open_hrm_mark_xpm          , NULL, NULL, "trash_open_hrm_mark", NULL, NULL},
+    {trash_close_mark_xpm             , NULL, NULL, "trash_close_mark", NULL, NULL},
+    {trash_close_hrm_mark_xpm         , NULL, NULL, "trash_close_hrm_mark", NULL, NULL},
+    {unread_xpm                       , NULL, NULL, "unread", NULL, NULL},
+    {vcard_xpm                        , NULL, NULL, "vcard", NULL, NULL},
+    {online_xpm                       , NULL, NULL, "online", NULL, NULL},
+    {offline_xpm                      , NULL, NULL, "offline", NULL, NULL},
+    {notice_warn_xpm                  , NULL, NULL, "notice_warn",  NULL, NULL},
+    {notice_error_xpm                 , NULL, NULL, "notice_error",  NULL, NULL},
+    {notice_note_xpm                  , NULL, NULL, "notice_note",  NULL, NULL},
+    {quicksearch_xpm                  , NULL, NULL, "quicksearch",  NULL, NULL},
+    {gpg_signed_xpm                   , NULL, NULL, "gpg_signed", NULL, NULL},
+    {go_folders_xpm                   , NULL, NULL, "go_folders", NULL, NULL},
+    {drafts_close_xpm                 , NULL, NULL, "drafts_close", NULL, NULL},
+    {drafts_open_xpm                  , NULL, NULL, "drafts_open", NULL, NULL},
+    {drafts_close_mark_xpm            , NULL, NULL, "drafts_close_mark", NULL, NULL},
+    {drafts_open_mark_xpm             , NULL, NULL, "drafts_open_mark", NULL, NULL},
+    {mime_text_plain_xpm              , NULL, NULL, "mime_text_plain", NULL, NULL},
+    {mime_text_html_xpm               , NULL, NULL, "mime_text_html", NULL, NULL},
+    {mime_text_patch_xpm              , NULL, NULL, "mime_text_patch", NULL, NULL},
+    {mime_application_xpm             , NULL, NULL, "mime_application", NULL, NULL},
+    {mime_image_xpm                   , NULL, NULL, "mime_image", NULL, NULL},
+    {mime_audio_xpm                   , NULL, NULL, "mime_audio", NULL, NULL},
+    {mime_text_enriched_xpm           , NULL, NULL, "mime_text_enriched", NULL, NULL},
+    {mime_unknown_xpm                 , NULL, NULL, "mime_unknown", NULL, NULL},    
+    {mime_pdf_xpm                     , NULL, NULL, "mime_pdf", NULL, NULL},    
+    {mime_ps_xpm                      , NULL, NULL, "mime_ps", NULL, NULL},    
+    {mime_calendar_xpm                , NULL, NULL, "mime_calendar", NULL, NULL},    
+    {mime_pgpsig_xpm                  , NULL, NULL, "mime_pgpsig", NULL, NULL},    
+    {printer_xpm                      , NULL, NULL, "printer", NULL, NULL},
+    {privacy_signed_xpm               , NULL, NULL, "privacy_signed", NULL, NULL},
+    {privacy_passed_xpm               , NULL, NULL, "privacy_passed", NULL, NULL},
+    {privacy_failed_xpm               , NULL, NULL, "privacy_failed", NULL, NULL},    
+    {privacy_unknown_xpm              , NULL, NULL, "privacy_unknown", NULL, NULL},
+    {privacy_expired_xpm              , NULL, NULL, "privacy_expired", NULL, NULL},
+    {privacy_warn_xpm                 , NULL, NULL, "privacy_warn", NULL, NULL},
+    {privacy_emblem_encrypted_xpm     , NULL, NULL, "privacy_emblem_encrypted", NULL, NULL},
+    {privacy_emblem_signed_xpm        , NULL, NULL, "privacy_emblem_signed", NULL, NULL},
+    {privacy_emblem_passed_xpm        , NULL, NULL, "privacy_emblem_passed", NULL, NULL},
+    {privacy_emblem_failed_xpm        , NULL, NULL, "privacy_emblem_failed", NULL, NULL},    
+    {privacy_emblem_warn_xpm          , NULL, NULL, "privacy_emblem_warn", NULL, NULL},
+    {mime_message_xpm                 , NULL, NULL, "mime_message", NULL, NULL},
+    {claws_mail_icon_xpm              , NULL, NULL, "claws_mail_icon", NULL, NULL},
+    {claws_mail_icon_64_xpm           , NULL, NULL, "claws_mail_icon_64", NULL, NULL},
+    {read_xpm                         , NULL, NULL, "read", NULL, NULL},
+    {delete_btn_xpm                   , NULL, NULL, "delete_btn", NULL, NULL},
+    {cancel_xpm                       , NULL, NULL, "cancel", NULL, NULL},
+    {trash_btn_xpm                    , NULL, NULL, "trash_btn", NULL, NULL},
+    {claws_mail_compose_logo_xpm      , NULL, NULL, "claws_mail_compose_logo", NULL, NULL},
 #ifndef GENERIC_UMPC
-       {claws_mail_logo_xpm                    , NULL, NULL, "claws_mail_logo", NULL},
+    {claws_mail_logo_xpm              , NULL, NULL, "claws_mail_logo", NULL, NULL},
 #else
-       {claws_mail_logo_small_xpm              , NULL, NULL, "claws_mail_logo_small", NULL},
+    {claws_mail_logo_small_xpm        , NULL, NULL, "claws_mail_logo_small", NULL, NULL},
 #endif
-        {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL},
-        {spam_xpm                               , NULL, NULL, "spam" , NULL},
-        {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
-        {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
-       {moved_xpm                              , NULL, NULL, "moved", NULL},
-       {copied_xpm                             , NULL, NULL, "copied", NULL},
-       {selection_xpm                          , NULL, NULL, "selection", NULL},
-       {watchthread_xpm                        , NULL, NULL, "watchthread", NULL},
-       {tray_newmail_offline_xpm               , NULL, NULL, "tray_newmail.offline", NULL},
-       {tray_newmail_xpm                       , NULL, NULL, "tray_newmail", NULL},
-       {tray_newmarkedmail_offline_xpm         , NULL, NULL, "tray_newmarkedmail.offline", NULL},
-       {tray_newmarkedmail_xpm                 , NULL, NULL, "tray_newmarkedmail", NULL},
-       {tray_nomail_offline_xpm                , NULL, NULL, "tray_nomail.offline", NULL},
-       {tray_nomail_xpm                        , NULL, NULL, "tray_nomail", NULL},
-       {tray_unreadmail_offline_xpm            , NULL, NULL, "tray_unreadmail.offline", NULL},
-       {tray_unreadmail_xpm                    , NULL, NULL, "tray_unreadmail", NULL},
-       {tray_unreadmarkedmail_offline_xpm      , NULL, NULL, "tray_unreadmarkedmail.offline", NULL},
-       {tray_unreadmarkedmail_xpm              , NULL, NULL, "tray_unreadmarkedmail", NULL},
-        {empty_xpm                              , NULL, NULL, "empty" , NULL}
+    {dir_noselect_close_xpm           , NULL, NULL, "dir_noselect_close", NULL, NULL},
+    {dir_noselect_close_mark_xpm      , NULL, NULL, "dir_noselect_close_mark", NULL, NULL},
+    {dir_noselect_open_xpm            , NULL, NULL, "dir_noselect_open", NULL, NULL},
+    {dir_subs_close_mark_xpm          , NULL, NULL, "dir_subs_close_mark", NULL, NULL},
+    {dir_subs_close_xpm               , NULL, NULL, "dir_subs_close", NULL, NULL},
+    {dir_subs_open_xpm                , NULL, NULL, "dir_subs_open", NULL, NULL},
+    {spam_xpm                         , NULL, NULL, "spam", NULL, NULL},
+    {spam_btn_xpm                     , NULL, NULL, "spam_btn", NULL, NULL},
+    {ham_btn_xpm                      , NULL, NULL, "ham_btn", NULL, NULL},
+    {moved_xpm                        , NULL, NULL, "moved", NULL, NULL},
+    {copied_xpm                       , NULL, NULL, "copied", NULL, NULL},
+    {selection_xpm                    , NULL, NULL, "selection", NULL, NULL},
+    {watchthread_xpm                  , NULL, NULL, "watchthread", NULL, NULL},
+    {tray_newmail_offline_xpm         , NULL, NULL, "tray_newmail_offline", NULL, NULL},
+    {tray_newmail_xpm                 , NULL, NULL, "tray_newmail", NULL, NULL},
+    {tray_newmarkedmail_offline_xpm   , NULL, NULL, "tray_newmarkedmail_offline", NULL, NULL},
+    {tray_newmarkedmail_xpm           , NULL, NULL, "tray_newmarkedmail", NULL, NULL},
+    {tray_nomail_offline_xpm          , NULL, NULL, "tray_nomail_offline", NULL, NULL},
+    {tray_nomail_xpm                  , NULL, NULL, "tray_nomail", NULL, NULL},
+    {tray_unreadmail_offline_xpm      , NULL, NULL, "tray_unreadmail_offline", NULL, NULL},
+    {tray_unreadmail_xpm              , NULL, NULL, "tray_unreadmail", NULL, NULL},
+    {tray_unreadmarkedmail_offline_xpm, NULL, NULL, "tray_unreadmarkedmail_offline", NULL, NULL},
+    {tray_unreadmarkedmail_xpm        , NULL, NULL, "tray_unreadmarkedmail", NULL, NULL},
+    {doc_index_xpm                    , NULL, NULL, "doc_index", NULL, NULL,},
+    {doc_index_close_xpm              , NULL, NULL, "doc_index_close", NULL, NULL,},
+    {doc_info_xpm                     , NULL, NULL, "doc_info", NULL, NULL,},
+    {first_arrow_xpm                  , NULL, NULL, "first_arrow", NULL, NULL},
+    {last_arrow_xpm                   , NULL, NULL, "last_arrow", NULL, NULL},
+    {left_arrow_xpm                   , NULL, NULL, "left_arrow", NULL, NULL},
+    {right_arrow_xpm                  , NULL, NULL, "right_arrow", NULL, NULL},
+    {rotate_left_xpm                  , NULL, NULL, "rotate_left", NULL, NULL},
+    {rotate_right_xpm                 , NULL, NULL, "rotate_right", NULL, NULL},
+    {zoom_fit_xpm                     , NULL, NULL, "zoom_fit", NULL, NULL},
+    {zoom_in_xpm                      , NULL, NULL, "zoom_in", NULL, NULL},
+    {zoom_out_xpm                     , NULL, NULL, "zoom_out", NULL, NULL},
+    {zoom_width_xpm                   , NULL, NULL, "zoom_width", NULL, NULL},
+    {empty_xpm                        , NULL, NULL, "empty", NULL, NULL}
 };
 
 /* 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;
@@ -410,7 +455,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};
@@ -486,20 +531,20 @@ try_next_extension:
 
 static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 {
-       struct dirent *d;
-       DIR *dp;
+       const gchar *entry;
+       gchar *fullentry;
+       GDir *dp;
+       GError *error = NULL;
        static const char *extension[]={".png", ".xpm", NULL};
        
-       if ((dp = opendir(dirname)) == NULL) {
-               debug_print("dir %s not found, skipping theme scan", dirname?dirname:"(null)");
+       if ((dp = g_dir_open(dirname, 0, &error)) == NULL) {
+               debug_print("skipping theme scan, dir %s could not be opened: %s (%d)\n",
+                               dirname ? dirname : "(null)", error->message, error->code);
+               g_error_free(error);
                return;
        }
        
-       while ((d = readdir(dp)) != NULL) {
-               gchar *entry;
-               gchar *fullentry;
-
-               entry     = d->d_name;
+       while ((entry = g_dir_read_name(dp)) != NULL) {
                fullentry = g_strconcat(dirname, G_DIR_SEPARATOR_S, entry, NULL);
                
                if (strcmp(entry, ".") != 0 && strcmp(entry, "..") != 0 && is_dir_exist(fullentry)) {
@@ -522,7 +567,7 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
                } else 
                        g_free(fullentry);
        }
-       closedir(dp);
+       g_dir_close(dp);
 }
 
 gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme)
@@ -534,7 +579,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
 }
 
@@ -751,7 +796,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)
 {
@@ -764,12 +809,14 @@ 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)
        if (gtk_image_get_storage_type(GTK_IMAGE(stock_wid)) == GTK_IMAGE_PIXMAP)
                data->is_pixmap = TRUE;
        else
+#endif
                data->is_pixmap = FALSE;
 
        if (data->is_pixmap) {
@@ -785,7 +832,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);
@@ -807,7 +854,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;