added new search folder icon.

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

11 files changed, 24 insertions, 20 deletions

diff --git a/src/addressadd.c b/src/addressadd.c
index 2921adbe..cb5e3ae7 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -254,9 +254,9 @@ static void addressadd_create( void ) {
 
 	gtk_widget_show_all(vbox);
 
-	stock_pixmap_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm, &bookXpmMask );
-	stock_pixmap_gdk( window, STOCK_PIXMAP_DIR_OPEN,
-			  &folderXpm, &folderXpmMask );
+	stock_pixmap_gdk(window, STOCK_PIXMAP_BOOK, &bookXpm, &bookXpmMask);
+	stock_pixmap_gdk(window, STOCK_PIXMAP_FOLDER_OPEN,
+			 &folderXpm, &folderXpmMask);
 }
 
 static void addressadd_load_folder( GtkCTreeNode *parentNode, ItemFolder *parentFolder,
diff --git a/src/addressbook.c b/src/addressbook.c
index 68eb9b71..f0559f36 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3666,8 +3666,8 @@ void addrbookctl_build_map(GtkWidget *window)
 	AddressTypeControlItem *atci;
 
 	/* Build icons */
-	stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderpix);
-	stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenpix);
+	stock_pixbuf_gdk(window, STOCK_PIXMAP_FOLDER_CLOSE, &folderpix);
+	stock_pixbuf_gdk(window, STOCK_PIXMAP_FOLDER_OPEN, &folderopenpix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &grouppix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardpix);
 	stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookpix);
diff --git a/src/foldersel.c b/src/foldersel.c
index 32027880..fb7cabeb 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -367,11 +367,11 @@ static void foldersel_create(void)
 
 static void foldersel_init(void)
 {
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_CLOSE,
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_CLOSE,
 			 &folder_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_OPEN,
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_OPEN,
 			 &folderopen_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT,
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_NOSELECT,
 			 &foldernoselect_pixbuf);
 }
 
diff --git a/src/folderview.c b/src/folderview.c
index 8ed54b62..18ec6d74 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -547,13 +547,13 @@ void folderview_init(FolderView *folderview)
 
 	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_INBOX, &inbox_pixbuf);
 	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_OUTBOX, &outbox_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_CLOSE, &folder_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_OPEN, &folderopen_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT,
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_CLOSE, &folder_pixbuf);
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_OPEN, &folderopen_pixbuf);
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_NOSELECT,
 			 &foldernoselect_pixbuf);
 	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DRAFT, &draft_pixbuf);
 	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_TRASH, &trash_pixbuf);
-	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_GROUP, &virtual_pixbuf);
+	stock_pixbuf_gdk(treeview, STOCK_PIXMAP_FOLDER_SEARCH, &virtual_pixbuf);
 }
 
 void folderview_reflect_prefs(FolderView *folderview)
diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 2b728319..ed02311f 100644
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -30,7 +30,8 @@ BUILT_SOURCES = \
 	folder-close.h \
 	folder-open.h \
 	folder-noselect.h \
-	folder-search.h
+	folder-search.h \
+	folder-group.h
 
 EXTRA_DIST = \
 	stock_addressbook.png \
@@ -65,6 +66,7 @@ EXTRA_DIST = \
 	folder-open.png \
 	folder-noselect.png \
 	folder-search.png \
+	folder-group.png \
 	clip.xpm \
 	deleted.xpm \
 	forwarded.xpm \
