diff options
Diffstat (limited to 'mail/importers')
-rw-r--r-- | mail/importers/Makefile.am | 1 | ||||
-rw-r--r-- | mail/importers/mail-importer.h | 38 |
2 files changed, 20 insertions, 19 deletions
diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 4faee016da..197415b4ee 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -9,6 +9,7 @@ privsolib_LTLIBRARIES = libevolution-mail-importers.la INCLUDES = -I.. \ -I$(srcdir)/.. \ -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 92f555cf75..7759a4e4e7 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -24,10 +24,15 @@ #ifndef __MAIL_IMPORTER_H__ #define __MAIL_IMPORTER_H__ +#include <bonobo/bonobo-generic-factory.h> +#include <camel/camel-folder.h> + +#include <e-util/e-import.h> + typedef struct _MailImporter MailImporter; struct _MailImporter { - struct _CamelFolder *folder; - struct _CamelStreamMem *mstream; + CamelFolder *folder; + CamelStreamMem *mstream; gboolean frozen; /* Is folder frozen? */ }; @@ -47,15 +52,10 @@ void mail_importer_create_folder (const gchar *parent_path, /* creates a folder at folderpath on the local storage */ gchar *mail_importer_make_local_folder(const gchar *folderpath); -struct _BonoboObject; -struct _BonoboGenericFactory; -struct _CamelOperation; -struct _CamelException; - -struct _EImportImporter *mbox_importer_peek(void); +EImportImporter *mbox_importer_peek(void); -struct _EImportImporter *elm_importer_peek(void); -struct _EImportImporter *pine_importer_peek(void); +EImportImporter *elm_importer_peek(void); +EImportImporter *pine_importer_peek(void); #define ELM_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Elm_Intelligent_Importer:" BASE_VERSION #define PINE_INTELLIGENT_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Pine_Intelligent_Importer:" BASE_VERSION @@ -64,14 +64,14 @@ struct _EImportImporter *pine_importer_peek(void); #define MBOX_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Mbox_Importer:" BASE_VERSION #define OUTLOOK_IMPORTER_IID "OAFIID:GNOME_Evolution_Mail_Outlook_Importer:" BASE_VERSION -struct _BonoboObject *elm_intelligent_importer_new(void); -struct _BonoboObject *pine_intelligent_importer_new(void); -struct _BonoboObject *netscape_intelligent_importer_new(void); +BonoboObject *elm_intelligent_importer_new(void); +BonoboObject *pine_intelligent_importer_new(void); +BonoboObject *netscape_intelligent_importer_new(void); -struct _BonoboObject *mbox_importer_new(void); -struct _BonoboObject *outlook_importer_new(void); +BonoboObject *mbox_importer_new(void); +BonoboObject *outlook_importer_new(void); -struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *factory, const gchar *iid, gpointer data); +BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data); /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ @@ -81,8 +81,8 @@ struct _BonoboObject *mail_importer_factory_cb(struct _BonoboGenericFactory *fac #define MSG_FLAG_MARKED 0x0004 #define MSG_FLAG_EXPUNGED 0x0008 -gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel, void (*done)(gpointer data, struct _CamelException *), gpointer data); -void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, struct _CamelOperation *cancel); +gint mail_importer_import_mbox(const gchar *path, const gchar *folderuri, CamelOperation *cancel, void (*done)(gpointer data, CamelException *), gpointer data); +void mail_importer_import_mbox_sync(const gchar *path, const gchar *folderuri, CamelOperation *cancel); struct _MailImporterSpecial { const gchar *orig, *new; @@ -93,6 +93,6 @@ typedef struct _MailImporterSpecial MailImporterSpecial; #define MAIL_IMPORTER_MOZFMT (1<<0) /* api in flux */ -void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, struct _CamelOperation *cancel); +void mail_importer_import_folders_sync(const gchar *filepath, MailImporterSpecial special_folders[], gint flags, CamelOperation *cancel); #endif |