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/import-ics-attachments | |
| 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/import-ics-attachments')
| -rw-r--r-- | plugins/import-ics-attachments/ChangeLog | 12 | ||||
| -rw-r--r-- | plugins/import-ics-attachments/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/import-ics-attachments/icsimporter.c | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/plugins/import-ics-attachments/ChangeLog b/plugins/import-ics-attachments/ChangeLog index 68a87d906b..f2e73712c5 100644 --- a/plugins/import-ics-attachments/ChangeLog +++ b/plugins/import-ics-attachments/ChangeLog @@ -1,3 +1,15 @@ +2008-08-12 Bharath Acharya <abharath@novell.com> + + * Makefile.am: Added necessary libraries to link to. Build break while + compiling on Windows. + +2008-08-11 Matthew Barnes <mbarnes@redhat.com> + + ** 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 <mcrha@redhat.com> ** Part of fix for bug #526739 diff --git a/plugins/import-ics-attachments/Makefile.am b/plugins/import-ics-attachments/Makefile.am index 30331d0c01..7f7caf3a21 100644 --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -24,6 +24,8 @@ liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module -avoid-v liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml 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 <camel/camel-vee-folder.h> #include "e-util/e-error.h" -#include "e-util/e-icon-factory.h" #include <libedataserverui/e-source-selector.h> #include <libecal/e-cal.h> #include <libical/icalvcal.h> @@ -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); |