52 files changed, 56 insertions, 48 deletions

diff --git a/ChangeLog b/ChangeLog
index 52f1a147..dd0d9a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-19
+
+	* src/pixmaps/: renamed to src/icons/.
+
 2005-08-18
 
 	* configure.in: made $localedir, $manualdir, and $faqdir
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e1aed7ab..e530ecd9 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,7 @@
+2005-08-19
+
+	* src/pixmaps/: src/icons/ に名称変更。
+
 2005-08-18
 
 	* configure.in: $localedir, $manualdir, $faqdir をユーザ指定可能に
diff --git a/configure.in b/configure.in
index e837b40f..d0e0b788 100644
--- a/configure.in
+++ b/configure.in
@@ -345,7 +345,7 @@ ac/Makefile
 po/Makefile.in
 src/version.h
 src/Makefile
-src/pixmaps/Makefile
+src/icons/Makefile
 faq/Makefile
 faq/de/Makefile
 faq/en/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 4be20848..805f559a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = pixmaps
+SUBDIRS = icons
 
 bin_PROGRAMS = sylpheed
 
diff --git a/src/pixmaps/Makefile.am b/src/icons/Makefile.am
index 3a4cca6c..3a4cca6c 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/icons/Makefile.am
diff --git a/src/pixmaps/address.xpm b/src/icons/address.xpm
index 4105fb46..4105fb46 100644
--- a/src/pixmaps/address.xpm
+++ b/src/icons/address.xpm
diff --git a/src/pixmaps/book.xpm b/src/icons/book.xpm
index 5bd96517..5bd96517 100644
--- a/src/pixmaps/book.xpm
+++ b/src/icons/book.xpm
diff --git a/src/pixmaps/category.xpm b/src/icons/category.xpm
index fd16880f..fd16880f 100644
--- a/src/pixmaps/category.xpm
+++ b/src/icons/category.xpm
diff --git a/src/pixmaps/clip.xpm b/src/icons/clip.xpm
index 2a72c5c2..2a72c5c2 100644
--- a/src/pixmaps/clip.xpm
+++ b/src/icons/clip.xpm
diff --git a/src/pixmaps/complete.xpm b/src/icons/complete.xpm
index 69a9ad47..69a9ad47 100644
--- a/src/pixmaps/complete.xpm
+++ b/src/icons/complete.xpm
diff --git a/src/pixmaps/continue.xpm b/src/icons/continue.xpm
index 99b3c7f9..99b3c7f9 100644
--- a/src/pixmaps/continue.xpm
+++ b/src/icons/continue.xpm
diff --git a/src/pixmaps/deleted.xpm b/src/icons/deleted.xpm
index 988364b8..988364b8 100644
--- a/src/pixmaps/deleted.xpm
+++ b/src/icons/deleted.xpm
diff --git a/src/pixmaps/dir-close.xpm b/src/icons/dir-close.xpm
index 092ee8c1..092ee8c1 100644
--- a/src/pixmaps/dir-close.xpm
+++ b/src/icons/dir-close.xpm
diff --git a/src/pixmaps/dir-noselect.xpm b/src/icons/dir-noselect.xpm
index e4685075..e4685075 100644
--- a/src/pixmaps/dir-noselect.xpm
+++ b/src/icons/dir-noselect.xpm
diff --git a/src/pixmaps/dir-open.xpm b/src/icons/dir-open.xpm
index 2312616d..2312616d 100644
--- a/src/pixmaps/dir-open.xpm
+++ b/src/icons/dir-open.xpm
diff --git a/src/pixmaps/error.xpm b/src/icons/error.xpm
index e70ac53e..e70ac53e 100644
--- a/src/pixmaps/error.xpm
+++ b/src/icons/error.xpm
diff --git a/src/pixmaps/forwarded.xpm b/src/icons/forwarded.xpm
index a3cabada..a3cabada 100644
--- a/src/pixmaps/forwarded.xpm
+++ b/src/icons/forwarded.xpm
diff --git a/src/pixmaps/group.xpm b/src/icons/group.xpm
index 0735a3cc..0735a3cc 100644
--- a/src/pixmaps/group.xpm
+++ b/src/icons/group.xpm
diff --git a/src/pixmaps/interface.xpm b/src/icons/interface.xpm
index 8a4158ec..8a4158ec 100644
--- a/src/pixmaps/interface.xpm
+++ b/src/icons/interface.xpm
diff --git a/src/pixmaps/jpilot.xpm b/src/icons/jpilot.xpm
index b72225cf..b72225cf 100644
--- a/src/pixmaps/jpilot.xpm
+++ b/src/icons/jpilot.xpm
diff --git a/src/pixmaps/ldap.xpm b/src/icons/ldap.xpm
index c1e61e44..c1e61e44 100644
--- a/src/pixmaps/ldap.xpm
+++ b/src/icons/ldap.xpm
diff --git a/src/pixmaps/linewrap.xpm b/src/icons/linewrap.xpm
index bce4af2b..bce4af2b 100644
--- a/src/pixmaps/linewrap.xpm
+++ b/src/icons/linewrap.xpm
diff --git a/src/pixmaps/mail.xpm b/src/icons/mail.xpm
index bf4766c0..bf4766c0 100644
--- a/src/pixmaps/mail.xpm
+++ b/src/icons/mail.xpm
diff --git a/src/pixmaps/mark.xpm b/src/icons/mark.xpm
index de17d9c9..de17d9c9 100644
--- a/src/pixmaps/mark.xpm
+++ b/src/icons/mark.xpm
diff --git a/src/pixmaps/new.xpm b/src/icons/new.xpm
index 74992613..74992613 100644
--- a/src/pixmaps/new.xpm
+++ b/src/icons/new.xpm
diff --git a/src/pixmaps/offline.xpm b/src/icons/offline.xpm
index baa36a49..baa36a49 100644
--- a/src/pixmaps/offline.xpm
+++ b/src/icons/offline.xpm
diff --git a/src/pixmaps/online.xpm b/src/icons/online.xpm
index ed508651..ed508651 100644
--- a/src/pixmaps/online.xpm
+++ b/src/icons/online.xpm
diff --git a/src/pixmaps/replied.xpm b/src/icons/replied.xpm
index e16ab028..e16ab028 100644
--- a/src/pixmaps/replied.xpm
+++ b/src/icons/replied.xpm
diff --git a/src/pixmaps/stock_addressbook.png b/src/icons/stock_addressbook.png
index e3d953af..e3d953af 100644
--- a/src/pixmaps/stock_addressbook.png
+++ b/src/icons/stock_addressbook.png
diff --git a/src/pixmaps/stock_attach.png b/src/icons/stock_attach.png
index 4e064b35..4e064b35 100644
--- a/src/pixmaps/stock_attach.png
+++ b/src/icons/stock_attach.png
diff --git a/src/pixmaps/stock_delete.png b/src/icons/stock_delete.png
index 6b638c59..6b638c59 100644
--- a/src/pixmaps/stock_delete.png
+++ b/src/icons/stock_delete.png
diff --git a/src/pixmaps/stock_delete_16.png b/src/icons/stock_delete_16.png
index af10be03..af10be03 100644
--- a/src/pixmaps/stock_delete_16.png
+++ b/src/icons/stock_delete_16.png
diff --git a/src/pixmaps/stock_hand-signed.png b/src/icons/stock_hand-signed.png
index 02774f24..02774f24 100644
--- a/src/pixmaps/stock_hand-signed.png
+++ b/src/icons/stock_hand-signed.png
diff --git a/src/pixmaps/stock_inbox.png b/src/icons/stock_inbox.png
index 3afaeb6d..3afaeb6d 100644
--- a/src/pixmaps/stock_inbox.png
+++ b/src/icons/stock_inbox.png
diff --git a/src/pixmaps/stock_insert-file.png b/src/icons/stock_insert-file.png
index 34aed99d..34aed99d 100644
--- a/src/pixmaps/stock_insert-file.png
+++ b/src/icons/stock_insert-file.png
diff --git a/src/pixmaps/stock_mail-compose.png b/src/icons/stock_mail-compose.png
index b0d4e136..b0d4e136 100644
--- a/src/pixmaps/stock_mail-compose.png
+++ b/src/icons/stock_mail-compose.png
diff --git a/src/pixmaps/stock_mail-compose_16.png b/src/icons/stock_mail-compose_16.png
index 7c7d597d..7c7d597d 100644
--- a/src/pixmaps/stock_mail-compose_16.png
+++ b/src/icons/stock_mail-compose_16.png
diff --git a/src/pixmaps/stock_mail-forward.png b/src/icons/stock_mail-forward.png
index f848a60f..f848a60f 100644
--- a/src/pixmaps/stock_mail-forward.png
+++ b/src/icons/stock_mail-forward.png
diff --git a/src/pixmaps/stock_mail-receive.png b/src/icons/stock_mail-receive.png
index 20580e03..20580e03 100644
--- a/src/pixmaps/stock_mail-receive.png
+++ b/src/icons/stock_mail-receive.png
diff --git a/src/pixmaps/stock_mail-reply-to-all.png b/src/icons/stock_mail-reply-to-all.png
index e2685771..e2685771 100644
--- a/src/pixmaps/stock_mail-reply-to-all.png
+++ b/src/icons/stock_mail-reply-to-all.png
diff --git a/src/pixmaps/stock_mail-reply.png b/src/icons/stock_mail-reply.png
index 47eecc61..47eecc61 100644
--- a/src/pixmaps/stock_mail-reply.png
+++ b/src/icons/stock_mail-reply.png
diff --git a/src/pixmaps/stock_mail-send.png b/src/icons/stock_mail-send.png
index e1fa1519..e1fa1519 100644
--- a/src/pixmaps/stock_mail-send.png
+++ b/src/icons/stock_mail-send.png
diff --git a/src/pixmaps/stock_mail.png b/src/icons/stock_mail.png
index 5f8922e1..5f8922e1 100644
--- a/src/pixmaps/stock_mail.png
+++ b/src/icons/stock_mail.png
diff --git a/src/pixmaps/stock_mail_receive_all.png b/src/icons/stock_mail_receive_all.png
index 0004bf23..0004bf23 100644
--- a/src/pixmaps/stock_mail_receive_all.png
+++ b/src/icons/stock_mail_receive_all.png
diff --git a/src/pixmaps/stock_mail_send_queue.png b/src/icons/stock_mail_send_queue.png
index 8754c5d8..8754c5d8 100644
--- a/src/pixmaps/stock_mail_send_queue.png
+++ b/src/icons/stock_mail_send_queue.png
diff --git a/src/pixmaps/stock_outbox.png b/src/icons/stock_outbox.png
index 0455a35c..0455a35c 100644
--- a/src/pixmaps/stock_outbox.png
+++ b/src/icons/stock_outbox.png
diff --git a/src/pixmaps/stock_spam.png b/src/icons/stock_spam.png
index 52364ab2..52364ab2 100644
--- a/src/pixmaps/stock_spam.png
+++ b/src/icons/stock_spam.png
diff --git a/src/pixmaps/stock_sylpheed.png b/src/icons/stock_sylpheed.png
index e70a0e3f..e70a0e3f 100644
--- a/src/pixmaps/stock_sylpheed.png
+++ b/src/icons/stock_sylpheed.png
diff --git a/src/pixmaps/sylpheed-logo.png b/src/icons/sylpheed-logo.png
index 1423da50..1423da50 100644
--- a/src/pixmaps/sylpheed-logo.png
+++ b/src/icons/sylpheed-logo.png
diff --git a/src/pixmaps/unread.xpm b/src/icons/unread.xpm
index b3c31e4f..b3c31e4f 100644
--- a/src/pixmaps/unread.xpm
+++ b/src/icons/unread.xpm
diff --git a/src/pixmaps/vcard.xpm b/src/icons/vcard.xpm
index 7b1aeec4..7b1aeec4 100644
--- a/src/pixmaps/vcard.xpm
+++ b/src/icons/vcard.xpm
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 486d6723..7f53ff3d 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -26,52 +26,52 @@
 #include "stock_pixmap.h"
 #include "gtkutils.h"
 
