From 434bc25ed6b3f458f3bf119e76bd8b2bcffe5178 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Aug 2008 17:04:32 +0000 Subject: ** Fixes bug #546892 2008-08-11 Matthew Barnes ** 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 --- plugins/audio-inline/audio-inline.c | 1 - plugins/import-ics-attachments/ChangeLog | 7 +++++++ plugins/import-ics-attachments/icsimporter.c | 4 ++-- plugins/itip-formatter/ChangeLog | 7 +++++++ plugins/itip-formatter/itip-formatter.c | 1 - plugins/itip-formatter/itip-view.c | 6 +++--- plugins/mail-notification/ChangeLog | 8 ++++++++ plugins/mail-notification/mail-notification.c | 3 +-- plugins/startup-wizard/startup-wizard.c | 1 - 9 files changed, 28 insertions(+), 10 deletions(-) (limited to 'plugins') diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index cf653148d2..405c3d87d6 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -12,7 +12,6 @@ #include #include -#include "e-util/e-icon-factory.h" #include "e-util/e-mktemp.h" #include "camel/camel-medium.h" #include "camel/camel-mime-part.h" diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index 68a87d906b..e92ec7ab39 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,10 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * icsimporter.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + 2008-04-17 Milan Crha ** Part of fix for bug #526739 diff --git a/plugins/import-ics-attachments/icsimporter.c b/plugins/import-ics-attachments/icsimporter.c index 6e3a282852..27477acf3b 100644 --- a/plugins/import-ics-attachments/icsimporter.c +++ b/plugins/import-ics-attachments/icsimporter.c @@ -38,7 +38,6 @@ #include "e-attachment-bar.h" #include #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #include #include #include @@ -254,7 +253,8 @@ init_widgets(char *path) g_object_unref (source_list); hbox = gtk_hbox_new (FALSE, FALSE); - icon = e_icon_factory_get_image ("stock_mail-import", E_ICON_SIZE_MENU); + icon = gtk_image_new_from_icon_name ( + "stock_mail-import", GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX(hbox), icon, FALSE, FALSE, 6); label = gtk_label_new_with_mnemonic (_("_Import")); gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 6); 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 + + ** 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 ** 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 #include #include -#include #include #include #include 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 #include #include -#include #include #include #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); diff --git a/plugins/mail-notification/ChangeLog b/plugins/mail-notification/ChangeLog index 278f8bb93a..7a42367563 100644 --- a/plugins/mail-notification/ChangeLog +++ b/plugins/mail-notification/ChangeLog @@ -1,3 +1,11 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * mail-notification.c: + Prefer gtk_status_icon_set_from_icon_name() over + gtk_status_icon_set_from_pixbuf(). + 2008-08-01 Matthew Barnes ** Fixes part of bug #514006 diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index afa633c999..9826f5a06d 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -38,7 +38,6 @@ #include #include "e-util/e-config.h" -#include "e-util/e-icon-factory.h" #include "mail/em-utils.h" #include "mail/em-event.h" #include "mail/em-folder-tree-model.h" @@ -449,7 +448,7 @@ new_notify_status (EMEventTargetFolder *t) if (new_icon) { status_icon = gtk_status_icon_new (); - gtk_status_icon_set_from_pixbuf (status_icon, e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_LARGE_TOOLBAR)); + gtk_status_icon_set_from_icon_name (status_icon, "mail-unread"); } if (!status_count) { diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c index 22ace2ea13..32cf21a217 100644 --- a/plugins/startup-wizard/startup-wizard.c +++ b/plugins/startup-wizard/startup-wizard.c @@ -23,7 +23,6 @@ #include #include #include "widgets/e-timezone-dialog/e-timezone-dialog.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-error.h" #include "e-util/e-import.h" #include "shell/es-event.h" -- cgit v1.2.3