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 --- addressbook/ChangeLog | 16 +++++ addressbook/gui/component/addressbook-view.c | 12 +--- .../gui/contact-editor/e-contact-editor-address.c | 10 +-- .../gui/contact-editor/e-contact-editor-fullname.c | 10 +-- .../gui/contact-editor/e-contact-editor-im.c | 14 ++--- addressbook/gui/contact-editor/e-contact-editor.c | 1 - addressbook/gui/widgets/e-addressbook-view.c | 13 +++- calendar/ChangeLog | 27 ++++++++ calendar/gui/alarm-notify/alarm-notify-dialog.c | 18 ++---- calendar/gui/alarm-notify/alarm-queue.c | 17 +++-- calendar/gui/cal-search-bar.c | 13 +++- calendar/gui/calendar-component.c | 1 - calendar/gui/dialogs/alarm-dialog.c | 10 +-- calendar/gui/dialogs/alarm-list-dialog.c | 10 +-- calendar/gui/dialogs/cal-attachment-select-file.c | 9 +-- calendar/gui/dialogs/cancel-comp.c | 1 - calendar/gui/dialogs/changed-comp.c | 9 +-- calendar/gui/dialogs/delete-comp.c | 1 - calendar/gui/dialogs/delete-error.c | 14 ++--- calendar/gui/dialogs/event-editor.c | 1 - calendar/gui/dialogs/event-page.c | 3 +- calendar/gui/dialogs/select-source-dialog.c | 16 ++--- calendar/gui/dialogs/task-editor.c | 1 - calendar/gui/e-calendar-table.c | 11 +--- calendar/gui/e-calendar-view.c | 10 +-- calendar/gui/e-memo-table.c | 11 +--- calendar/gui/e-timezone-entry.c | 10 +-- calendar/gui/memos-component.c | 1 - calendar/gui/memos-control.c | 2 +- calendar/gui/tasks-component.c | 1 - calendar/gui/tasks-control.c | 2 +- composer/e-msg-composer.c | 1 - e-util/ChangeLog | 14 +++++ e-util/e-config.c | 2 - e-util/e-event.c | 2 - e-util/e-gui-utils.c | 4 +- e-util/e-icon-factory.c | 56 ----------------- e-util/e-icon-factory.h | 4 -- e-util/e-import.c | 2 - e-util/e-popup.c | 10 +-- mail/ChangeLog | 19 ++++++ mail/em-config.c | 1 - mail/em-event.c | 1 - mail/em-folder-browser.c | 25 ++++++-- mail/em-folder-utils.c | 1 - mail/em-format-hook.c | 2 - mail/em-format-html-display.c | 15 +++-- mail/em-junk-hook.c | 1 - mail/em-menu.c | 1 - mail/em-network-prefs.c | 1 - mail/em-popup.c | 1 - mail/mail-mt.c | 7 +-- mail/mail-send-recv.c | 17 ++--- mail/message-tag-followup.c | 17 ++--- 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 - shell/e-component-registry.c | 2 - shell/e-shell-view.c | 1 - shell/e-shell-window-commands.c | 2 +- widgets/misc/ChangeLog | 15 +++++ widgets/misc/e-activity-handler.c | 22 +++---- widgets/misc/e-activity-handler.h | 2 - widgets/misc/e-combo-button.c | 7 ++- widgets/misc/e-info-label.c | 6 +- widgets/misc/e-search-bar.c | 1 - widgets/misc/e-task-widget.c | 73 ++++++++-------------- widgets/misc/e-task-widget.h | 49 +++++++-------- widgets/misc/e-url-entry.c | 3 +- widgets/misc/test-info-label.c | 3 - 76 files changed, 299 insertions(+), 404 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index bb251b4963..6689d3c689 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,19 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * gui/contact-editor/e-contact-editor-fullname.c: + * gui/contact-editor/e-contact-editor-im.c: + * gui/contact-editor/e-contact-editor-address.c: + Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). + + * gui/contact-editor/e-contact-editor-im.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + + * gui/component/addressbook-view.c: + e_activity_handler_operation_started() no longer takes a GdkPixbuf. + It was ignoring the pixbuf anyway ever since we added a spinner icon. + 2008-08-07 Milan Crha ** Fix for bug #324203 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 { diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c index 7b2a54424b..1a1e6e18ed 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-address.c +++ b/addressbook/gui/contact-editor/e-contact-editor-address.c @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -417,7 +416,6 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_address), @@ -450,12 +448,8 @@ e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_address), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c index 0943e2111f..af0db54e7e 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c +++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c @@ -21,7 +21,6 @@ #include #include "e-contact-editor-fullname.h" -#include #include #include #include @@ -100,7 +99,6 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_widget_realize (GTK_WIDGET (e_contact_editor_fullname)); @@ -136,12 +134,8 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); g_object_unref(widget); - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_fullname), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor-im.c b/addressbook/gui/contact-editor/e-contact-editor-im.c index d438444147..8b421c0b3b 100644 --- a/addressbook/gui/contact-editor/e-contact-editor-im.c +++ b/addressbook/gui/contact-editor/e-contact-editor-im.c @@ -24,7 +24,6 @@ #include #include #include -#include #include static void e_contact_editor_im_init (EContactEditorIm *card); @@ -189,7 +188,8 @@ setup_service_optmenu(EContactEditorIm *editor) gtk_container_add(GTK_CONTAINER(item), hbox); gtk_widget_show(hbox); - image = e_icon_factory_get_image (im_images[i], E_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name ( + im_images[i], GTK_ICON_SIZE_MENU); gtk_size_group_add_widget(sg, image); @@ -240,7 +240,6 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) { GladeXML *gui; GtkWidget *widget; - GList *icon_list; char *gladefile; gtk_dialog_add_buttons (GTK_DIALOG (e_contact_editor_im), @@ -279,13 +278,8 @@ e_contact_editor_im_init (EContactEditorIm *e_contact_editor_im) gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username")); - /* set the icon */ - icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (e_contact_editor_im), "contact-new"); } static void diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index c0616d9916..ebdc6bf22f 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -3314,7 +3314,6 @@ e_contact_editor_init (EContactEditor *e_contact_editor) { GladeXML *gui; GtkWidget *widget, *label; - char *icon_path; char *gladefile; e_contact_editor->name = e_contact_name_new(); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index b30ece1581..ecae7ed8c3 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include "addressbook/printing/e-contact-print.h" @@ -1476,8 +1475,16 @@ generate_viewoption_menu (EABSearchBarItem *subitems) char *str = NULL; str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); -/* if (subitems[i].image) - gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU)); */ + if (subitems[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + subitems[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); diff --git a/calendar/ChangeLog b/calendar/ChangeLog index feda5578cf..ab39ba4492 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,30 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * gui/alarm-notify/alarm-notify-dialog.c: + * gui/dialogs/alarm-dialog.c: + * gui/dialogs/alarm-list-dialog.c: + * gui/dialogs/cal-attachment-select-file.c: + * gui/dialogs/changed-comp.c: + * gui/dialogs/delete-error.c: + * gui/dialogs/select-source-dialog.c: + Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). + + * gui/dialogs/event-page.c: + * gui/e-timezone-entry.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + + * gui/alarm-notify/alarm-queue.c: + Prefer gtk_status_icon_set_from_icon_name() over + gtk_status_icon_set_from_pixbuf(). + + * gui/e-calendar-table.c: + * gui/e-calendar-view.c: + * gui/e-memo-table.c: + e_activity_handler_operation_started() no longer takes a GdkPixbuf. + It was ignoring the pixbuf anyway ever since we added a spinner icon. + 2008-08-08 Milan Crha ** Fix for bug #544117 diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 3f7ad5fa4a..bfc0375c8f 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -32,7 +32,6 @@ #include "alarm-notify-dialog.h" #include "config-data.h" #include "util.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" @@ -212,8 +211,6 @@ notified_alarms_dialog_new (void) GtkWidget *edit_btn; GtkWidget *snooze_btn; GtkWidget *image; - char *icon_path; - GList *icon_list; GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); AlarmNotificationsDialog *na = NULL; AlarmNotify *an = g_new0 (AlarmNotify, 1); @@ -286,10 +283,9 @@ notified_alarms_dialog_new (void) gtk_widget_realize (an->dialog); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (an->dialog)->action_area), 12); - image = glade_xml_get_widget (an->xml, "alarm-image"); - icon_path = e_icon_factory_get_icon_filename ("stock_alarm", E_ICON_SIZE_DIALOG); - gtk_image_set_from_file (GTK_IMAGE (image), icon_path); - g_free (icon_path); + image = glade_xml_get_widget (an->xml, "alarm-image"); + gtk_image_set_from_icon_name ( + GTK_IMAGE (image), "stock_alarm", GTK_ICON_SIZE_DIALOG); g_signal_connect (edit_btn, "clicked", G_CALLBACK (edit_pressed_cb), an); g_signal_connect (snooze_btn, "clicked", G_CALLBACK (snooze_pressed_cb), an); @@ -298,12 +294,8 @@ notified_alarms_dialog_new (void) if (!GTK_WIDGET_REALIZED (an->dialog)) gtk_widget_realize (an->dialog); - icon_list = e_icon_factory_get_icon_list ("stock_alarm"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (an->dialog), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + + gtk_window_set_icon_name (GTK_WINDOW (an->dialog), "stock_alarm"); /* Set callback for updating the snooze "minutes" label */ g_signal_connect (G_OBJECT (an->snooze_time_min), "value_changed", diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index 219dfdc82d..720a757eed 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -35,7 +35,6 @@ #include #include -#include #include #include @@ -1384,19 +1383,18 @@ static gboolean tray_icon_blink_cb (gpointer data) { static gboolean tray_blink_state = FALSE; - GdkPixbuf *pixbuf; + const gchar *icon_name; tray_blink_countdown--; tray_blink_state = !tray_blink_state; - pixbuf = e_icon_factory_get_icon ((tray_blink_state || tray_blink_countdown <= 0)? - "stock_appointment-reminder-excl" : - "stock_appointment-reminder", - E_ICON_SIZE_LARGE_TOOLBAR); + if (tray_blink_state || tray_blink_countdown <= 0) + icon_name = "stock_appointment-reminder-excl"; + else + icon_name = "stock_appointment-reminder"; if (tray_icon) - gtk_status_icon_set_from_pixbuf (tray_icon, pixbuf); - g_object_unref (pixbuf); + gtk_status_icon_set_from_icon_name (tray_icon, icon_name); if (tray_blink_countdown <= 0) tray_blink_id = -1; @@ -1480,7 +1478,8 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa, /* create the tray icon */ if (tray_icon == NULL) { tray_icon = gtk_status_icon_new (); - gtk_status_icon_set_from_pixbuf (tray_icon, e_icon_factory_get_icon ("stock_appointment-reminder", E_ICON_SIZE_LARGE_TOOLBAR)); + gtk_status_icon_set_from_icon_name ( + tray_icon, "stock_appointment-reminder"); g_signal_connect (G_OBJECT (tray_icon), "activate", G_CALLBACK (icon_activated), NULL); g_signal_connect (G_OBJECT (tray_icon), "popup-menu", diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c index 450854b7b7..8c7a783fe8 100644 --- a/calendar/gui/cal-search-bar.c +++ b/calendar/gui/cal-search-bar.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -546,8 +545,16 @@ generate_viewoption_menu (CALSearchBarItem *subitems) char *str = NULL; str = e_str_without_underscores (subitems[i].search.text); menu_item = gtk_image_menu_item_new_with_label (str); -/* if (subitems[i].image) - gtk_image_menu_item_set_image (menu_item, e_icon_factory_get_image (subitems[i].image, E_ICON_SIZE_MENU));*/ + if (subitems[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + subitems[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c index b30729c554..4dff00825c 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -54,7 +54,6 @@ #include "dialogs/event-editor.h" #include "misc/e-info-label.h" #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #include "e-cal-menu.h" #include "e-cal-popup.h" diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c index 48402bbab3..11642e3e47 100644 --- a/calendar/gui/dialogs/alarm-dialog.c +++ b/calendar/gui/dialogs/alarm-dialog.c @@ -37,7 +37,6 @@ #include #include #include "e-util/e-dialog-widgets.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" #include #include @@ -1142,7 +1141,6 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) { Dialog dialog; int response_id; - GList *icon_list; char *gladefile; g_return_val_if_fail (alarm != NULL, FALSE); @@ -1178,12 +1176,8 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12); - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (dialog.toplevel), "x-office-calendar"); gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel), GTK_WINDOW (parent)); diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c index 8bce8f0eaa..8066061993 100644 --- a/calendar/gui/dialogs/alarm-list-dialog.c +++ b/calendar/gui/dialogs/alarm-list-dialog.c @@ -37,7 +37,6 @@ #include #include #include "e-util/e-dialog-widgets.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" #include "alarm-dialog.h" #include "alarm-list-dialog.h" @@ -263,7 +262,6 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) { Dialog dialog; int response_id; - GList *icon_list; char *gladefile; dialog.ecal = ecal; @@ -293,12 +291,8 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12); - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (dialog.toplevel), "x-office-calendar"); gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel), GTK_WINDOW (parent)); diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c index 2f08acbf07..2d2acb359e 100644 --- a/calendar/gui/dialogs/cal-attachment-select-file.c +++ b/calendar/gui/dialogs/cal-attachment-select-file.c @@ -36,7 +36,6 @@ #include #include "cal-attachment-select-file.h" -#include enum { SELECTOR_MODE_MULTI = (1 << 0), @@ -49,7 +48,6 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho GtkWidget *selection; GtkWidget *showinline = NULL; char *path; - GList *icon_list; path = g_object_get_data ((GObject *) editor, "attach_path"); @@ -90,12 +88,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); gtk_window_set_modal ((GtkWindow *) selection, TRUE); - icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name (GTK_WINDOW (selection), "mail-message-new"); if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) { if (showinline_p) diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index c0cd28f6c0..4e81e79f44 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "e-util/e-error.h" #include "cancel-comp.h" diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index c994fb6303..5f62e54624 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -24,7 +24,6 @@ #include #include -#include #include "changed-comp.h" @@ -48,7 +47,6 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet ECalComponentVType vtype; char *str; gint response; - GList *icon_list; vtype = e_cal_component_get_vtype (comp); @@ -105,12 +103,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str); - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name (GTK_WINDOW (dialog), "x-office-calendar"); response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c index b87a01a58e..228e84f464 100644 --- a/calendar/gui/dialogs/delete-comp.c +++ b/calendar/gui/dialogs/delete-comp.c @@ -23,7 +23,6 @@ #endif #include -#include #include "e-util/e-error.h" #include "../calendar-config.h" #include "delete-comp.h" diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c index d1280da16a..7c264d0638 100644 --- a/calendar/gui/dialogs/delete-error.c +++ b/calendar/gui/dialogs/delete-error.c @@ -25,7 +25,6 @@ #include #include #include -#include #include "delete-error.h" @@ -39,9 +38,9 @@ void delete_error_dialog (GError *error, ECalComponentVType vtype) { - GList *icon_list = NULL; GtkWidget *dialog; const char *str; + const gchar *icon_name = NULL; if (!error) return; @@ -106,15 +105,12 @@ delete_error_dialog (GError *error, ECalComponentVType vtype) GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", str); if (vtype == E_CAL_COMPONENT_EVENT) - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); + icon_name = "x-office-calendar"; else if (vtype == E_CAL_COMPONENT_TODO) - icon_list = e_icon_factory_get_icon_list ("stock_todo"); + icon_name = "stock_todo"; - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + if (icon_name) + gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 1547a67f0e..ca1b581ee6 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -32,7 +32,6 @@ #include #include -#include #include #include #include diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 749951de93..3f30617be6 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -42,7 +42,6 @@ #include "../e-timezone-entry.h" #include #include -#include #include #include "../e-meeting-attendee.h" @@ -688,7 +687,7 @@ create_image_event_box (const char *image_text, const char *tip_text) GtkWidget *image, *box; box = gtk_event_box_new (); - image = e_icon_factory_get_image (image_text, E_ICON_SIZE_MENU); + image = gtk_image_new_from_icon_name (image_text, GTK_ICON_SIZE_MENU); gtk_container_add ((GtkContainer *) box, image); gtk_widget_show_all (box); diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c index a669dfcafc..9cc6c57fe3 100644 --- a/calendar/gui/dialogs/select-source-dialog.c +++ b/calendar/gui/dialogs/select-source-dialog.c @@ -23,7 +23,6 @@ #endif #include -#include #include #include "select-source-dialog.h" @@ -40,7 +39,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type) ESource *selected_source = NULL; const char *gconf_key; GConfClient *conf_client; - GList *icon_list = NULL; + const gchar *icon_name = NULL; if (obj_type == E_CAL_SOURCE_TYPE_EVENT) gconf_key = "/apps/evolution/calendar/sources"; @@ -58,17 +57,14 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type) dialog = e_source_selector_dialog_new (parent, source_list); if (obj_type == E_CAL_SOURCE_TYPE_EVENT) - icon_list = e_icon_factory_get_icon_list ("x-office-calendar"); + icon_name = "x-office-calendar"; else if (obj_type == E_CAL_SOURCE_TYPE_TODO) - icon_list = e_icon_factory_get_icon_list ("stock_todo"); + icon_name = "stock_todo"; else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL) - icon_list = e_icon_factory_get_icon_list ("stock_journal"); + icon_name = "stock_journal"; - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + if (icon_name) + gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name); if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) { selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog)); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 7e2994499a..1d947ead13 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c index 4038c73c04..71c8cfae1f 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1836,10 +1836,6 @@ static char *test[] = { #endif -/* Displays messages on the status bar */ -#define EVOLUTION_TASKS_PROGRESS_IMAGE "stock_todo" -static GdkPixbuf *progress_icon = NULL; - void e_calendar_table_set_activity_handler (ECalendarTable *cal_table, EActivityHandler *activity_handler) { @@ -1864,11 +1860,8 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes } else if (cal_table->activity_id == 0) { char *client_id = g_strdup_printf ("%p", cal_table); - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_TASKS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS); - - cal_table->activity_id = e_activity_handler_operation_started (cal_table->activity_handler, client_id, - progress_icon, message, TRUE); + cal_table->activity_id = e_activity_handler_operation_started ( + cal_table->activity_handler, client_id, message, TRUE); g_free (client_id); } else { diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 8fa9c61830..51507fa2aa 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -61,10 +61,6 @@ #include "e-cal-popup.h" #include "misc.h" -/* Used for the status bar messages */ -#define EVOLUTION_CALENDAR_PROGRESS_IMAGE "x-office-calendar" -static GdkPixbuf *progress_icon = NULL; - struct _ECalendarViewPrivate { /* The GnomeCalendar we are associated to */ GnomeCalendar *calendar; @@ -582,10 +578,8 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag } else if (priv->activity_id == 0) { char *client_id = g_strdup_printf ("%p", cal_view); - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_CALENDAR_PROGRESS_IMAGE, E_ICON_SIZE_STATUS); - - priv->activity_id = e_activity_handler_operation_started (priv->activity_handler, client_id, progress_icon, message, TRUE); + priv->activity_id = e_activity_handler_operation_started ( + priv->activity_handler, client_id, message, TRUE); g_free (client_id); } else { diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 9ce7993101..98f17a7121 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1095,10 +1095,6 @@ static char *test[] = { #endif -/* Displays messages on the status bar */ -#define EVOLUTION_MEMOS_PROGRESS_IMAGE "stock_notes" -static GdkPixbuf *progress_icon = NULL; - void e_memo_table_set_activity_handler (EMemoTable *memo_table, EActivityHandler *activity_handler) { @@ -1123,11 +1119,8 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) } else if (memo_table->activity_id == 0) { char *client_id = g_strdup_printf ("%p", memo_table); - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon (EVOLUTION_MEMOS_PROGRESS_IMAGE, E_ICON_SIZE_STATUS); - - memo_table->activity_id = e_activity_handler_operation_started (memo_table->activity_handler, client_id, - progress_icon, message, TRUE); + memo_table->activity_id = e_activity_handler_operation_started ( + memo_table->activity_handler, client_id, message, TRUE); g_free (client_id); } else { diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c index d361e622b2..d0c57dc0d3 100644 --- a/calendar/gui/e-timezone-entry.c +++ b/calendar/gui/e-timezone-entry.c @@ -33,7 +33,6 @@ #include #include #include "e-timezone-entry.h" -#include struct _ETimezoneEntryPrivate { /* The current timezone, set in e_timezone_entry_set_timezone() @@ -106,7 +105,7 @@ static void e_timezone_entry_init (ETimezoneEntry *tentry) { ETimezoneEntryPrivate *priv; - GtkWidget *gtk_image; + GtkWidget *image; AtkObject *a11y; tentry->priv = priv = g_new0 (ETimezoneEntryPrivate, 1); @@ -130,9 +129,10 @@ e_timezone_entry_init (ETimezoneEntry *tentry) atk_object_set_name (a11y, _("Select Timezone")); } - gtk_image = e_icon_factory_get_image ("stock_timezone", E_ICON_SIZE_BUTTON); - gtk_container_add (GTK_CONTAINER (priv->button), gtk_image); - gtk_widget_show (gtk_image); + image = gtk_image_new_from_icon_name ( + "stock_timezone", GTK_ICON_SIZE_BUTTON); + gtk_container_add (GTK_CONTAINER (priv->button), image); + gtk_widget_show (image); } diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index d0d17b0945..31280d52cb 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -51,7 +51,6 @@ #include "dialogs/copy-source-dialog.h" #include "dialogs/memo-editor.h" #include "widgets/misc/e-info-label.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-error.h" #include "calendar-component.h" diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c index 51125a31cb..e7f9132665 100644 --- a/calendar/gui/memos-control.c +++ b/calendar/gui/memos-control.c @@ -35,8 +35,8 @@ #include #include #include -#include #include +#include #include #include "calendar-config.h" diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index b7f6cc6ea2..d976202a8c 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -52,7 +52,6 @@ #include "dialogs/task-editor.h" #include "misc/e-info-label.h" #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #define CREATE_TASK_ID "task" #define CREATE_TASK_ASSIGNED_ID "task-assigned" diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c index 7a61cf1eae..26927cb412 100644 --- a/calendar/gui/tasks-control.c +++ b/calendar/gui/tasks-control.c @@ -34,8 +34,8 @@ #include #include #include -#include #include +#include #include #include "dialogs/cal-prefs-dialog.h" #include "calendar-config.h" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 6ccbde98f6..e1615073e6 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -110,7 +110,6 @@ #include "e-composer-header-table.h" #include "evolution-shell-component-utils.h" -#include #ifdef HAVE_XFREE #include diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 785383c11b..bd5c7e3e76 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,17 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * e-gui-utils.c: + * e-popup.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + + * e-icon-factory.c (e_icon_factory_get_image): + Kill this function. Use gtk_image_new_from_icon_name(). + + * e-icon-factory.c (e_icon_factory_get_icon_list): + Kill this function. Use gtk_window_set_icon_name(). + 2008-07-31 Matthew Barnes ** Fixes part of bug #545568 diff --git a/e-util/e-config.c b/e-util/e-config.c index 939ade0380..b10a11fd20 100644 --- a/e-util/e-config.c +++ b/e-util/e-config.c @@ -35,8 +35,6 @@ #include "e-config.h" -#include - #include #define d(x) diff --git a/e-util/e-event.c b/e-util/e-event.c index e105bc1aa7..f8d634feec 100644 --- a/e-util/e-event.c +++ b/e-util/e-event.c @@ -31,8 +31,6 @@ #include "e-event.h" -#include - #include #include diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c index c354597153..c4fef1ba16 100644 --- a/e-util/e-gui-utils.c +++ b/e-util/e-gui-utils.c @@ -18,7 +18,6 @@ #include #include "e-gui-utils.h" -#include #include #include @@ -62,7 +61,8 @@ GtkWidget *e_create_image_widget(gchar *name, GtkWidget *w; if (string1) { - w = e_icon_factory_get_image (string1, E_ICON_SIZE_DIALOG); + w = gtk_image_new_from_icon_name ( + string1, GTK_ICON_SIZE_DIALOG); gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5); diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index 457735f90b..2ca724c5f2 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -353,62 +353,6 @@ e_icon_factory_get_icon (const char *icon_name, int icon_size) return pixbuf; } -GtkWidget * -e_icon_factory_get_image (const char *icon_name, int icon_size) -{ - GdkPixbuf *pixbuf; - GtkWidget *image; - - pixbuf = e_icon_factory_get_icon (icon_name, icon_size); - image = gtk_image_new_from_pixbuf (pixbuf); - g_object_unref (pixbuf); - - return image; -} - -/** - * e_icon_factory_get_icon_list: - * @icon_name: name of the icon - * - * Returns a list of GdkPixbufs of the requested name suitable for - * gtk_window_set_icon_list(). - **/ -GList * -e_icon_factory_get_icon_list (const char *icon_name) -{ - static int icon_list_sizes[] = { 128, 64, 48, 32, 16 }; - GList *list = NULL; - char *icon_key; - Icon *icon; - int size, i; - - if (!icon_name || !strcmp (icon_name, "")) - return NULL; - - g_static_mutex_lock (&mutex); - - icon_key = g_alloca (strlen (icon_name) + 9); - - for (i = 0; i < G_N_ELEMENTS (icon_list_sizes); i++) { - size = icon_list_sizes[i]; - sprintf (icon_key, "%dx%d/%s", size, size, icon_name); - - if (!(icon = g_hash_table_lookup (name_to_icon, icon_key))) { - if ((icon = load_icon (icon_key, icon_name, size, FALSE))) - g_hash_table_insert (name_to_icon, icon->name, icon); - } - - if (icon && icon->pixbuf) { - list = g_list_prepend (list, icon->pixbuf); - g_object_ref (icon->pixbuf); - } - } - - g_static_mutex_unlock (&mutex); - - return list; -} - /** * e_icon_factory_pixbuf_scale * Scales pixbuf to desired size. diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h index 1a0954966e..9cecbbd116 100644 --- a/e-util/e-icon-factory.h +++ b/e-util/e-icon-factory.h @@ -50,10 +50,6 @@ char *e_icon_factory_get_icon_filename (const char *icon_name, int icon_siz GdkPixbuf *e_icon_factory_get_icon (const char *icon_name, int icon_size); -GtkWidget *e_icon_factory_get_image (const char *icon_name, int icon_size); - -GList *e_icon_factory_get_icon_list (const char *icon_name); - GdkPixbuf *e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, int width, int height); #endif /* _E_ICON_FACTORY_H_ */ diff --git a/e-util/e-import.c b/e-util/e-import.c index 88a75ac422..da4fffb346 100644 --- a/e-util/e-import.c +++ b/e-util/e-import.c @@ -35,8 +35,6 @@ #include "e-import.h" -#include - #include #define d(x) diff --git a/e-util/e-popup.c b/e-util/e-popup.c index f411c2d249..1d2e808bc3 100644 --- a/e-util/e-popup.c +++ b/e-util/e-popup.c @@ -31,8 +31,6 @@ #include "e-popup.h" -#include - #include #define d(x) @@ -357,12 +355,8 @@ ep_build_tree(struct _item_node *inode, guint32 mask) if (item->image) { GtkWidget *image; - /* work-around e-icon-factory not doing GTK_STOCK stuff */ - if (strncmp((char *)item->image, "gtk-", 4) == 0) - image = gtk_image_new_from_stock((char *)item->image, GTK_ICON_SIZE_MENU); - else - image = e_icon_factory_get_image((char *)item->image, E_ICON_SIZE_MENU); - + image = gtk_image_new_from_icon_name ( + (gchar *) item->image, GTK_ICON_SIZE_MENU); gtk_widget_show(image); menuitem = (GtkMenuItem *)gtk_image_menu_item_new(); gtk_image_menu_item_set_image((GtkImageMenuItem *)menuitem, image); diff --git a/mail/ChangeLog b/mail/ChangeLog index ae6c4780f3..84dff3cac6 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,22 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * em-folder-browser.c: + * em-format-html-display.c: + * mail-send-recv.c: + * message-tag-followup.c: + Prefer gtk_image_new_from_icon_name() over e_icon_factory_get_image(). + + * mail-send-recv.c: + * message-tag-followup.c: + Prefer gtk_window_set_icon_name() over gtk_window_set_icon_list(). + + * mail-mt.c: + e_activity_handler_cancelable_operation_started() no longer takes a + GdkPixbuf. It was ignoring the pixbuf anyway ever since we added a + spinner icon. + 2008-08-11 Milan Crha ** Fix for bug #519292 diff --git a/mail/em-config.c b/mail/em-config.c index f350074701..b4e9e3c981 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -33,7 +33,6 @@ #include "em-config.h" #include "libedataserver/e-msgport.h" -#include #include "em-utils.h" #include "em-composer-utils.h" diff --git a/mail/em-event.c b/mail/em-event.c index 2ce8d8afc0..950f2488fb 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -32,7 +32,6 @@ #include "em-event.h" #include "composer/e-msg-composer.h" #include "libedataserver/e-msgport.h" -#include #include #include diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index d1d03dc47e..fff9fa7c98 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -293,10 +293,19 @@ generate_viewoption_menu (GtkWidget *emfv) for (i = 0; emfb_view_items[i].search.id != -1; ++i) { if (emfb_view_items[i].search.text) { char *str; + str = e_str_without_underscores (_(emfb_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (emfb_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (emfb_view_items[i].image, E_ICON_SIZE_MENU)); + if (emfb_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + emfb_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); @@ -351,8 +360,16 @@ generate_viewoption_menu (GtkWidget *emfv) char *str; str = e_str_without_underscores (_(temp_view_items[i].search.text)); menu_item = gtk_image_menu_item_new_with_label (str); - if (temp_view_items[i].image) - gtk_image_menu_item_set_image ((GtkImageMenuItem *)menu_item, e_icon_factory_get_image (temp_view_items[i].image, E_ICON_SIZE_MENU)); + if (temp_view_items[i].image) { + GtkWidget *image; + + image = gtk_image_new_from_icon_name ( + temp_view_items[i].image, + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image ( + GTK_IMAGE_MENU_ITEM (menu_item), + image); + } g_free (str); } else { menu_item = gtk_menu_item_new (); diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 551d14bcec..b1ec99f25e 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -51,7 +51,6 @@ #include "e-util/e-mktemp.h" #include "e-util/e-request.h" -#include "e-util/e-icon-factory.h" #include "e-util/e-error.h" diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index d548418493..58d0563887 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -31,8 +31,6 @@ #include "em-format-hook.h" -#include - #include 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); diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index d2bf9983f9..0b63334d41 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -29,7 +29,6 @@ #include #include "em-junk-hook.h" #include "mail-session.h" -#include #include "e-util/e-error.h" #include "em-utils.h" #include diff --git a/mail/em-menu.c b/mail/em-menu.c index a6a60af235..e8021e1bea 100644 --- a/mail/em-menu.c +++ b/mail/em-menu.c @@ -33,7 +33,6 @@ #include "em-menu.h" #include "libedataserver/e-msgport.h" -#include #include "em-utils.h" #include "em-composer-utils.h" diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 31b703864a..2f3f85d791 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -42,7 +42,6 @@ #include "e-util/e-error.h" #include "e-util/e-util-private.h" -#include "e-util/e-icon-factory.h" #include "mail-config.h" #include "em-config.h" diff --git a/mail/em-popup.c b/mail/em-popup.c index 76e59daad3..10fae903be 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -35,7 +35,6 @@ #include "em-popup.h" #include "libedataserver/e-msgport.h" -#include #include "em-utils.h" #include "em-composer-utils.h" diff --git a/mail/mail-mt.c b/mail/mail-mt.c index d147132689..9657da5f13 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -71,8 +71,6 @@ struct _MailMsgPrivate { gboolean cancelable; }; -static GdkPixbuf *progress_icon = NULL; - /* mail_msg stuff */ #ifdef LOG_OPS static FILE *log; @@ -983,9 +981,6 @@ op_status_exec (struct _op_status_msg *m) } else { data->activity_state = 1; - if (progress_icon == NULL) - progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - MAIL_MT_UNLOCK (mail_msg_lock); if (msg->info->desc) what = msg->info->desc (msg); @@ -996,7 +991,7 @@ op_status_exec (struct _op_status_msg *m) what = g_strdup(""); } - data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", progress_icon, what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel); + data->activity_id = e_activity_handler_cancelable_operation_started (activity_handler, "evolution-mail", what, TRUE, (void (*) (gpointer)) camel_operation_cancel, msg->cancel); g_free (what); MAIL_MT_LOCK (mail_msg_lock); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index ab4cc41006..588d1287ae 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -46,7 +46,6 @@ #include "mail-send-recv.h" #include "mail-folder-cache.h" #include "em-event.h" -#include #include #define d(x) @@ -379,7 +378,6 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati char *pretty_url; EAccount *account; EIterator *iter; - GList *icon_list; EMEventTargetSendReceive *target; gd = (GtkDialog *)(send_recv_dialog = gtk_dialog_new_with_buttons(_("Send & Receive Mail"), NULL, GTK_DIALOG_NO_SEPARATOR, NULL)); @@ -401,12 +399,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati gtk_widget_show (cancel_button); gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL); - icon_list = e_icon_factory_get_icon_list ("mail-send-receive"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name (GTK_WINDOW (gd), "mail-send-receive"); num_sources = 0; @@ -487,8 +480,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - recv_icon = e_icon_factory_get_image ( - "mail-inbox", E_ICON_SIZE_LARGE_TOOLBAR); + recv_icon = gtk_image_new_from_icon_name ( + "mail-inbox", GTK_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url, account->name); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( @@ -564,8 +557,8 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati } else if (info->timeout_id == 0) info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - send_icon = e_icon_factory_get_image ( - "mail-outbox", E_ICON_SIZE_LARGE_TOOLBAR); + send_icon = gtk_image_new_from_icon_name ( + "mail-outbox", GTK_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); label = gtk_label_new (NULL); gtk_label_set_ellipsize ( diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 48f55456e4..52fc313e30 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -35,7 +35,6 @@ #include #include -#include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" #include "misc/e-dateedit.h" @@ -271,19 +270,13 @@ construct (MessageTagEditor *editor) GtkWidget *widget; GList *strings; GladeXML *gui; - GList *icon_list; - GdkPixbuf *pixbuf; int i; char *gladefile; gtk_window_set_title (GTK_WINDOW (editor), _("Flag to Follow Up")); - icon_list = e_icon_factory_get_icon_list ("stock_mail-flag-for-followup"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (editor), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); - g_list_free (icon_list); - } + gtk_window_set_icon_name ( + GTK_WINDOW (editor), "stock_mail-flag-for-followup"); gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0); @@ -302,9 +295,9 @@ construct (MessageTagEditor *editor) gtk_box_set_child_packing (GTK_BOX (GTK_DIALOG (editor)->vbox), widget, TRUE, TRUE, 6, GTK_PACK_START); widget = glade_xml_get_widget (gui, "pixmap"); - pixbuf = e_icon_factory_get_icon ("stock_mail-flag-for-followup", E_ICON_SIZE_DIALOG); - gtk_image_set_from_pixbuf ((GtkImage *)widget, pixbuf); - g_object_unref (pixbuf); + gtk_image_set_from_icon_name ( + GTK_IMAGE (widget), "stock_mail-flag-for-followup", + GTK_ICON_SIZE_DIALOG); followup->message_list = GTK_TREE_VIEW (glade_xml_get_widget (gui, "message_list")); model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); 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" diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c index 146ceb26a6..1dfac47561 100644 --- a/shell/e-component-registry.c +++ b/shell/e-component-registry.c @@ -26,8 +26,6 @@ #include "e-component-registry.h" -#include - #include #include diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index daa9794e3b..a71c3f3ab3 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -31,7 +31,6 @@ #include "e-shell-view.h" #include "e-shell-window.h" -#include "e-util/e-icon-factory.h" static BonoboObjectClass *parent_class = NULL; diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c index a9f46205bb..eaf3fbd82e 100644 --- a/shell/e-shell-window-commands.c +++ b/shell/e-shell-window-commands.c @@ -39,9 +39,9 @@ #include -#include "e-util/e-icon-factory.h" #include "e-util/e-dialog-utils.h" #include "e-util/e-error.h" +#include "e-util/e-icon-factory.h" #include "e-util/e-print.h" #include "e-util/e-util-private.h" diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 6833cf44d6..5f7fd73f51 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,18 @@ +2008-08-11 Matthew Barnes + + ** Fixes part of bug #546892 + + * e-combo-button.c: + * e-info-label.c: + * e-url-entry.c: + * e-task-widget.c: + Prefer gtk_image_new_from_stock() over e_icon_factory_get_image(). + + * e-activity-handler.c: + * e-task-widget.c: + Purge the GdkPixbuf arguments from the API. We've been ignoring + them since the spinner icon was added. + 2008-07-23 Milan Crha ** Part of fix for bug #543943 diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 04861b1b8f..d7972ac336 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -39,7 +39,6 @@ struct _ActivityInfo { char *component_id; - GdkPixbuf *icon_pixbuf; int error_type; guint id; char *information; @@ -131,7 +130,6 @@ task_widget_button_press_event_callback (GtkWidget *widget, static ActivityInfo * activity_info_new (const char *component_id, guint id, - GdkPixbuf *icon, const char *information, gboolean cancellable) { @@ -140,7 +138,6 @@ activity_info_new (const char *component_id, info = g_new (ActivityInfo, 1); info->component_id = g_strdup (component_id); info->id = id; - info->icon_pixbuf = icon ? g_object_ref (icon): NULL; info->information = g_strdup (information); info->cancellable = cancellable; info->progress = -1.0; /* (Unknown) */ @@ -155,9 +152,6 @@ static void activity_info_free (ActivityInfo *info) { g_free (info->component_id); - - if (info->icon_pixbuf) - g_object_unref (info->icon_pixbuf); g_free (info->information); if (info->menu != NULL) @@ -172,9 +166,11 @@ task_widget_new_from_activity_info (ActivityInfo *activity_info) GtkWidget *widget; ETaskWidget *etw; - widget = e_task_widget_new_with_cancel (activity_info->icon_pixbuf, - activity_info->component_id, - activity_info->information, activity_info->cancel_func, activity_info->data); + widget = e_task_widget_new_with_cancel ( + activity_info->component_id, + activity_info->information, + activity_info->cancel_func, + activity_info->data); etw = (ETaskWidget *) widget; etw->id = activity_info->id; gtk_widget_show (widget); @@ -411,7 +407,6 @@ cancel_wrapper (gpointer pdata) /* CORBA methods. */ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, const char *component_id, - GdkPixbuf *icon_pixbuf, const char *information, gboolean cancellable, void (*cancel_func)(gpointer), @@ -426,7 +421,7 @@ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activ priv = activity_handler->priv; activity_id = get_new_activity_id (activity_handler); - activity_info = activity_info_new (component_id, activity_id, icon_pixbuf, information, cancellable); + activity_info = activity_info_new (component_id, activity_id, information, cancellable); data = g_new(struct _cancel_wdata, 1); data->handler = activity_handler; @@ -457,7 +452,6 @@ guint e_activity_handler_cancelable_operation_started (EActivityHandler *activ guint e_activity_handler_operation_started (EActivityHandler *activity_handler, const char *component_id, - GdkPixbuf *icon_pixbuf, const char *information, gboolean cancellable) { @@ -470,7 +464,7 @@ e_activity_handler_operation_started (EActivityHandler *activity_handler, activity_id = get_new_activity_id (activity_handler); - activity_info = activity_info_new (component_id, activity_id, icon_pixbuf, information, cancellable); + activity_info = activity_info_new (component_id, activity_id, information, cancellable); for (p = priv->task_bars; p != NULL; p = p->next) { ETaskWidget *tw = task_widget_new_from_activity_info (activity_info); @@ -558,7 +552,7 @@ e_activity_handler_make_error (EActivityHandler *activity_handler, priv = activity_handler->priv; activity_id = get_new_activity_id (activity_handler); - activity_info = activity_info_new (component_id, activity_id, NULL, information, TRUE); + activity_info = activity_info_new (component_id, activity_id, information, TRUE); activity_info->error = error; activity_info->error_time = time (NULL); activity_info->error_type = error_type; diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h index 49f7742026..8b6a857569 100644 --- a/widgets/misc/e-activity-handler.h +++ b/widgets/misc/e-activity-handler.h @@ -71,12 +71,10 @@ void e_activity_handler_unset_message (EActivityHandler *activity_handler); guint e_activity_handler_operation_started (EActivityHandler *activity_handler, const char *component_id, - GdkPixbuf *icon_pixbuf, const char *information, gboolean cancellable); guint e_activity_handler_cancelable_operation_started (EActivityHandler *activity_handler, const char *component_id, - GdkPixbuf *icon_pixbuf, const char *information, gboolean cancellable, void (*cancel_func)(gpointer), diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c index 65014900c6..6fc0fec57e 100644 --- a/widgets/misc/e-combo-button.c +++ b/widgets/misc/e-combo-button.c @@ -26,7 +26,6 @@ #include "e-combo-button.h" #include "ea-widgets.h" -#include struct _EComboButtonPrivate { GdkPixbuf *icon; @@ -461,7 +460,8 @@ e_combo_button_pack_hbox (EComboButton *combo_button) gtk_container_add (GTK_CONTAINER (combo_button), priv->hbox); gtk_widget_show (priv->hbox); - priv->icon_image = e_icon_factory_get_image (NULL, E_ICON_SIZE_MENU); + priv->icon_image = gtk_image_new_from_stock ( + GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (priv->hbox), priv->icon_image, TRUE, TRUE, 0); gtk_widget_show (priv->icon_image); @@ -498,7 +498,8 @@ e_combo_button_pack_vbox (EComboButton *combo_button) priv->vbox = gtk_vbox_new (FALSE, 0); gtk_widget_show (priv->vbox); - priv->icon_image = e_icon_factory_get_image (NULL, E_ICON_SIZE_MENU); + priv->icon_image = gtk_image_new_from_stock ( + GTK_STOCK_MISSING_IMAGE, GTK_ICON_SIZE_MENU); gtk_box_pack_start (GTK_BOX (priv->vbox), priv->icon_image, TRUE, TRUE, 0); gtk_widget_show (priv->icon_image); diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c index 3e8691972d..4c3c04069f 100644 --- a/widgets/misc/e-info-label.c +++ b/widgets/misc/e-info-label.c @@ -27,8 +27,6 @@ #include "e-info-label.h" -#include - static GtkHBoxClass *el_parent; static void @@ -184,10 +182,8 @@ e_info_label_new(const char *icon) { EInfoLabel *el = g_object_new(e_info_label_get_type(), NULL); GtkWidget *image; - char *name = e_icon_factory_get_icon_filename (icon, E_ICON_SIZE_MENU); - image = gtk_image_new_from_file(name); - g_free(name); + image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_MENU); gtk_misc_set_padding((GtkMisc *)image, 6, 6); gtk_box_pack_start((GtkBox *)el, image, FALSE, TRUE, 0); gtk_widget_show(image); diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index ffef719f17..bd8ba20072 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -45,7 +45,6 @@ #include "e-search-bar.h" #include "e-util/e-util.h" #include "e-util/e-util-marshal.h" -#include "e-util/e-icon-factory.h" enum { diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c index 74b0ba6891..bb2ec2747e 100644 --- a/widgets/misc/e-task-widget.c +++ b/widgets/misc/e-task-widget.c @@ -26,7 +26,6 @@ #include "e-task-widget.h" #include "e-spinner.h" -#include #include @@ -36,7 +35,6 @@ struct _ETaskWidgetPrivate { char *component_id; - GdkPixbuf *icon_pixbuf; GtkWidget *label; GtkWidget *box; GtkWidget *image; @@ -49,24 +47,6 @@ G_DEFINE_TYPE (ETaskWidget, e_task_widget, GTK_TYPE_EVENT_BOX) /* GObject methods. */ -static void -impl_dispose (GObject *object) -{ - ETaskWidget *task_widget; - ETaskWidgetPrivate *priv; - - task_widget = E_TASK_WIDGET (object); - - priv = task_widget->priv; - - if (priv->icon_pixbuf != NULL) { - g_object_unref (priv->icon_pixbuf); - priv->icon_pixbuf = NULL; - } - - (* G_OBJECT_CLASS (e_task_widget_parent_class)->dispose) (object); -} - static void impl_finalize (GObject *object) { @@ -88,7 +68,6 @@ e_task_widget_class_init (ETaskWidgetClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } @@ -100,7 +79,6 @@ e_task_widget_init (ETaskWidget *task_widget) priv = g_new (ETaskWidgetPrivate, 1); priv->component_id = NULL; - priv->icon_pixbuf = NULL; priv->label = NULL; priv->image = NULL; priv->box = NULL; @@ -137,15 +115,12 @@ prepare_popup (ETaskWidget *widget, GdkEventButton *event) void e_task_widget_construct (ETaskWidget *task_widget, - GdkPixbuf *icon_pixbuf, const char *component_id, const char *information, void (*cancel_func) (gpointer data), gpointer data) { ETaskWidgetPrivate *priv; - /*GdkPixmap *pixmap; - GdkBitmap *mask;*/ GtkWidget *box; GtkWidget *frame; @@ -169,15 +144,10 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_widget_set_size_request (box, 1, -1); - /* FIXME: Experimenting Spinner widget instead of an image. REWORK THIS */ - /* priv->icon_pixbuf = g_object_ref (icon_pixbuf); */ - - /* gdk_pixbuf_render_pixmap_and_mask (icon_pixbuf, &pixmap, &mask, 128); */ priv->box = gtk_hbox_new (FALSE, 0); priv->image = e_spinner_new (); e_spinner_set_size (E_SPINNER (priv->image), GTK_ICON_SIZE_SMALL_TOOLBAR); e_spinner_start (E_SPINNER (priv->image)); - /* gtk_image_new_from_pixmap (pixmap, mask); */ gtk_widget_show (priv->image); gtk_widget_show (priv->box); gtk_box_pack_start (GTK_BOX (priv->box), priv->image, FALSE, TRUE, 0); @@ -187,9 +157,16 @@ e_task_widget_construct (ETaskWidget *task_widget, gtk_widget_show (priv->label); gtk_box_pack_start (GTK_BOX (box), priv->label, TRUE, TRUE, 0); if (cancel_func) { - GtkWidget *image = e_icon_factory_get_image ("gtk-stop", E_ICON_SIZE_MENU); + GdkPixbuf *pixbuf; + GtkWidget *image; GtkWidget *tool; + pixbuf = gtk_icon_theme_load_icon ( + gtk_icon_theme_get_default (), + "gtk-stop", 16, 0, NULL); + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); + tool = (GtkWidget *) gtk_tool_button_new (image, NULL); gtk_box_pack_end (GTK_BOX (box), tool, FALSE, TRUE, 0); gtk_widget_show_all (tool); @@ -198,9 +175,6 @@ e_task_widget_construct (ETaskWidget *task_widget, priv->cancel_func = cancel_func; priv->data = data; g_signal_connect (tool, "clicked", G_CALLBACK (button_press_event_cb), task_widget); - /* g_object_unref (pixmap); - if (mask) - g_object_unref (mask); */ g_signal_connect (task_widget, "button-press-event", G_CALLBACK (prepare_popup), task_widget); } @@ -209,34 +183,31 @@ e_task_widget_construct (ETaskWidget *task_widget, } GtkWidget * -e_task_widget_new_with_cancel (GdkPixbuf *icon_pixbuf, - const char *component_id, - const char *information, - void (*cancel_func) (gpointer data), - gpointer data) +e_task_widget_new_with_cancel (const char *component_id, + const char *information, + void (*cancel_func) (gpointer data), + gpointer data) { ETaskWidget *task_widget; g_return_val_if_fail (information != NULL, NULL); task_widget = g_object_new (e_task_widget_get_type (), NULL); - e_task_widget_construct (task_widget, icon_pixbuf, component_id, information, cancel_func, data); + e_task_widget_construct (task_widget, component_id, information, cancel_func, data); return GTK_WIDGET (task_widget); } GtkWidget * -e_task_widget_new (GdkPixbuf *icon_pixbuf, - const char *component_id, +e_task_widget_new (const char *component_id, const char *information) { ETaskWidget *task_widget; - g_return_val_if_fail (icon_pixbuf != NULL, NULL); g_return_val_if_fail (information != NULL, NULL); task_widget = g_object_new (e_task_widget_get_type (), NULL); - e_task_widget_construct (task_widget, icon_pixbuf, component_id, information, NULL, NULL); + e_task_widget_construct (task_widget, component_id, information, NULL, NULL); return GTK_WIDGET (task_widget); } @@ -245,14 +216,20 @@ GtkWidget * e_task_widget_update_image (ETaskWidget *task_widget, const char *stock, const char *text) { - GtkWidget *img, *tool; + GtkWidget *image, *tool; + GdkPixbuf *pixbuf; + + pixbuf = gtk_icon_theme_load_icon ( + gtk_icon_theme_get_default (), + stock, 16, 0, NULL); + image = gtk_image_new_from_pixbuf (pixbuf); + g_object_unref (pixbuf); - img = e_icon_factory_get_image (stock, E_ICON_SIZE_MENU); - tool = (GtkWidget *) gtk_tool_button_new (img, NULL); + tool = (GtkWidget *) gtk_tool_button_new (image, NULL); gtk_box_pack_start (GTK_BOX(task_widget->priv->box), tool, FALSE, TRUE, 0); gtk_widget_show_all (task_widget->priv->box); gtk_widget_hide (task_widget->priv->image); - task_widget->priv->image = img; + task_widget->priv->image = image; gtk_label_set_text (GTK_LABEL (task_widget->priv->label), text); return tool; diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h index d82d053b8a..cb63b27379 100644 --- a/widgets/misc/e-task-widget.h +++ b/widgets/misc/e-task-widget.h @@ -53,34 +53,27 @@ struct _ETaskWidgetClass { }; -GType e_task_widget_get_type (void); -void e_task_widget_construct (ETaskWidget *task_widget, - GdkPixbuf *icon_pixbuf, - const char *component_id, - const char *information, - void (*cancel_func) (gpointer data), - gpointer data); -GtkWidget *e_task_widget_new (GdkPixbuf *icon_pixbuf, - const char *component_id, - const char *information); -GtkWidget * -e_task_widget_new_with_cancel (GdkPixbuf *icon_pixbuf, - const char *component_id, - const char *information, - void (*cancel_func) (gpointer data), - gpointer data); - -void e_task_widget_update (ETaskWidget *task_widget, - const char *information, - double completion); -GtkWidget * -e_task_widget_update_image (ETaskWidget *task_widget, - const char *stock, const char *text); - -void e_task_wiget_alert (ETaskWidget *task_widget); -void e_task_wiget_unalert (ETaskWidget *task_widget); - -const char *e_task_widget_get_component_id (ETaskWidget *task_widget); +GType e_task_widget_get_type (void); +void e_task_widget_construct (ETaskWidget *task_widget, + const char *component_id, + const char *information, + void (*cancel_func) (gpointer data), + gpointer data); +GtkWidget * e_task_widget_new (const char *component_id, + const char *information); +GtkWidget * e_task_widget_new_with_cancel (const char *component_id, + const char *information, + void (*cancel_func) (gpointer data), + gpointer data); +void e_task_widget_update (ETaskWidget *task_widget, + const char *information, + double completion); +GtkWidget * e_task_widget_update_image (ETaskWidget *task_widget, + const char *stock, + const char *text); +void e_task_wiget_alert (ETaskWidget *task_widget); +void e_task_wiget_unalert (ETaskWidget *task_widget); +const char * e_task_widget_get_component_id (ETaskWidget *task_widget); #ifdef __cplusplus } diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c index f0ae7c5c4a..9db87b3ecd 100644 --- a/widgets/misc/e-url-entry.c +++ b/widgets/misc/e-url-entry.c @@ -29,7 +29,6 @@ #include #include #include "e-url-entry.h" -#include struct _EUrlEntryPrivate { GtkWidget *entry; @@ -105,7 +104,7 @@ init (EUrlEntry *url_entry) gtk_widget_set_sensitive (priv->button, FALSE); gtk_box_pack_start (GTK_BOX (url_entry), priv->button, FALSE, FALSE, 0); atk_object_set_name (gtk_widget_get_accessible (priv->button), _("Click here to go to URL")); - pixmap = e_icon_factory_get_image ("go-jump", E_ICON_SIZE_BUTTON); + pixmap = gtk_image_new_from_icon_name ("go-jump", GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (priv->button), pixmap); gtk_widget_show (pixmap); diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c index 70b47f9488..890dfc2082 100644 --- a/widgets/misc/test-info-label.c +++ b/widgets/misc/test-info-label.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "e-info-label.h" static void @@ -36,7 +35,6 @@ delete_event_cb (GtkWidget *widget, gpointer data) { gtk_main_quit (); - e_icon_factory_shutdown (); } int @@ -50,7 +48,6 @@ main (int argc, char **argv) gnome_program_init ( "test-title-bar", "0.0", LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_NONE); - e_icon_factory_init (); app = gnome_app_new ("Test", "Test"); gtk_window_set_default_size (GTK_WINDOW (app), 400, 400); -- cgit v1.2.3