** Fixes bug #546892

2008-08-11  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #546892

	* e-util/e-icon-factory.c (e_icon_factory_get_image):
	Kill this function.  Use gtk_image_new_from_icon_name().

	* e-util/e-icon-factory.c (e_icon_factory_get_icon_list):
	Kill this function.  Use gtk_window_set_icon_name().

	* widgets/misc/e-activity-handler.c:
	* widgets/misc/e-task-widget.c:
	Purge the GdkPixbuf arguments from the API.  We've been ignoring
	them since the spinner icon was added.

	* addressbook/gui/contact-editor/e-contact-editor-fullname.c:
	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* addressbook/gui/contact-editor/e-contact-editor-address.c:
	* calendar/gui/alarm-notify/alarm-notify-dialog.c:
	* calendar/gui/dialogs/alarm-dialog.c:
	* calendar/gui/dialogs/alarm-list-dialog.c:
	* calendar/gui/dialogs/cal-attachment-select-file.c:
	* calendar/gui/dialogs/changed-comp.c:
	* calendar/gui/dialogs/delete-error.c:
	* calendar/gui/dialogs/select-source-dialog.c:
	* mail/mail-send-recv.c:
	* mail/message-tag-followup.c:
	* widgets/misc/e-combo-button.c:
	* widgets/misc/e-info-label.c:
	* widgets/misc/e-url-entry.c:
	* widgets/misc/e-task-widget.c:
	Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list().

	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* calendar/gui/dialogs/event-page.c:
	* calendar/gui/e-timezone-entry.c:
        * e-util/e-gui-utils.c:
        * e-util/e-popup.c:
	* plugins/import-ics-attachments/icsimporter.c:
	* plugins/itip-formatter/itip-view.c:
	* mail/em-folder-browser.c:
	* mail/em-format-html-display.c:
	* mail/mail-send-recv.c:
	* mail/message-tag-followup.c:
	Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image().

	* calendar/gui/alarm-notify/alarm-queue.c:
	* plugins/mail-notification/mail-notification.c:
	Prefer gtk_status_icon_set_from_icon_name() over
	gtk_status_icon_set_from_pixbuf().

	* addressbook/gui/component/addressbook-view.c:
	* calendar/gui/e-calendar-table.c:
	* calendar/gui/e-calendar-view.c:
	* calendar/gui/e-memo-table.c:
	* mail/mail-mt.c:
	e_activity_handler_operation_started() no longer takes a GdkPixbuf.
	It was ignoring the pixbuf anyway ever since we added a spinner icon.


svn path=/trunk/; revision=35958

1 files changed, 9 insertions, 6 deletions

diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 36b7e74cf6..199ff19b67 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1181,15 +1181,16 @@ efhd_xpkcs7mime_button(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObje
 {
 	GtkWidget *icon, *button;
 	struct _smime_pobject *po = (struct _smime_pobject *)pobject;
-	const char *name;
+	const char *icon_name;
 
 	/* FIXME: need to have it based on encryption and signing too */
 	if (po->valid->sign.status != 0)
-		name = smime_sign_table[po->valid->sign.status].icon;
+		icon_name = smime_sign_table[po->valid->sign.status].icon;
 	else
-		name = smime_encrypt_table[po->valid->encrypt.status].icon;
+		icon_name = smime_encrypt_table[po->valid->encrypt.status].icon;
 
-	icon = e_icon_factory_get_image (name, E_ICON_SIZE_LARGE_TOOLBAR);
+	icon = gtk_image_new_from_icon_name (
+		icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_widget_show(icon);
 
 	button = gtk_button_new();
@@ -2371,7 +2372,8 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 
 	button = gtk_button_new();
 	hbox = gtk_hbox_new (FALSE, 0);
-	img = e_icon_factory_get_image ("stock_show-all", E_ICON_SIZE_BUTTON);
+	img = gtk_image_new_from_icon_name (
+		"stock_show-all", GTK_ICON_SIZE_BUTTON);
 	label = gtk_label_new_with_mnemonic(_("View _Unformatted"));
 	g_object_set_data (G_OBJECT (button), "text-label", (gpointer)label);
 	gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
@@ -2390,7 +2392,8 @@ efhd_attachment_optional(EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPOb
 
 	button = gtk_button_new();
 	hbox = gtk_hbox_new (FALSE, 0);
-	img = e_icon_factory_get_image ("stock_open", E_ICON_SIZE_BUTTON);
+	img = gtk_image_new_from_stock (
+		GTK_STOCK_OPEN, GTK_ICON_SIZE_BUTTON);
 	label = gtk_label_new_with_mnemonic(_("O_pen With"));
 	gtk_box_pack_start (GTK_BOX (hbox), img, TRUE, TRUE, 2);
 	gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 2);