removed stock_pixmap_widget().

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

6 files changed, 17 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index e17a07df..9556d0df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-24
+
+	* src/stock_pixmap.[ch]
+	  src/summaryview.c
+	  src/prefs_filter_edit.c: removed stock_pixmap_widget() (instead
+	  use stock_pixbuf_widget()).
+
 2005-08-23
 
 	* src/folderview.c
diff --git a/ChangeLog.ja b/ChangeLog.ja
index f15c03f7..a2643217 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,10 @@
+2005-08-24
+
+	* src/stock_pixmap.[ch]
+	  src/summaryview.c
+	  src/prefs_filter_edit.c: stock_pixmap_widget() を削除(代わりに
+	  stock_pixbuf_widget() を使用)。
+
 2005-08-23
 
 	* src/folderview.c
diff --git a/src/prefs_filter_edit.c b/src/prefs_filter_edit.c
index f2fa832e..0d354574 100644
--- a/src/prefs_filter_edit.c
+++ b/src/prefs_filter_edit.c
@@ -761,7 +761,7 @@ static ActionHBox *prefs_filter_edit_action_hbox_create(void)
 	gtk_widget_show(folder_entry);
 	gtk_box_pack_start(GTK_BOX(hbox), folder_entry, TRUE, TRUE, 0);
 
-	folder_img = stock_pixmap_widget(rule_edit_window.window,
+	folder_img = stock_pixbuf_widget(rule_edit_window.window,
 					 STOCK_PIXMAP_DIR_OPEN);
 	gtk_widget_show(folder_img);
 
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index b803f547..654f4af8 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -138,18 +138,6 @@ static StockPixmapData pixmaps[] =
 	{NULL, NULL, NULL, NULL, sylpheed_logo, sizeof(sylpheed_logo), NULL, 0},
 };
 
-/* return newly constructed GtkPixmap from GdkPixmap */
-GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
-{
-	GdkPixmap *pixmap;
-	GdkBitmap *mask;
-
-	g_return_val_if_fail(window != NULL, NULL);
-	g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
-
-	stock_pixmap_gdk(window, icon, &pixmap, &mask);
-	return gtk_pixmap_new(pixmap, mask);
-}
 
 GtkWidget *stock_pixbuf_widget(GtkWidget *window, StockPixmap icon)
 {
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 57fcbb3a..f6eae939 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -76,8 +76,6 @@ typedef enum
 	N_STOCK_PIXMAPS
 } StockPixmap;
 
-GtkWidget *stock_pixmap_widget	(GtkWidget	 *window,
-				 StockPixmap	  icon);
 GtkWidget *stock_pixbuf_widget	(GtkWidget	 *window,
 				 StockPixmap	  icon);
 
diff --git a/src/summaryview.c b/src/summaryview.c
index 26ed11da..dfd58ede 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -543,7 +543,8 @@ void summary_init(SummaryView *summaryview)
 	gtk_widget_modify_font(summaryview->statlabel_msgs, font_desc);
 	pango_font_description_free(font_desc);
 
-	pixmap = stock_pixmap_widget(summaryview->hbox_l, STOCK_PIXMAP_DIR_OPEN);
+	pixmap = stock_pixbuf_widget(summaryview->hbox_l,
+				     STOCK_PIXMAP_DIR_OPEN);
 	gtk_box_pack_start(GTK_BOX(summaryview->hbox_l), pixmap, FALSE, FALSE, 4);
 	gtk_box_reorder_child(GTK_BOX(summaryview->hbox_l), pixmap, 0);
 	gtk_widget_show(pixmap);