From 1ceb4cd764fbdd89a3b67903251dc89ad3e7d723 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 16 Feb 2004 09:38:24 +0000 Subject: ** See bug #51045. 2004-02-16 Not Zed ** See bug #51045. * providers/imap/camel-imap-store.c (fill_fi): similar to mbox version. (get_folder_counts): use fill_fi to try and get folder counts if we're not doing the hard slog. (get_one_folder_offline): use fill_fi to try to get folder counts from open folders or summaries. * providers/local/camel-maildir-store.c (fill_fi): similar to mbox version. (scan_dir): use fill_fi to get the unread count now. * providers/local/camel-mbox-store.c (fill_fi): helper to lookup unread count either from active folder or from summary file, if it's available. (scan_dir, get_folder_info): use helper above to get folder info. * devel-docs/camel-folder-summary.txt: New document describing the format/conventions in the CamelFolderSummary file. * providers/nntp/camel-nntp-summary.c (summary_header_load/save): * providers/imapp/camel-imapp-summary.c (summary_header_load/save): * providers/imap/camel-imap-summary.c (summary_header_load/save): Handle versions, per-class version number (1). * providers/local/camel-mbox-summary.c (summary_header_load/save): Handle versions properly, add a per-class version (1). Write out the folder size as a size_t rather than 32 bit int. * providers/local/camel-local-summary.c (summary_header_load/save): read/write the per-class version number (1). * camel-folder-summary.c (summary_header_load): do version checking differently, allow the version to be bumped without aborting the load. Added unread/deleted/junk counts to base header. (summary_header_save): Save out the new-format header. Version bumped to 13. * camel.c (camel_init): return 0 rather than spit a compiler warning. * camel-file-utils.c (camel_file_util_encode_*_t): macro-ise the type encoder/decoders. Also add size_t encoder/decoder. svn path=/trunk/; revision=24744 --- camel/camel-operation.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'camel/camel-operation.c') diff --git a/camel/camel-operation.c b/camel/camel-operation.c index 03c0c77617..5e041a18cf 100644 --- a/camel/camel-operation.c +++ b/camel/camel-operation.c @@ -312,10 +312,11 @@ camel_operation_cancel (CamelOperation *cc) * Register a thread or the main thread for cancellation through @cc. * If @cc is NULL, then a new cancellation is created for this thread. * - * All calls to operation_register() should be matched with calls to - * operation_unregister(), or resources will be lost. + * All calls to operation_register() should save their value and call + * operation_register again with that, to automatically stack + * registrations. * - * Return Value: Returns @cc, or if NULL, the new operation. + * Return Value: Returns the previously registered operatoin. * **/ CamelOperation * @@ -332,7 +333,7 @@ camel_operation_register (CamelOperation *cc) * camel_operation_unregister: * @cc: operation context * - * Unregister the current thread. + * Unregister the current thread for all cancellations. **/ void camel_operation_unregister (CamelOperation *cc) -- cgit v1.2.3