** 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

3 files changed, 10 insertions, 4 deletions

diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index 6d6d93f1e2..7d0624cf42 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2008-08-11  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #546892
+
+	* itip-view.c:
+	Prefer gtk_image_new_from_icon_name() or e_icon_factory_get_image().
+
 2008-07-28  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #491176
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 6839a68160..decf129344 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -50,7 +50,6 @@
 #include <mail/mail-tools.h>
 #include <mail/mail-mt.h>
 #include <libedataserver/e-account-list.h>
-#include <e-util/e-icon-factory.h>
 #include <e-util/e-error.h>
 #include <calendar/gui/calendar-config.h>
 #include <calendar/gui/itip-utils.h>
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 061e1daf6b..e42b338e0f 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -40,7 +40,6 @@
 #include <mail/em-format-hook.h>
 #include <mail/em-format-html.h>
 #include <libedataserver/e-account-list.h>
-#include <e-util/e-icon-factory.h>
 #include <e-util/e-util.h>
 #include <calendar/gui/itip-utils.h>
 #include "itip-view.h"
@@ -723,7 +722,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
 			image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_SMALL_TOOLBAR);
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS:
-			image = e_icon_factory_get_image ("stock_animation", E_ICON_SIZE_BUTTON);
+			image = gtk_image_new_from_icon_name ("stock_animation", GTK_ICON_SIZE_BUTTON);
 			break;
 		case ITIP_VIEW_INFO_ITEM_TYPE_NONE:
 		default:
@@ -963,7 +962,8 @@ itip_view_init (ItipView *view)
 	gtk_box_set_spacing (GTK_BOX (view), 12);
 
 	/* The meeting icon */
-	icon = e_icon_factory_get_image (MEETING_ICON, E_ICON_SIZE_LARGE_TOOLBAR);
+	icon = gtk_image_new_from_icon_name (
+		MEETING_ICON, GTK_ICON_SIZE_LARGE_TOOLBAR);
 	gtk_misc_set_alignment (GTK_MISC (icon), 0.5, 0);
 	gtk_widget_show (icon);