aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac3
-rw-r--r--plugins/pst-import/pst-importer.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 0d457a41fa..6ffa980211 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1735,7 +1735,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 mail-to-task mark-all-read plugin-manager prefer-plain profiler sa-junk-plugin save-calendar startup-wizard 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 mail-to-task mark-all-read plugin-manager prefer-plain profiler pst-import sa-junk-plugin save-calendar startup-wizard subject-thread templates $TNEF_ATTACHMENTS vcard-inline webdav-account-setup"
dnl PLUGINS NOT BUILDING YET
dnl ------------------------
@@ -1747,7 +1747,6 @@ dnl ipod-sync
dnl itip-formatter
dnl mailing-list-actions
dnl mono
-dnl pst-import
dnl publish-calendar
dnl python
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 06473e8340..5dd164a47f 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -61,7 +61,7 @@
#include <camel/camel-stream-fs.h>
#include <camel/camel-file-utils.h>
-#include <mail/mail-component.h>
+#include <mail/e-mail-local.h>
#include <mail/mail-mt.h>
#include <mail/mail-tools.h>
#include <mail/em-utils.h>
@@ -225,7 +225,7 @@ get_suggested_foldername (EImportTargetURI *target)
/* Suggest a folder that is in the same mail storage as the users' inbox,
with a name derived from the .PST file */
- inbox = mail_component_get_folder_uri (NULL, MAIL_COMPONENT_FOLDER_INBOX);
+ inbox = e_mail_local_get_folder_uri (E_MAIL_FOLDER_INBOX);
delim = g_strrstr (inbox, "#");
if (delim != NULL) {
@@ -914,7 +914,7 @@ pst_process_email (PstImporter *m, pst_item *item)
if (item->email->importance == 2)
camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0);
- if (item->email->flag && 0x08)
+ if (item->flags && 0x08)
camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);