diff options
author | Not Zed <NotZed@Ximian.com> | 2003-03-20 18:17:25 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2003-03-20 18:17:25 +0800 |
commit | 1dc4c5de39970316494ab17e2b50ae1a7ca6170e (patch) | |
tree | f474ee61d5e15306ca95f386223d91f1cb060761 /mail/importers/evolution-outlook-importer.c | |
parent | 4ac5734af0ee578f5e769bf4bd5a420d379d2155 (diff) | |
download | gsoc2013-evolution-1dc4c5de39970316494ab17e2b50ae1a7ca6170e.tar.gz gsoc2013-evolution-1dc4c5de39970316494ab17e2b50ae1a7ca6170e.tar.zst gsoc2013-evolution-1dc4c5de39970316494ab17e2b50ae1a7ca6170e.zip |
** for mail part of bug #38461.
2003-03-21 Not Zed <NotZed@Ximian.com>
** for mail part of bug #38461.
* importers/evolution-outlook-importer.c (load_file_fn): dont pass
in create flag to uri_to_folder, the folder must already exist.
* importers/evolution-mbox-importer.c (folder_created_cb):
Removed, we now force the caller to create the destination folder
first.
(load_file_fn): Dont try and create a folder if it doesn't exist.
Also, use the uri directly as the destination uri, so we can
import into any folder.
(process_item_fn): If we dont have a folder, thats just an error,
return BAD_FILE.
* importers/netscape-importer.c (netscape_import_file): As below
for elm_import_file.
(import_next): similarly as for pine import_next.
(importer_cb): just record result.
(importer_timeout_fn): removed.
* importers/pine-importer.c (import_next): Similar to below for
the elm import_next.
(pine_import_file): As below for elm_import_file.
(importer_timeout_fn): removed.
(importer_cb): just record the result, and exit.
(import_next): change around to behave more like the elm importer,
cleaning up when we're done.
* importers/elm-importer.c (elm_import_file): Create the
destination folder ourselves, dont pass it onto the mbox importer.
Simplify logic, just do the import within a while loop, polling
the g main loop as necessary, remove need for idle callbacks and
other crap.
(import_next): If elm_import_file fails, then just go straight to
the next folder, stops it falling in a heap.
(import_item_idle): removed.
(importer_cb): just record result/exit.
* mail-importer.c (mail_importer_create_folder): removed.
(mail_importer_make_local_folder): new function to create a
local-only folder from a path. It runs synchronously by using a
recursive main loop.
(folder_created_cb): callback for make_local_folder.
svn path=/trunk/; revision=20379
Diffstat (limited to 'mail/importers/evolution-outlook-importer.c')
-rw-r--r-- | mail/importers/evolution-outlook-importer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index 2737aa592a..f0c697c6b6 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -224,7 +224,7 @@ importer_destroy_cb (void *data, GObject *object) static gboolean load_file_fn (EvolutionImporter *eimporter, const char *filename, - const char *folderpath, + const char *uri, void *closure) { OutlookImporter *oli; @@ -263,10 +263,10 @@ load_file_fn (EvolutionImporter *eimporter, importer->mstream = NULL; - if (folderpath == NULL || *folderpath == '\0') + if (uri == NULL || *uri == 0) importer->folder = mail_tool_get_local_inbox (NULL); else - importer->folder = mail_tool_uri_to_folder (folderpath, CAMEL_STORE_FOLDER_CREATE, NULL); + importer->folder = mail_tool_uri_to_folder (uri, 0, NULL); if (importer->folder == NULL){ g_warning ("Bad folder"); |