src/alertpanel.c: use GTK stock icon instead of pixmap.

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

3 files changed, 23 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index b565672a..31e6e27d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-01-24
 
+	* src/alertpanel.c: use GTK stock icon instead of pixmap.
+
+2005-01-24
+
 	* src/grouplistdialog.c: replaced fnmatch() with g_pattern_match_*().
 
 2005-01-24
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 562c348c..522352f1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,9 @@
 2005-01-24
 
+	* src/alertpanel.c: pixmap の代わりに GTK のストックアイコンを使用。
+
+2005-01-24
+
 	* src/grouplistdialog.c: fnmatch() を g_pattern_match_*()
 	  で置き換えた。
 
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 4370a715..ce0c35a4 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -32,7 +32,6 @@
 #include "utils.h"
 #include "gtkutils.h"
 #include "inc.h"
-#include "stock_pixmap.h"
 #include "prefs_common.h"
 
 #define ALERT_PANEL_WIDTH	380
@@ -175,8 +174,7 @@ static void alertpanel_create(const gchar *title,
 			      AlertType    type)
 {
 	static PangoFontDescription *font_desc;
-	StockPixmap stock_pixmap;
-	GtkWidget *pixmapwid;
+	GtkWidget *image;
 	GtkWidget *label;
 	GtkWidget *hbox;
 	GtkWidget *vbox;
@@ -213,19 +211,25 @@ static void alertpanel_create(const gchar *title,
 
 	/* title icon and label */
 	switch (type) {
-	case ALERT_NOTICE:
-		stock_pixmap = STOCK_PIXMAP_DIALOG_INFO; break;
 	case ALERT_QUESTION:
-		stock_pixmap = STOCK_PIXMAP_DIALOG_QUESTION; break;
+		image = gtk_image_new_from_stock
+			(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG);
+		break;
 	case ALERT_WARNING:
-		stock_pixmap = STOCK_PIXMAP_DIALOG_WARNING; break;
+		image = gtk_image_new_from_stock
+			(GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_DIALOG);
+		break;
 	case ALERT_ERROR:
-		stock_pixmap = STOCK_PIXMAP_DIALOG_ERROR; break;
+		image = gtk_image_new_from_stock
+			(GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
+		break;
+	case ALERT_NOTICE:
 	default:
-		stock_pixmap = STOCK_PIXMAP_DIALOG_QUESTION; break;
+		image = gtk_image_new_from_stock
+			(GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_DIALOG);
+		break;
 	}
-	pixmapwid = stock_pixmap_widget(dialog, stock_pixmap);
-	gtk_box_pack_start(GTK_BOX(hbox), pixmapwid, FALSE, FALSE, 16);
+	gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 16);
 
 	label = gtk_label_new(title);
 	gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0);