added 32x32 icon.

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

7 files changed, 27 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index a5cdaf75..34a6bd7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-12
+
+	* src/main.c
+	  src/stock_pixmap.[ch]
+	  src/icons/stock_sylpheed_32.png
+	  src/icons/Makefile.am: added 32x32 icon for win32 application icon.
+
 2006-10-10
 
 	* src/gtkutils.c: gtkut_tree_view_fast_clear(): enable fast clear
diff --git a/ChangeLog.ja b/ChangeLog.ja
index c250c9b6..9a7d2e29 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,11 @@
+2006-10-12
+
+	* src/main.c
+	  src/stock_pixmap.[ch]
+	  src/icons/stock_sylpheed_32.png
+	  src/icons/Makefile.am: win32 アプリケーションアイコン用に 32x32 の
+	  アイコンを追加。
+
 2006-10-10
 
 	* src/gtkutils.c: gtkut_tree_view_fast_clear(): GTK+ >= 2.10.0 の場合
diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index eb59ea85..390137e0 100644
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -20,6 +20,7 @@ BUILT_SOURCES = \
 	stock_spam.h \
 	stock_sylpheed.h \
 	stock_sylpheed_16.h \
+	stock_sylpheed_32.h \
 	sylpheed-logo.h
 
 EXTRA_DIST = \
@@ -44,6 +45,7 @@ EXTRA_DIST = \
 	stock_spam.png \
 	stock_sylpheed.png \
 	stock_sylpheed_16.png \
+	stock_sylpheed_32.png \
 	sylpheed-logo.png \
 	clip.xpm \
 	deleted.xpm \
diff --git a/src/icons/stock_sylpheed_32.png b/src/icons/stock_sylpheed_32.png
new file mode 100644
index 00000000..8300438d
--- /dev/null
+++ b/src/icons/stock_sylpheed_32.png
diff --git a/src/main.c b/src/main.c
index ff841f85..7023ea6f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -167,6 +167,7 @@ int main(int argc, char *argv[])
 	MainWindow *mainwin;
 	FolderView *folderview;
 	GdkPixbuf *icon;
+	GList *iconlist = NULL;
 
 	app_init();
 	parse_cmd_opt(argc, argv);
@@ -224,11 +225,16 @@ int main(int argc, char *argv[])
 	gtkut_widget_init();
 
 #ifdef G_OS_WIN32
+	stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_32, &icon);
+	iconlist = g_list_append(iconlist, icon);
 	stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED_SMALL, &icon);
+	iconlist = g_list_append(iconlist, icon);
+	gtk_window_set_default_icon_list(iconlist);
+	g_list_free(iconlist);
 #else
 	stock_pixbuf_gdk(NULL, STOCK_PIXMAP_SYLPHEED, &icon);
-#endif
 	gtk_window_set_default_icon(icon);
+#endif
 
 	mainwin = main_window_create
 		(prefs_common.sep_folder | prefs_common.sep_msg << 1);
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 8fbe92c3..755fc029 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -72,6 +72,7 @@
 #include "icons/stock_hand-signed.h"
 #include "icons/stock_sylpheed.h"
 #include "icons/stock_sylpheed_16.h"
+#include "icons/stock_sylpheed_32.h"
 #include "icons/sylpheed-logo.h"
 
 typedef struct _StockPixmapData	StockPixmapData;
@@ -137,6 +138,7 @@ static StockPixmapData pixmaps[] =
 	{NULL, NULL, NULL, NULL, stock_hand_signed, sizeof(stock_hand_signed), "stock_hand-signed", 24},
 	{NULL, NULL, NULL, NULL, stock_sylpheed, sizeof(stock_sylpheed), NULL, 0},
 	{NULL, NULL, NULL, NULL, stock_sylpheed_16, sizeof(stock_sylpheed_16), NULL, 0},
+	{NULL, NULL, NULL, NULL, stock_sylpheed_32, sizeof(stock_sylpheed_32), NULL, 0},
 	{NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0},
 };
 
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 27e73011..b3cdc849 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -72,6 +72,7 @@ typedef enum
 	STOCK_PIXMAP_SIGN,
 	STOCK_PIXMAP_SYLPHEED,
 	STOCK_PIXMAP_SYLPHEED_SMALL,
+	STOCK_PIXMAP_SYLPHEED_32,
 	STOCK_PIXMAP_SYLPHEED_LOGO,
 
 	N_STOCK_PIXMAPS