[evolution/kill-bonobo] Get the "prefer-plain" plugin working again.

[Matthew Barnes <mbarnes src gnome org>]

commit e26654bf19d9d2b5df889631e6c211af0e7de655
Author: Matthew Barnes <mbarnes redhat com>
Date:   Wed Jun 24 23:26:04 2009 -0400

    Get the "prefer-plain" plugin working again.

 configure.ac                        |    3 +--
 plugins/prefer-plain/prefer-plain.c |   12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 70ca2c2..8cab9ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1790,7 +1790,7 @@ plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS
 all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments"
 
 dnl Temporary KILL-BONOBO hack
-enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
+enable_plugins="attachment-reminder addressbook-file audio-inline bbdb bogo-junk-plugin caldav calendar-file calendar-http default-mailer default-source email-custom-header external-editor face google-account-setup hula-account-setup imap-features mail-notification mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
 
 dnl PLUGINS NOT BUILDING YET
 dnl ------------------------
@@ -1804,7 +1804,6 @@ dnl itip-formatter
 dnl mailing-list-actions
 dnl mail-to-task
 dnl mono
-dnl prefer-plain
 dnl pst-import
 dnl publish-calendar
 dnl python
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index dd7e453..0a1da1f 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -26,16 +26,16 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n-lib.h>
+#include <gconf/gconf-client.h>
 #include <string.h>
 #include <stdio.h>
 
-#include "camel/camel-multipart.h"
-#include "camel/camel-mime-part.h"
-#include "mail/em-format-hook.h"
-#include "mail/em-format.h"
+#include <camel/camel-multipart.h>
+#include <camel/camel-mime-part.h>
 
-#include <gconf/gconf-client.h>
-#include "mail/em-config.h"
+#include <em-format/em-format.h>
+#include <mail/em-config.h>
+#include <mail/em-format-hook.h>
 
 void org_gnome_prefer_plain_multipart_alternative(gpointer ep, EMFormatHookTarget *t);
 void org_gnome_prefer_plain_text_html(gpointer ep, EMFormatHookTarget *t);