removed unused images.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@403 ee746299-78ed-0310-b773-934348b2243d

8 files changed, 68 insertions, 303 deletions

diff --git a/ChangeLog b/ChangeLog
index 50781160..1cd33234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-07-06
 
+	* src/stock_pixmap.[ch]
+	  src/pixmaps/*.xpm: removed unused images.
+
+2005-07-06
+
 	* src/pixmaps/stock_hand-signed.png: added.
 	* src/compose.c: use new icon for Signature tool button.
 
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 24271ac4..0ef837a1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-07-06
 
+	* src/stock_pixmap.[ch]
+	  src/pixmaps/*.xpm: 未使用の画像を削除。
+
+2005-07-06
+
 	* src/pixmaps/stock_hand-signed.png: 追加。
 	* src/compose.c: 署名ツールボタンに新しいアイコンを使用。
 
diff --git a/src/mainwindow.c b/src/mainwindow.c
index c11cc574..eb54d8c1 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -2328,7 +2328,8 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 #if 0
 	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
 
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_PREFERENCES);
+	icon_wid = gtk_image_new_from_stock(GTK_STOCK_PREFERENCES,
+					    GTK_ICON_SIZE_LARGE_TOOLBAR);
 	prefs_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					    _("Prefs"),
 					    _("Common preferences"),
@@ -2336,7 +2337,8 @@ static void main_window_toolbar_create(MainWindow *mainwin,
 					    icon_wid,
 					    G_CALLBACK(toolbar_prefs_cb),
 					    mainwin);
-	icon_wid = stock_pixbuf_widget(container, STOCK_PIXMAP_PROPERTIES);
+	icon_wid = gtk_image_new_from_stock(GTK_STOCK_PROPERTIES,
+					    GTK_ICON_SIZE_LARGE_TOOLBAR);
 	account_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
 					      _("Account"),
 					      _("Account setting"),
diff --git a/src/pixmaps/stock_close.xpm b/src/pixmaps/stock_close.xpm
deleted file mode 100644
index 88c28568..00000000
--- a/src/pixmaps/stock_close.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * stock_close_xpm[] = {
-"24 24 2 1",
-" 	c None",
-".	c #000000",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"       .    ..          ",
-"       ..  ....         ",
-"        .. ...          ",
-"        .....           ",
-"         ...            ",
-"         ....           ",
-"        ......          ",
-"        .. ....         ",
-"       ..   ....        ",
-"       .     ..         ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/src/pixmaps/stock_down_arrow.xpm b/src/pixmaps/stock_down_arrow.xpm
deleted file mode 100644
index e6adb7db..00000000
--- a/src/pixmaps/stock_down_arrow.xpm
+++ /dev/null
@@ -1,100 +0,0 @@
-/* XPM */
-static char * stock_down_arrow_xpm[] = {
-"24 24 73 1",
-" 	c None",
-".	c #000000",
-"+	c #607C53",
-"@	c #688559",
-"#	c #729063",
-"$	c #739364",
-"%	c #739264",
-"&	c #BEC2BB",
-"*	c #BEC2BA",
-"=	c #BFC3BB",
-"-	c #BDC1B8",
-";	c #BBBFB7",
-">	c #B9BEB5",
-",	c #718E62",
-"'	c #89A67C",
-")	c #8BAB7E",
-"!	c #90AE83",
-"~	c #8FAE81",
-"{	c #E7E7E7",
-"]	c #EAE9E9",
-"^	c #ECEBEB",
-"/	c #E5E4E3",
-"(	c #D9D9D7",
-"_	c #69875B",
-":	c #8AA67F",
-"<	c #8DAD7F",
-"[	c #8AAC7A",
-"}	c #8AAD7A",
-"|	c #F4F0F4",
-"1	c #F5F1F5",
-"2	c #F2EFF2",
-"3	c #EFECEF",
-"4	c #E2E1E1",
-"5	c #7A956D",
-"6	c #8EAA81",
-"7	c #8BAD7B",
-"8	c #8BAE7B",
-"9	c #F6F2F6",
-"0	c #F1EDF0",
-"a	c #ECEAEB",
-"b	c #859F76",
-"c	c #90AE81",
-"d	c #91B182",
-"e	c #F3EFF2",
-"f	c #EFECEE",
-"g	c #E4E3E3",
-"h	c #759267",
-"i	c #92AE85",
-"j	c #95B487",
-"k	c #F3EFF3",
-"l	c #F0EEF0",
-"m	c #EBEAEA",
-"n	c #010101",
-"o	c #678458",
-"p	c #91AA85",
-"q	c #99B48C",
-"r	c #F0ECF0",
-"s	c #EEECEE",
-"t	c #E3E2E2",
-"u	c #8CA480",
-"v	c #9DB591",
-"w	c #EAE9EA",
-"x	c #E9E8E8",
-"y	c #030303",
-"z	c #6A875B",
-"A	c #97B08D",
-"B	c #E2E0E0",
-"C	c #92AB87",
-"D	c #DCDDDA",
-"E	c #060606",
-"F	c #94A989",
-"G	c #D6D9D5",
-"H	c #1D1D1D",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"     ..............     ",
-"     .+@#$%%&*=-;>.     ",
-"      .,')!~{]^/(.      ",
-"      ._:<[}|1234.      ",
-"       .56789|0a.       ",
-"       .@bcd9efg.       ",
-"        .hijklmn        ",
-"        .opqrst.        ",
-"         .uvwxy         ",
-"         .zAtB.         ",
-"          .CD.          ",
-"          EFGH          ",
-"           ..           ",
-"           ..           ",
-"                        ",
-"                        ",
-"                        ",
-"                        ",
-"                        "};
diff --git a/src/pixmaps/stock_exec.xpm b/src/pixmaps/stock_exec.xpm
deleted file mode 100644
index 777b17d6..00000000
--- a/src/pixmaps/stock_exec.xpm
+++ /dev/null
@@ -1,107 +0,0 @@
-/* XPM */
-static char * stock_exec_xpm[] = {
-"24 24 80 1",
-" 	c None",
-".	c #000000",
-"+	c #B2A97E",
-"@	c #B6AD81",
-"#	c #7A7356",
-"$	c #B0A77C",
-"%	c #B5AC80",
-"&	c #BAB184",
-"*	c #BBB284",
-"=	c #B6AD80",
-"-	c #ADA57B",
-";	c #B7AE81",
-">	c #BDB486",
-",	c #837C5C",
-"'	c #B4AC80",
-")	c #7C7557",
-"!	c #C0B687",
-"~	c #BEB586",
-"{	c #B1A87D",
-"]	c #B9B082",
-"^	c #C0B788",
-"/	c #AFA67B",
-"(	c #AFA77C",
-"_	c #BAB183",
-":	c #BBB285",
-"<	c #BCB385",
-"[	c #C4BB8B",
-"}	c #C6BC8C",
-"|	c #C7BD8D",
-"1	c #C7BE8D",
-"2	c #C8BF8E",
-"3	c #C8BE8D",
-"4	c #C5BC8B",
-"5	c #C1B788",
-"6	c #B9B083",
-"7	c #CDC391",
-"8	c #D0C693",
-"9	c #D1C794",
-"0	c #D3C995",
-"a	c #CDC491",
-"b	c #C2B889",
-"c	c #CAC18F",
-"d	c #D5CB97",
-"e	c #D6CC97",
-"f	c #D6CC98",
-"g	c #D7CD98",
-"h	c #CEC491",
-"i	c #C2B98A",
-"j	c #CBC18F",
-"k	c #C1B889",
-"l	c #8A8261",
-"m	c #D4CA96",
-"n	c #C0B787",
-"o	c #80785A",
-"p	c #B9B183",
-"q	c #827C5B",
-"r	c #CFC592",
-"s	c #C7BD8C",
-"t	c #C3BA8A",
-"u	c #CAC08F",
-"v	c #D0C793",
-"w	c #7C7657",
-"x	c #D2C894",
-"y	c #D2C995",
-"z	c #CCC290",
-"A	c #C4BA8A",
-"B	c #D1C793",
-"C	c #CEC592",
-"D	c #C5BC8C",
-"E	c #CFC693",
-"F	c #C1B888",
-"G	c #BEB486",
-"H	c #C8BF8D",
-"I	c #C9C08F",
-"J	c #C9BF8E",
-"K	c #C5BB8B",
-"L	c #B2A97D",
-"M	c #C2B989",
-"N	c #BFB687",
-"O	c #B3AA7E",
-"                        ",
-"                        ",
-"                        ",
-"      ....              ",
-"     .+.@#.             ",
-"    .$%&*=-.            ",
-"    ..;>,$..            ",
-"    .-')!~@.  ...       ",
-"    ..{]~^.. ./({. .    ",
-"     .#._#._..&:<..@.   ",
-"      . ..>[}|1232456.  ",
-"          .2789009a2.   ",
-"         .bc9defge0h..  ",
-"        .]ij9ekl1gm83n. ",
-"        .*ic9dopqgmrs~. ",
-"        .<tu8mvwuxyzA*. ",
-"         ..3ax0rBxC3..  ",
-"          .DuhE8rz3F.   ",
-"         .Gt}HIJ1K^*L.  ",
-"          .~..MbN..O.   ",
-"           . .*_;. .    ",
-"              ...       ",
-"                        ",
-"                        "};
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index f215a0ec..4d3e0c6e 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -46,9 +46,6 @@
 #include "pixmaps/mark.xpm"
 #include "pixmaps/new.xpm"
 #include "pixmaps/replied.xpm"
