diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-01-18 00:07:19 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-01-19 12:48:47 +0800 |
| commit | 61ae36351b24cc676f60483d576706bf827f2987 (patch) | |
| tree | c55d9e000efd47fa14865fad2defa79b5ed61ffd /plugins/dbx-import | |
| parent | 37644b9d257369c5c158121ca4807cafbe844595 (diff) | |
| download | gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar.gz gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar.bz2 gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar.lz gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar.xz gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.tar.zst gsoc2013-evolution-61ae36351b24cc676f60483d576706bf827f2987.zip | |
Introduce libemail-engine and libemail-utils.
These libraries are bound for E-D-S so they live at the lowest layer of
Evolution for now -- even libeutil can link to them (but please don't).
This is the first step toward moving mail handing to a D-Bus service.
Diffstat (limited to 'plugins/dbx-import')
| -rw-r--r-- | plugins/dbx-import/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/dbx-import/dbx-importer.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index 67d5e0d5d3..eeaf69ff3f 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -27,6 +27,8 @@ liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GTKHTML_LIBS) diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index 5415f4867c..f6b666516a 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -64,10 +64,11 @@ #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-selector-dialog.h> +#include <libemail-utils/mail-mt.h> +#include <libemail-engine/mail-tools.h> + #include <mail/e-mail-backend.h> #include <mail/em-folder-selection-button.h> -#include <mail/mail-mt.h> -#include <mail/mail-tools.h> #include <mail/em-utils.h> #define d(x) @@ -603,7 +604,7 @@ dbx_import_file (DbxImporter *m) /* Destination folder, was set in our widget */ m->parent_uri = g_strdup (((EImportTargetURI *) m->target)->uri_dest); - cancellable = e_activity_get_cancellable (m->base.activity); + cancellable = m->base.cancellable; /* XXX Dig up the EMailSession from the default EShell. * Since the EImport framework doesn't allow for user |