Blame SOURCES/evolution-data-server-3.12.11-camel-maildir-migration.patch
|
|
5e6360 |
diff -up evolution-data-server-3.12.11/camel/providers/local/camel-maildir-store.c.camel-maildir-migration evolution-data-server-3.12.11/camel/providers/local/camel-maildir-store.c
|
|
|
5e6360 |
--- evolution-data-server-3.12.11/camel/providers/local/camel-maildir-store.c.camel-maildir-migration 2015-02-06 12:42:25.000000000 +0100
|
|
|
5e6360 |
+++ evolution-data-server-3.12.11/camel/providers/local/camel-maildir-store.c 2015-06-01 13:03:03.912521771 +0200
|
|
|
5e6360 |
@@ -202,11 +202,27 @@ maildir_store_get_folder_sync (CamelStor
|
|
|
5e6360 |
CamelLocalSettings *local_settings;
|
|
|
5e6360 |
CamelSettings *settings;
|
|
|
5e6360 |
CamelService *service;
|
|
|
5e6360 |
+ CamelMaildirStore *maildir_store;
|
|
|
5e6360 |
gchar *name, *tmp, *cur, *new, *dir_name;
|
|
|
5e6360 |
gchar *path;
|
|
|
5e6360 |
struct stat st;
|
|
|
5e6360 |
CamelFolder *folder = NULL;
|
|
|
5e6360 |
|
|
|
5e6360 |
+ g_return_val_if_fail (CAMEL_IS_MAILDIR_STORE (store), NULL);
|
|
|
5e6360 |
+
|
|
|
5e6360 |
+ maildir_store = CAMEL_MAILDIR_STORE (store);
|
|
|
5e6360 |
+
|
|
|
5e6360 |
+ if (!maildir_store->priv->already_migrated &&
|
|
|
5e6360 |
+ maildir_store->priv->can_escape_dots) {
|
|
|
5e6360 |
+ CamelFolderInfo *folder_info;
|
|
|
5e6360 |
+
|
|
|
5e6360 |
+ /* Not interested in any errors here, this is to invoke folder
|
|
|
5e6360 |
+ content migration only. */
|
|
|
5e6360 |
+ folder_info = camel_store_get_folder_info_sync (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE, cancellable, NULL);
|
|
|
5e6360 |
+ if (folder_info)
|
|
|
5e6360 |
+ camel_folder_info_free (folder_info);
|
|
|
5e6360 |
+ }
|
|
|
5e6360 |
+
|
|
|
5e6360 |
service = CAMEL_SERVICE (store);
|
|
|
5e6360 |
|
|
|
5e6360 |
settings = camel_service_ref_settings (service);
|