diff options
| author | Iain Holmes <iain@src.gnome.org> | 2001-10-05 04:02:00 +0800 |
|---|---|---|
| committer | Iain Holmes <iain@src.gnome.org> | 2001-10-05 04:02:00 +0800 |
| commit | 664206faba6f5a196f9c4f2c51b542f9c2bc41e0 (patch) | |
| tree | f6ebad16f42a74bca2e250073008b2fba4087474 | |
| parent | e46018cd8879979f96ea8445691d9dbaeb22aacf (diff) | |
| download | gsoc2013-evolution-664206faba6f5a196f9c4f2c51b542f9c2bc41e0.tar.gz gsoc2013-evolution-664206faba6f5a196f9c4f2c51b542f9c2bc41e0.tar.zst gsoc2013-evolution-664206faba6f5a196f9c4f2c51b542f9c2bc41e0.zip | |
Only create the folder when the shell has created it.
svn path=/trunk/; revision=13420
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/component-factory.c | 2 | ||||
| -rw-r--r-- | mail/importers/evolution-mbox-importer.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 0a76f0e0ca..5799fa160a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2001-10-04 Iain Holmes <iain@ximian.com> + + * importers/evolution-mbox-importer.c (load_file_fn): Only pass + CAMEL_STORE_FOLDER_CREATE when the shell will be creating the + folder. + 2001-10-04 <NotZed@Ximian.com> * mail-callbacks.c (configure_folder): If we're accessing a diff --git a/mail/component-factory.c b/mail/component-factory.c index 74fac2b39f..ab632031ea 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -182,7 +182,7 @@ create_folder_done (char *uri, CamelFolder *folder, void *data) GNOME_Evolution_ShellComponentListener listener = data; GNOME_Evolution_ShellComponentListener_Result result; CORBA_Environment ev; - + if (folder) { result = GNOME_Evolution_ShellComponentListener_OK; } else { diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 23fce7eb7a..9cdf6fa732 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -269,7 +269,7 @@ load_file_fn (EvolutionImporter *eimporter, fullpath = e_path_to_physical (homedir, folderpath); ex = camel_exception_new (); - importer->folder = mail_tool_uri_to_folder (fullpath, CAMEL_STORE_FOLDER_CREATE, ex); + importer->folder = mail_tool_uri_to_folder (fullpath, 0, ex); g_free (homedir); if (camel_exception_is_set (ex) || importer->folder == NULL) { @@ -300,7 +300,7 @@ load_file_fn (EvolutionImporter *eimporter, } if (importer->folder == NULL && delayed == FALSE){ - g_print ("Bad folder\n"); + g_warning ("Bad folder\n"); goto fail; } |