** 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, 2 insertions, 10 deletions

diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 7fa76e7fdc..cc8f195c98 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -43,7 +43,6 @@
 #include "misc/e-task-bar.h"
 #include "misc/e-info-label.h"
 
-
 #include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include "shell/e-user-creatable-items-handler.h"
@@ -66,10 +65,6 @@
 #define PARENT_TYPE G_TYPE_OBJECT
 static GObjectClass *parent_class = NULL;
 
-/* This is used for the addressbook status bar */
-#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new"
-static GdkPixbuf *progress_icon = NULL;
-
 #define d(x)
 
 struct _AddressbookViewPrivate {
@@ -489,11 +484,8 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view)
 	} else if (priv->activity_id == 0) {
 		char *clientid = g_strdup_printf ("%p", view);
 
-		if (progress_icon == NULL)
-			progress_icon = e_icon_factory_get_icon (EVOLUTION_CONTACTS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS);
-
-		priv->activity_id = e_activity_handler_operation_started (activity_handler, clientid,
-									  progress_icon, message, TRUE);
+		priv->activity_id = e_activity_handler_operation_started (
+			activity_handler, clientid, message, TRUE);
 
 		g_free (clientid);
 	} else {