diff --git a/src/icons/folder-group.png b/src/icons/folder-group.png
new file mode 100644
index 00000000..4e700b06
--- /dev/null
+++ b/src/icons/folder-group.png
diff --git a/src/icons/folder-search.png b/src/icons/folder-search.png
index ccc0cef5..ed9bbb47 100644
--- a/src/icons/folder-search.png
+++ b/src/icons/folder-search.png
diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c
index dbdc5462..9250cfb7 100644
--- a/src/prefs_filter_edit.c
+++ b/src/prefs_filter_edit.c
@@ -702,7 +702,7 @@ ActionHBox *prefs_filter_edit_action_hbox_create(void)
 	gtk_box_pack_start(GTK_BOX(hbox), folder_entry, TRUE, TRUE, 0);
 
 	folder_img = stock_pixbuf_widget(rule_edit_window.window,
-					 STOCK_PIXMAP_DIR_OPEN);
+					 STOCK_PIXMAP_FOLDER_OPEN);
 	gtk_widget_show(folder_img);
 
 	folder_sel_btn = gtk_button_new();
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 2b22a6e7..f3518d44 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -34,7 +34,6 @@
 #include "icons/deleted.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"
@@ -79,6 +78,7 @@
 #include "icons/folder-open.h"
 #include "icons/folder-noselect.h"
 #include "icons/folder-search.h"
+#include "icons/folder-group.h"
 
 typedef struct _StockPixmapData	StockPixmapData;
 
@@ -108,7 +108,7 @@ static StockPixmapData pixmaps[] =
 	{NULL, NULL, NULL, NULL, folder_noselect, sizeof(folder_noselect), "folder-noselect", 0},
 	{error_xpm	 , NULL, NULL},
 	{forwarded_xpm	 , NULL, NULL},
-	{NULL, NULL, NULL, NULL, folder_search, sizeof(folder_search), "folder-search", 0},
+	{NULL, NULL, NULL, NULL, folder_group, sizeof(folder_group), "folder-group", 0},
 	{interface_xpm	 , NULL, NULL},
 	{jpilot_xpm	 , NULL, NULL},
 	{ldap_xpm	 , NULL, NULL},
@@ -149,6 +149,7 @@ static StockPixmapData pixmaps[] =
 	{NULL, NULL, NULL, NULL, stock_sylpheed_newmail_16, sizeof(stock_sylpheed_newmail_16), NULL, 0},
 	{NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0},
 	{NULL, NULL, NULL, NULL, stock_person, sizeof(stock_person), "stock_person", 16},
+	{NULL, NULL, NULL, NULL, folder_search, sizeof(folder_search), "folder-search", 0},
 };
 
 
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index b04f831d..f97d564a 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -32,9 +32,9 @@ typedef enum
 	STOCK_PIXMAP_COMPLETE,
 	STOCK_PIXMAP_CONTINUE,
 	STOCK_PIXMAP_DELETED,
-	STOCK_PIXMAP_DIR_CLOSE,
-	STOCK_PIXMAP_DIR_OPEN,
-	STOCK_PIXMAP_DIR_NOSELECT,
+	STOCK_PIXMAP_FOLDER_CLOSE,
+	STOCK_PIXMAP_FOLDER_OPEN,
+	STOCK_PIXMAP_FOLDER_NOSELECT,
 	STOCK_PIXMAP_ERROR,
 	STOCK_PIXMAP_FORWARDED,
 	STOCK_PIXMAP_GROUP,
@@ -78,6 +78,7 @@ typedef enum
 	STOCK_PIXMAP_SYLPHEED_NEWMAIL_SMALL,
 	STOCK_PIXMAP_SYLPHEED_LOGO,
 	STOCK_PIXMAP_PERSON,
+	STOCK_PIXMAP_FOLDER_SEARCH,
 
 	N_STOCK_PIXMAPS
 } StockPixmap;
diff --git a/src/summaryview.c b/src/summaryview.c
index 6ad83677..5e8551bd 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -613,7 +613,7 @@ void summary_init(SummaryView *summaryview)
 	pango_font_description_free(font_desc);
 
 	pixmap = stock_pixbuf_widget(summaryview->hbox,
-				     STOCK_PIXMAP_DIR_OPEN);
+				     STOCK_PIXMAP_FOLDER_OPEN);
 	gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);
 	gtk_box_reorder_child(GTK_BOX(summaryview->hbox), pixmap, 0);
 	gtk_widget_show(pixmap);