diff options
Diffstat (limited to 'camel/providers/local')
-rw-r--r-- | camel/providers/local/camel-local-folder.c | 6 | ||||
-rw-r--r-- | camel/providers/local/camel-local-provider.c | 8 | ||||
-rw-r--r-- | camel/providers/local/camel-local-store.c | 3 | ||||
-rw-r--r-- | camel/providers/local/camel-local-summary.c | 19 | ||||
-rw-r--r-- | camel/providers/local/camel-maildir-folder.c | 5 | ||||
-rw-r--r-- | camel/providers/local/camel-maildir-store.c | 2 | ||||
-rw-r--r-- | camel/providers/local/camel-maildir-summary.c | 4 | ||||
-rw-r--r-- | camel/providers/local/camel-spool-folder.c | 9 | ||||
-rw-r--r-- | camel/providers/local/camel-spool-store.c | 10 | ||||
-rw-r--r-- | camel/providers/local/camel-spool-summary.c | 5 |
10 files changed, 49 insertions, 22 deletions
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c index 811a71ecbe..927ca105ae 100644 --- a/camel/providers/local/camel-local-folder.c +++ b/camel/providers/local/camel-local-folder.c @@ -213,10 +213,14 @@ camel_local_folder_construct(CamelLocalFolder *lf, CamelStore *parent_store, con folder->summary = (CamelFolderSummary *)CLOCALF_CLASS(lf)->create_summary(lf->summary_path, lf->folder_path, lf->index); if (camel_local_summary_load((CamelLocalSummary *)folder->summary, forceindex, ex) == -1) { + camel_exception_clear(ex); + } + + if (camel_local_summary_check((CamelLocalSummary *)folder->summary, lf->changes, ex) == -1) { camel_object_unref (CAMEL_OBJECT (folder)); return NULL; } - + fi = g_new0 (CamelFolderInfo, 1); fi->full_name = g_strdup (full_name); fi->name = g_strdup (name); diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c index 8a4047699f..606416fc37 100644 --- a/camel/providers/local/camel-local-provider.c +++ b/camel/providers/local/camel-local-provider.c @@ -55,6 +55,12 @@ static CamelProvider mbox_provider = { /* ... */ }; +static CamelProviderConfEntry local_conf_entries[] = { + { CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL, + N_("Apply filters to new messages in INBOX"), "0" }, + { CAMEL_PROVIDER_CONF_END } +}; + static CamelProvider maildir_provider = { "maildir", N_("Qmail maildir-format mail files"), @@ -62,6 +68,7 @@ static CamelProvider maildir_provider = { "mail", CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE, CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE, + local_conf_entries, /* ... */ }; @@ -72,6 +79,7 @@ static CamelProvider spool_provider = { "mail", CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE, CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE, + local_conf_entries, /* ... */ }; diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c index fe8f09a911..43437b551a 100644 --- a/camel/providers/local/camel-local-store.c +++ b/camel/providers/local/camel-local-store.c @@ -190,6 +190,9 @@ get_folder_info (CamelStore *store, const char *top, /* FIXME: This is broken, but it corresponds to what was * there before. */ + + printf("-- LOCAL STRE -- get folder info: %s\n", top); + return NULL; } diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c index c925e6e36a..3202076520 100644 --- a/camel/providers/local/camel-local-summary.c +++ b/camel/providers/local/camel-local-summary.c @@ -148,18 +148,12 @@ camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException if (forceindex || stat(s->summary_path, &st) == -1 || ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->load(cls, forceindex, ex) == -1) { + g_warning("Could not load summary: flags may be reset"); camel_folder_summary_clear((CamelFolderSummary *)cls); + return -1; } - if (camel_local_summary_check(cls, NULL, ex) == 0) { - if (camel_folder_summary_save(s) == -1) - g_warning("Could not save summary for %s: %s", cls->folder_path, strerror(errno)); - if (cls->index && ibex_save(cls->index) == -1) - g_warning("Could not sync index for %s: %s", cls->folder_path, strerror(errno)); - - return 0; - } - return -1; + return 0; } char * @@ -261,6 +255,13 @@ camel_local_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changei ret = ((CamelLocalSummaryClass *)(CAMEL_OBJECT_GET_CLASS(cls)))->check(cls, changeinfo, ex); + if (ret != -1) { + if (camel_folder_summary_save((CamelFolderSummary *)cls) == -1) + g_warning("Could not save summary for %s: %s", cls->folder_path, strerror(errno)); + if (cls->index && ibex_save(cls->index) == -1) + g_warning("Could not sync index for %s: %s", cls->folder_path, strerror(errno)); + } + #ifdef DOSTATS if (ret != -1) { int i; diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c index 159aa84620..1bd6417e1a 100644 --- a/camel/providers/local/camel-maildir-folder.c +++ b/camel/providers/local/camel-maildir-folder.c @@ -110,6 +110,11 @@ camel_maildir_folder_new(CamelStore *parent_store, const char *full_name, guint3 d(printf("Creating maildir folder: %s\n", full_name)); folder = (CamelFolder *)camel_object_new(CAMEL_MAILDIR_FOLDER_TYPE); + + if (parent_store->flags & CAMEL_STORE_FILTER_INBOX + && strcmp(full_name, "") == 0) + folder->filter_recent = TRUE; + folder = (CamelFolder *)camel_local_folder_construct((CamelLocalFolder *)folder, parent_store, full_name, flags, ex); diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c index c200058c95..927c194089 100644 --- a/camel/providers/local/camel-maildir-store.c +++ b/camel/providers/local/camel-maildir-store.c @@ -313,8 +313,8 @@ static int scan_dir(GHashTable *visited, char *root, const char *path, guint32 f closedir(dir); return -1; } + g_free(new); } - g_free(new); } g_free(tmp); } diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c index 315e45ffd6..39726566bc 100644 --- a/camel/providers/local/camel-maildir-summary.c +++ b/camel/providers/local/camel-maildir-summary.c @@ -635,8 +635,10 @@ maildir_summary_check(CamelLocalSummary *cls, CamelFolderChangeInfo *changes, Ca if (rename(src, dest) == 0) { camel_maildir_summary_add(cls, destfilename, forceindex); - if (changes) + if (changes) { camel_folder_change_info_add_uid(changes, destname); + camel_folder_change_info_recent_uid(changes, destname); + } } else { /* else? we should probably care about failures, but wont */ g_warning("Failed to move new maildir message %s to cur %s", src, dest); diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c index be4ca31cf2..c5e9165917 100644 --- a/camel/providers/local/camel-spool-folder.c +++ b/camel/providers/local/camel-spool-folder.c @@ -200,7 +200,7 @@ camel_spool_folder_construct(CamelSpoolFolder *lf, CamelStore *parent_store, con return NULL; } - camel_spool_summary_check((CamelSpoolSummary *)folder->summary, NULL, ex); + camel_spool_summary_check((CamelSpoolSummary *)folder->summary, lf->changes, ex); camel_spool_folder_unlock(lf); fi = g_malloc0(sizeof(*fi)); @@ -209,9 +209,8 @@ camel_spool_folder_construct(CamelSpoolFolder *lf, CamelStore *parent_store, con fi->url = g_strdup(lf->folder_path); fi->unread_message_count = camel_folder_get_unread_message_count(folder); camel_object_trigger_event(CAMEL_OBJECT(parent_store), "folder_created", fi); - camel_folder_info_free (fi); - + return lf; } @@ -223,6 +222,10 @@ camel_spool_folder_new(CamelStore *parent_store, const char *full_name, guint32 d(printf("Creating spool folder: %s in %s\n", full_name, camel_local_store_get_toplevel_dir((CamelLocalStore *)parent_store))); folder = (CamelFolder *)camel_object_new(CAMEL_SPOOL_FOLDER_TYPE); + + if (parent_store->flags & CAMEL_STORE_FILTER_INBOX + && strcmp(full_name, "INBOX") == 0) + folder->filter_recent = TRUE; folder = (CamelFolder *)camel_spool_folder_construct((CamelSpoolFolder *)folder, parent_store, full_name, flags, ex); diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c index aa9d583d17..600ee8b2bc 100644 --- a/camel/providers/local/camel-spool-store.c +++ b/camel/providers/local/camel-spool-store.c @@ -148,8 +148,7 @@ static CamelFolder * get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex) { char *path = ((CamelService *)store)->url->path; - char *name; - int len; + CamelFolder *folder; printf("opening folder %s on path %s\n", folder_name, path); @@ -161,12 +160,9 @@ get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelExce return NULL; } - len = strlen(path); - name = alloca(len+1); - strcpy(name, path); - name[len-1] = 0; + folder = camel_spool_folder_new(store, folder_name, flags, ex); - return camel_spool_folder_new(store, name, flags, ex); + return folder; } static CamelFolder * diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c index 2aa0dcb8e4..651ce7b0e9 100644 --- a/camel/providers/local/camel-spool-summary.c +++ b/camel/providers/local/camel-spool-summary.c @@ -751,6 +751,11 @@ spool_summary_sync_full(CamelSpoolSummary *cls, gboolean expunge, CamelFolderCha strerror(errno)); goto error; } + + /* mark this message as recent */ + if (info->info.flags & CAMEL_MESSAGE_FOLDER_NOXEV) + camel_folder_change_info_recent_uid(changeinfo, camel_message_info_uid(info)); + info->info.flags &= 0xffff; g_free(xevnew); xevnew = NULL; |