From 6efa5995601bd8be05e8623e5383a723944d6adc Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 2 Apr 2003 16:35:27 +0000 Subject: added "folder_type" parameter to EvolutionImporterLoadFileFn. 2003-04-02 Rodrigo Moya * importers/evolution-mbox-importer.c (load_file_fn): * importers/evolution-outlook-importer.c (load_file_fn): added "folder_type" parameter to EvolutionImporterLoadFileFn. * importers/elm-importer.c (elm_import_file): pass empty string for "folder_type" argument to GNOME_Evolution_Importer_loadFile. * importers/pine-importer.c (pine_import_file): ditto. * importers/netscape-importer.c (netscape_import_file): ditto. svn path=/trunk/; revision=20645 --- mail/ChangeLog | 11 +++++++++++ mail/importers/elm-importer.c | 2 +- mail/importers/evolution-mbox-importer.c | 1 + mail/importers/evolution-outlook-importer.c | 1 + mail/importers/netscape-importer.c | 2 +- mail/importers/pine-importer.c | 2 +- 6 files changed, 16 insertions(+), 3 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index 2fb23408eb..d514588b69 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2003-04-02 Rodrigo Moya + + * importers/evolution-mbox-importer.c (load_file_fn): + * importers/evolution-outlook-importer.c (load_file_fn): added + "folder_type" parameter to EvolutionImporterLoadFileFn. + + * importers/elm-importer.c (elm_import_file): pass empty string for + "folder_type" argument to GNOME_Evolution_Importer_loadFile. + * importers/pine-importer.c (pine_import_file): ditto. + * importers/netscape-importer.c (netscape_import_file): ditto. + 2003-04-01 Jeffrey Stedfast * mail-display.c (save_part): Don't allow the 'prefix' argument to diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 730167243f..bfe2ffcd95 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -173,7 +173,7 @@ elm_import_file (ElmImporter *importer, CORBA_exception_init(&ev); - result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, &ev); + result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, "", &ev); g_free(uri); if (ev._major != CORBA_NO_EXCEPTION || result == FALSE) { g_warning ("Exception here: %s", CORBA_exception_id (&ev)); diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 9cbcdeb9de..ef31667e64 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -241,6 +241,7 @@ static gboolean load_file_fn (EvolutionImporter *eimporter, const char *filename, const char *uri, + const char *folder_type, void *closure) { MboxImporter *mbi; diff --git a/mail/importers/evolution-outlook-importer.c b/mail/importers/evolution-outlook-importer.c index f0c697c6b6..1b250fc8ff 100644 --- a/mail/importers/evolution-outlook-importer.c +++ b/mail/importers/evolution-outlook-importer.c @@ -225,6 +225,7 @@ static gboolean load_file_fn (EvolutionImporter *eimporter, const char *filename, const char *uri, + const char *folder_type, void *closure) { OutlookImporter *oli; diff --git a/mail/importers/netscape-importer.c b/mail/importers/netscape-importer.c index cb0f430299..071620c144 100644 --- a/mail/importers/netscape-importer.c +++ b/mail/importers/netscape-importer.c @@ -1766,7 +1766,7 @@ netscape_import_file (NsImporter *importer, if (!uri) return FALSE; - result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, &ev); + result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, "", &ev); g_free(uri); if (ev._major != CORBA_NO_EXCEPTION || result == FALSE) { g_warning ("Exception here: %s", CORBA_exception_id (&ev)); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 2368c0c12f..54ffe2e51c 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -302,7 +302,7 @@ pine_import_file (PineImporter *importer, return FALSE; } - result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, &ev); + result = GNOME_Evolution_Importer_loadFile (importer->importer, path, uri, "", &ev); g_free(uri); if (ev._major != CORBA_NO_EXCEPTION || result == FALSE) { g_warning ("Exception here: %s\n%s, %s", CORBA_exception_id (&ev), path, folderpath); -- cgit