callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Go back to using the store url's path, not the toplevel_dir thing.

Browse Source 
2001-10-02    <NotZed@Ximian.com>

        * providers/local/camel-maildir-store.c (get_folder_info): Go back
        to using the store url's path, not the toplevel_dir thing.

        * camel-operation.c (camel_operation_progress): Fix the progress
        logic, so we dont update too often.

svn path=/trunk/; revision=13354
This commit is contained in:
2
2001-10-02 22:03:13 +00:00
committed by Michael Zucci
parent 8d4f5ab1c8
commit 1747072ed0
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camel/ChangeLog
View File

@ -1,5 +1,11 @@
2001-10-02 <NotZed@Ximian.com>
* providers/local/camel-maildir-store.c (get_folder_info): Go back
to using the store url's path, not the toplevel_dir thing.
* camel-operation.c (camel_operation_progress): Fix the progress
logic, so we dont update too often.
* camel-object.c (camel_object_get_hooks): Change the lock to a
recursive e-mutex.
(camel_object_hook_event): Maintain list length of hook list.

6
camel/camel-operation.c
View File

@ -563,9 +563,9 @@ void camel_operation_progress(CamelOperation *cc, int pc)
s->pc = pc;
now = stamp();
if (cc->status_update != now
&& s->flags & CAMEL_OPERATION_TRANSIENT
&& s->stamp/16 > now/16)
if (cc->status_update == now
|| (s->flags & CAMEL_OPERATION_TRANSIENT
&& s->stamp/16 > now/16))
cc = NULL;
else {
s->stamp = cc->status_update = now;

2
camel/providers/local/camel-maildir-store.c
View File

@ -400,7 +400,7 @@ get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelExcepti
visited = g_hash_table_new(inode_hash, inode_equal);
if (scan_dir(store, visited, local_store->toplevel_dir, top?top:".", flags, NULL, &fi, ex) == -1 && fi != NULL) {
if (scan_dir(store, visited, ((CamelService *)local_store)->url->path, top?top:".", flags, NULL, &fi, ex) == -1 && fi != NULL) {
camel_store_free_folder_info_full(store, fi);
fi = NULL;
}