From f4cf9af33ccde3142a3011e8b2dbcfb4cbc9ae81 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 20 May 2009 16:50:00 +0200 Subject: Use -no-undefined on Linux too There still left two things opened, search for KILL-BONOBO to find them. One is in calendar's Makefile.am, one in composer. --- plugins/tnef-attachments/Makefile.am | 9 --------- plugins/tnef-attachments/tnef-plugin.c | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'plugins/tnef-attachments') diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 6ea2ce1f3e..f216d7f418 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -1,11 +1,3 @@ -if OS_WIN32 -NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la -endif - INCLUDES = \ -I$(top_srcdir) \ -DGETTEXT_PACKAGE="\"$(GETTEXT_PACKAGE)\"" \ @@ -21,7 +13,6 @@ plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_tnef_attachments_la_LIBADD = \ - $(NO_UNDEFINED_REQUIRED_LIBS) \ -lytnef EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index f0152862f3..6964d07e10 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include #include @@ -160,7 +160,7 @@ org_gnome_format_tnef(void *ep, EMFormatHookTarget *t) camel_medium_set_content_object((CamelMedium *)part, content); camel_object_unref(content); - type = em_utils_snoop_type(part); + type = em_format_snoop_type(part); if (type) camel_data_wrapper_set_mime_type((CamelDataWrapper *)part, type); -- cgit v1.2.3