diff options
author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-08-15 04:19:12 +0800 |
commit | 7ade227e6409c98a4010992450e111cf7bb10520 (patch) | |
tree | bdd716d894ae2f3b1affaa6bb68950a89441db13 /plugins/itip-formatter | |
parent | cca29c3424aede2bb3c9ec5a6d255ce490d3511b (diff) | |
download | gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.gz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.bz2 gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.lz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.xz gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.tar.zst gsoc2013-evolution-7ade227e6409c98a4010992450e111cf7bb10520.zip |
Merge revisions 35951:35992 from trunk.
svn path=/branches/kill-bonobo/; revision=35994
Diffstat (limited to 'plugins/itip-formatter')
-rw-r--r-- | plugins/itip-formatter/ChangeLog | 7 | ||||
-rw-r--r-- | plugins/itip-formatter/itip-formatter.c | 1 | ||||
-rw-r--r-- | plugins/itip-formatter/itip-view.c | 6 |
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 d89d74ccf5..3e200ac873 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); |