diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /plugins/tnef-attachments/tnef-plugin.c | |
parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'plugins/tnef-attachments/tnef-plugin.c')
-rw-r--r-- | plugins/tnef-attachments/tnef-plugin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index c03dd39d68..3e537e1dca 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -46,7 +46,7 @@ #include <camel/camel-multipart.h> #include <camel/camel-stream-fs.h> -#include <mail/em-format.h> +#include <em-format/em-format.h> #include <mail/em-format-hook.h> #include <mail/em-utils.h> #include <e-util/e-error.h> @@ -158,7 +158,7 @@ org_gnome_format_tnef(gpointer 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); @@ -192,10 +192,10 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t) g_free(tmpdir); } -gint e_plugin_lib_enable(EPluginLib *ep, gint enable); +gint e_plugin_lib_enable(EPlugin *ep, gint enable); gint -e_plugin_lib_enable(EPluginLib *ep, gint enable) +e_plugin_lib_enable(EPlugin *ep, gint enable) { if (loaded) return 0; |