-#include "pixmaps/address.xpm"
-#include "pixmaps/book.xpm"
-#include "pixmaps/category.xpm"
-#include "pixmaps/clip.xpm"
-#include "pixmaps/complete.xpm"
-#include "pixmaps/continue.xpm"
-#include "pixmaps/deleted.xpm"
-#include "pixmaps/dir-close.xpm"
-#include "pixmaps/dir-open.xpm"
-#include "pixmaps/dir-noselect.xpm"
-#include "pixmaps/error.xpm"
-#include "pixmaps/forwarded.xpm"
-#include "pixmaps/group.xpm"
-#include "pixmaps/interface.xpm"
-#include "pixmaps/jpilot.xpm"
-#include "pixmaps/ldap.xpm"
-#include "pixmaps/linewrap.xpm"
-#include "pixmaps/mark.xpm"
-#include "pixmaps/new.xpm"
-#include "pixmaps/replied.xpm"
-#include "pixmaps/unread.xpm"
-#include "pixmaps/vcard.xpm"
-#include "pixmaps/online.xpm"
-#include "pixmaps/offline.xpm"
-#include "pixmaps/mail.xpm"
-#include "pixmaps/stock_inbox.h"
-#include "pixmaps/stock_outbox.h"
-#include "pixmaps/stock_mail.h"
-#include "pixmaps/stock_attach.h"
-#include "pixmaps/stock_mail-compose.h"
-#include "pixmaps/stock_mail-compose_16.h"
-#include "pixmaps/stock_mail-forward.h"
-#include "pixmaps/stock_mail-receive.h"
-#include "pixmaps/stock_mail_receive_all.h"
-#include "pixmaps/stock_mail-reply.h"
-#include "pixmaps/stock_mail-reply-to-all.h"
-#include "pixmaps/stock_mail-send.h"
-#include "pixmaps/stock_mail_send_queue.h"
-#include "pixmaps/stock_insert-file.h"
-#include "pixmaps/stock_addressbook.h"
-#include "pixmaps/stock_delete.h"
-#include "pixmaps/stock_delete_16.h"
-#include "pixmaps/stock_spam.h"
-#include "pixmaps/stock_hand-signed.h"
-#include "pixmaps/stock_sylpheed.h"
-#include "pixmaps/sylpheed-logo.h"
+#include "icons/address.xpm"
+#include "icons/book.xpm"
+#include "icons/category.xpm"
+#include "icons/clip.xpm"
+#include "icons/complete.xpm"
+#include "icons/continue.xpm"
+#include "icons/deleted.xpm"
+#include "icons/dir-close.xpm"
+#include "icons/dir-open.xpm"
+#include "icons/dir-noselect.xpm"
+#include "icons/error.xpm"
+#include "icons/forwarded.xpm"
+#include "icons/group.xpm"
+#include "icons/interface.xpm"
+#include "icons/jpilot.xpm"
+#include "icons/ldap.xpm"
+#include "icons/linewrap.xpm"
+#include "icons/mark.xpm"
+#include "icons/new.xpm"
+#include "icons/replied.xpm"
+#include "icons/unread.xpm"
+#include "icons/vcard.xpm"
+#include "icons/online.xpm"
+#include "icons/offline.xpm"
+#include "icons/mail.xpm"
+#include "icons/stock_inbox.h"
+#include "icons/stock_outbox.h"
+#include "icons/stock_mail.h"
+#include "icons/stock_attach.h"
+#include "icons/stock_mail-compose.h"
+#include "icons/stock_mail-compose_16.h"
+#include "icons/stock_mail-forward.h"
+#include "icons/stock_mail-receive.h"
+#include "icons/stock_mail_receive_all.h"
+#include "icons/stock_mail-reply.h"
+#include "icons/stock_mail-reply-to-all.h"
+#include "icons/stock_mail-send.h"
+#include "icons/stock_mail_send_queue.h"
+#include "icons/stock_insert-file.h"
+#include "icons/stock_addressbook.h"
+#include "icons/stock_delete.h"
+#include "icons/stock_delete_16.h"
+#include "icons/stock_spam.h"
+#include "icons/stock_hand-signed.h"
+#include "icons/stock_sylpheed.h"
+#include "icons/sylpheed-logo.h"
 
 typedef struct _StockPixmapData	StockPixmapData;