diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-10-07 11:38:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-10-13 01:58:59 +0800 |
| commit | a06e4484b8df804124b5bcf88d94dec5acfba270 (patch) | |
| tree | 4fa42793d7dc461f2b3767296d76592182c48222 /mail/importers/mail-importer.h | |
| parent | 5e0758bb6934a7859b1d8a247c8fb21c156772cf (diff) | |
| download | gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.gz gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.bz2 gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.lz gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.xz gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.tar.zst gsoc2013-evolution-a06e4484b8df804124b5bcf88d94dec5acfba270.zip | |
Give MailSession a permanent home.
Global variables in shared libraries are a bad idea. EMailBackend now
owns the MailSession instance, which is actually now EMailSession.
Move the blocking utility functions in mail-tools.c to e-mail-session.c
and add asynchronous variants. Same approach as Camel.
Replace EMailReader.get_shell_backend() with EMailReader.get_backend(),
which returns an EMailBackend. Easier access to the EMailSession.
Diffstat (limited to 'mail/importers/mail-importer.h')
| -rw-r--r-- | mail/importers/mail-importer.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 12caadaeac..93d1897877 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -26,6 +26,7 @@ #include <e-util/e-import.h> #include <camel/camel.h> +#include <mail/e-mail-session.h> EImportImporter *mbox_importer_peek (void); @@ -46,8 +47,16 @@ EImportImporter *pine_importer_peek (void); #define MSG_FLAG_MARKED 0x0004 #define MSG_FLAG_EXPUNGED 0x0008 -gint mail_importer_import_mbox (const gchar *path, const gchar *folderuri, GCancellable *cancellable, void (*done)(gpointer data, GError **), gpointer data); -void mail_importer_import_mbox_sync (const gchar *path, const gchar *folderuri, GCancellable *cancellable); +gint mail_importer_import_mbox (EMailSession *session, + const gchar *path, + const gchar *folderuri, + GCancellable *cancellable, + void (*done)(gpointer data, GError **), + gpointer data); +void mail_importer_import_mbox_sync (EMailSession *session, + const gchar *path, + const gchar *folderuri, + GCancellable *cancellable); struct _MailImporterSpecial { const gchar *orig, *new; @@ -58,6 +67,11 @@ 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, GCancellable *cancellable); +void mail_importer_import_folders_sync + (EMailSession *session, + const gchar *filepath, + MailImporterSpecial special_folders[], + gint flags, + GCancellable *cancellable); #endif |