# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177031729 0
# Node ID 0cf176fc9438e23fc579d4d011b13977094d5000
# Parent  9e27111f7e5fb9e9d1e63ff8146f5c7da5bbe771# Parent  ae8a326b091f9ae74eed5dc6569698d9f00c19f3
merge of '2d5bca78effdcf8445c4b744e6334fc2cf4fe083'
     and 'f75ece8e5f45dc2fd6cad2ad6ba599c369a9ff00'

diff -r 9e27111f7e5f -r 0cf176fc9438 pidgin/gtkaccount.c
--- a/pidgin/gtkaccount.c	Fri Apr 20 01:07:01 2007 +0000
+++ b/pidgin/gtkaccount.c	Fri Apr 20 01:15:29 2007 +0000
@@ -229,11 +229,9 @@
 	if (pixbuf == NULL)
 	{
 		/* Show a placeholder icon */
-		gchar *filename;
-		filename = g_build_filename(DATADIR, "pixmaps",
-				"pidgin", "insert-image.png", NULL);
-		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
-		g_free(filename);
+		GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
+		pixbuf = gtk_widget_render_icon(dialog->window, PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE,
+		                                icon_size, "PidginAccount");
 	}
 
 	gtk_image_set_from_pixbuf(GTK_IMAGE(dialog->icon_entry), pixbuf);
diff -r 9e27111f7e5f -r 0cf176fc9438 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Fri Apr 20 01:07:01 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Fri Apr 20 01:15:29 2007 +0000
@@ -2042,11 +2042,10 @@
 	if (status_box->buddy_icon == NULL)
 	{
 		/* Show a placeholder icon */
-		gchar *filename;
-		filename = g_build_filename(DATADIR, "pixmaps",
-				"pidgin", "insert-image.png", NULL);
-		status_box->buddy_icon = gdk_pixbuf_new_from_file(filename, NULL);
-		g_free(filename);
+		GtkIconSize icon_size = gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL);
+		status_box->buddy_icon = gtk_widget_render_icon(GTK_WIDGET(status_box),
+		                                                PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE,
+		                                                icon_size, "PidginStatusBox");
 	}
 
 	if (status_box->buddy_icon != NULL) {