Get the "templates" plugin working again.

2 files changed, 10 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index 988b4d8f1b..70ca2c2550 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 $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 profiler sa-junk-plugin save-calendar subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
 
 dnl PLUGINS NOT BUILDING YET
 dnl ------------------------
@@ -1809,7 +1809,6 @@ dnl pst-import
 dnl publish-calendar
 dnl python
 dnl startup-wizard
-dnl templates
 
 case x"$enable_plugins" in
 xno)
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 53669ba347..ae479fb41e 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -34,10 +34,10 @@
 #include <camel/camel-multipart.h>
 #include <camel/camel-stream-mem.h>
 
+#include <mail/e-mail-local.h>
 #include <mail/em-composer-utils.h>
 #include <mail/em-popup.h>
 #include <mail/mail-session.h>
-#include <mail/mail-component.h>
 #include <mail/mail-ops.h>
 #include <e-util/e-error.h>
 #include <e-util/e-plugin.h>
@@ -506,7 +506,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data)
 	gchar *cont;
 
 	/* We get the templates folder and all the uids of the messages in there */
-	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
+	templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
 
 	/* Get from the currently selected folder, the currently selected message */
 	reply_to = camel_folder_get_message (userdata->t->folder,
@@ -666,14 +666,14 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t)
 	GSList *list = NULL;
 
 	/* We get the templates folder and all the uids of the messages in there */
-	store = mail_component_peek_local_store (NULL);
+	store = e_mail_local_get_store ();
 
-	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
+	templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
 
-	templates_info = camel_store_get_folder_info (store,
-			templates_folder->full_name,
-			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST,
-			NULL);
+	templates_info = camel_store_get_folder_info (
+		store, templates_folder->full_name,
+		CAMEL_STORE_FOLDER_INFO_RECURSIVE |
+		CAMEL_STORE_FOLDER_INFO_FAST, NULL);
 
 	/* Get subfolders and fill it */
 	list = fill_submenu (store, templates_info, list, t);
@@ -692,7 +692,7 @@ action_template_cb (GtkAction *action,
 	CamelFolder *templates_folder;
 
 	/* We get the templates folder and all the uids of the messages in there */
-	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
+	templates_folder = e_mail_local_get_folder (E_MAIL_FOLDER_TEMPLATES);
 	msg = e_msg_composer_get_message_draft (composer);
 	info = camel_message_info_new (NULL);