-#include "pixmaps/stock_close.xpm"
-#include "pixmaps/stock_down_arrow.xpm"
-#include "pixmaps/stock_exec.xpm"
 #include "pixmaps/stock_inbox.h"
 #include "pixmaps/stock_outbox.h"
 #include "pixmaps/stock_mail.h"
@@ -91,56 +88,52 @@ struct _StockPixmapData
 
 static StockPixmapData pixmaps[] =
 {
-	{address_xpm	, NULL, NULL},
-	{book_xpm	, NULL, NULL},
-	{category_xpm	, NULL, NULL},
-	{clip_xpm	, NULL, NULL},
-	{complete_xpm	, NULL, NULL},
-	{continue_xpm	, NULL, NULL},
-	{deleted_xpm	, NULL, NULL},
-	{dir_close_xpm	, NULL, NULL},
-	{dir_open_xpm	, NULL, NULL},
+	{address_xpm	 , NULL, NULL},
+	{book_xpm	 , NULL, NULL},
+	{category_xpm	 , NULL, NULL},
+	{clip_xpm	 , NULL, NULL},
+	{complete_xpm	 , NULL, NULL},
+	{continue_xpm	 , NULL, NULL},
+	{deleted_xpm	 , NULL, NULL},
+	{dir_close_xpm	 , NULL, NULL},
+	{dir_open_xpm	 , NULL, NULL},
 	{dir_noselect_xpm, NULL, NULL},
-	{error_xpm	, NULL, NULL},
-	{forwarded_xpm	, NULL, NULL},
-	{group_xpm	, NULL, NULL},
-	{NULL		, NULL, NULL, NULL, stock_inbox, sizeof(stock_inbox), "stock_inbox", 16},
-	{interface_xpm	, NULL, NULL},
-	{jpilot_xpm	, NULL, NULL},
-	{ldap_xpm	, NULL, NULL},
-	{linewrap_xpm	, NULL, NULL},
-	{mark_xpm	, NULL, NULL},
-	{new_xpm	, NULL, NULL},
-	{NULL		, NULL, NULL, NULL, stock_outbox, sizeof(stock_outbox), "stock_outbox", 16},
-	{replied_xpm	, NULL, NULL},
-	{stock_close_xpm, NULL, NULL},
-	{stock_down_arrow_xpm, NULL, NULL},
-	{stock_exec_xpm	, NULL, NULL},
-	{NULL		, NULL, NULL, NULL, stock_mail, sizeof(stock_mail), "stock_mail", 24},
-	{NULL		, NULL, NULL, NULL, stock_attach, sizeof(stock_attach), "stock_attach", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_compose, sizeof(stock_mail_compose), "stock_mail-compose", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_forward, sizeof(stock_mail_forward), "stock_mail-forward", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_receive, sizeof(stock_mail_receive), "stock_mail-receive", 24},
-	{NULL	, NULL, NULL, NULL, stock_mail_receive_all, sizeof(stock_mail_receive_all), NULL, 0},
-	{NULL		, NULL, NULL, NULL, stock_mail_reply, sizeof(stock_mail_reply), "stock_mail-reply", 24},
-	{NULL	, NULL, NULL, NULL, stock_mail_reply_to_all, sizeof(stock_mail_reply_to_all), "stock_mail-reply-to-all", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_send, sizeof(stock_mail_send), "stock_mail-send", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_send_queue, sizeof(stock_mail_send_queue), NULL, 0},
-	{NULL		, NULL, NULL, NULL, stock_insert_file, sizeof(stock_insert_file), "stock_insert-file", 24},
-	{NULL		, NULL, NULL, NULL, NULL, 0, GTK_STOCK_PREFERENCES, 24},
-	{NULL		, NULL, NULL, NULL, NULL, 0, GTK_STOCK_PROPERTIES, 24},
+	{error_xpm	 , NULL, NULL},
+	{forwarded_xpm	 , NULL, NULL},
+	{group_xpm	 , NULL, NULL},
+	{interface_xpm	 , NULL, NULL},
+	{jpilot_xpm	 , NULL, NULL},
+	{ldap_xpm	 , NULL, NULL},
+	{linewrap_xpm	 , NULL, NULL},
+	{mark_xpm	 , NULL, NULL},
+	{new_xpm	 , NULL, NULL},
+	{replied_xpm	 , NULL, NULL},
+	{unread_xpm	 , NULL, NULL},
+	{vcard_xpm	 , NULL, NULL},
+	{online_xpm	 , NULL, NULL},
+	{offline_xpm	 , NULL, NULL},
+	{mail_xpm	 , NULL, NULL},
+
+	{NULL, NULL, NULL, NULL, stock_inbox, sizeof(stock_inbox), "stock_inbox", 16},
+	{NULL, NULL, NULL, NULL, stock_outbox, sizeof(stock_outbox), "stock_outbox", 16},
+	{NULL, NULL, NULL, NULL, stock_mail_compose_16, sizeof(stock_mail_compose_16), "stock_mail-compose", 16},
+	{NULL, NULL, NULL, NULL, stock_delete_16, sizeof(stock_delete_16), GTK_STOCK_DELETE, 16},
+	{NULL, NULL, NULL, NULL, stock_mail, sizeof(stock_mail), "stock_mail", 24},
+	{NULL, NULL, NULL, NULL, stock_attach, sizeof(stock_attach), "stock_attach", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_compose, sizeof(stock_mail_compose), "stock_mail-compose", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_forward, sizeof(stock_mail_forward), "stock_mail-forward", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_receive, sizeof(stock_mail_receive), "stock_mail-receive", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_receive_all, sizeof(stock_mail_receive_all), NULL, 0},
+	{NULL, NULL, NULL, NULL, stock_mail_reply, sizeof(stock_mail_reply), "stock_mail-reply", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_reply_to_all, sizeof(stock_mail_reply_to_all), "stock_mail-reply-to-all", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_send, sizeof(stock_mail_send), "stock_mail-send", 24},
+	{NULL, NULL, NULL, NULL, stock_mail_send_queue, sizeof(stock_mail_send_queue), NULL, 0},
+	{NULL, NULL, NULL, NULL, stock_insert_file, sizeof(stock_insert_file), "stock_insert-file", 24},
 	{sylpheed_logo_xpm, NULL, NULL},
-	{NULL		, NULL, NULL, NULL, stock_addressbook, sizeof(stock_addressbook), "stock_addressbook", 24},
-	{NULL		, NULL, NULL, NULL, stock_mail_compose_16, sizeof(stock_mail_compose_16), "stock_mail-compose", 16},
-	{NULL		, NULL, NULL, NULL, stock_delete_16, sizeof(stock_delete_16), GTK_STOCK_DELETE, 16},
-	{unread_xpm	, NULL, NULL},
-	{vcard_xpm	, NULL, NULL},
-	{online_xpm	, NULL, NULL},
-	{offline_xpm	, NULL, NULL},
-	{mail_xpm	, NULL, NULL},
-	{NULL		, NULL, NULL, NULL, stock_delete, sizeof(stock_delete), GTK_STOCK_DELETE, 24},
-	{NULL		, NULL, NULL, NULL, stock_spam, sizeof(stock_spam), "stock_spam", 24},
-	{NULL		, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24}
+	{NULL, NULL, NULL, NULL, stock_addressbook, sizeof(stock_addressbook), "stock_addressbook", 24},
+	{NULL, NULL, NULL, NULL, stock_delete, sizeof(stock_delete), GTK_STOCK_DELETE, 24},
+	{NULL, NULL, NULL, NULL, stock_spam, sizeof(stock_spam), "stock_spam", 24},
+	{NULL, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24}
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 742912d3..23ca26d3 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -38,18 +38,23 @@ typedef enum
 	STOCK_PIXMAP_ERROR,
 	STOCK_PIXMAP_FORWARDED,
 	STOCK_PIXMAP_GROUP,
-	STOCK_PIXMAP_INBOX,
 	STOCK_PIXMAP_INTERFACE,
 	STOCK_PIXMAP_JPILOT,
 	STOCK_PIXMAP_LDAP,
 	STOCK_PIXMAP_LINEWRAP,
 	STOCK_PIXMAP_MARK,
 	STOCK_PIXMAP_NEW,
-	STOCK_PIXMAP_OUTBOX,
 	STOCK_PIXMAP_REPLIED,
-	STOCK_PIXMAP_CLOSE,
-	STOCK_PIXMAP_DOWN_ARROW,
-	STOCK_PIXMAP_EXEC,
+	STOCK_PIXMAP_UNREAD,
+	STOCK_PIXMAP_VCARD,
+	STOCK_PIXMAP_ONLINE,
+	STOCK_PIXMAP_OFFLINE,
+	STOCK_PIXMAP_MAIL_SMALL,
+
+	STOCK_PIXMAP_INBOX,
+	STOCK_PIXMAP_OUTBOX,
+	STOCK_PIXMAP_DRAFT,
+	STOCK_PIXMAP_TRASH,
 	STOCK_PIXMAP_MAIL,
 	STOCK_PIXMAP_MAIL_ATTACH,
 	STOCK_PIXMAP_MAIL_COMPOSE,
@@ -61,17 +66,8 @@ typedef enum
 	STOCK_PIXMAP_MAIL_SEND,
 	STOCK_PIXMAP_MAIL_SEND_QUEUE,
 	STOCK_PIXMAP_PASTE,
-	STOCK_PIXMAP_PREFERENCES,
-	STOCK_PIXMAP_PROPERTIES,
 	STOCK_PIXMAP_SYLPHEED_LOGO,
 	STOCK_PIXMAP_ADDRESS_BOOK,
-	STOCK_PIXMAP_DRAFT,
-	STOCK_PIXMAP_TRASH,
-	STOCK_PIXMAP_UNREAD,
-	STOCK_PIXMAP_VCARD,
-	STOCK_PIXMAP_ONLINE,
-	STOCK_PIXMAP_OFFLINE,
-	STOCK_PIXMAP_MAIL_SMALL,
 	STOCK_PIXMAP_DELETE,
 	STOCK_PIXMAP_SPAM,
 	STOCK_PIXMAP_SIGN,