From b48d00c40cd4fd62381f3b971339435b0691656c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 Apr 2007 01:42:04 +0000 Subject: [PATCH] ** Fixes bug #418852 2007-04-27 Matthew Barnes ** Fixes bug #418852 * Note, these changes touch almost every file in Camel. * Replace C++ declaration guards (extern "C" { ... }) with G_BEGIN_DECLS / G_END_DECLS, or add them to headers with no declaration guards at all. * Use GLib's i18n support instead of Camel's (now deprecated). * Use quotes and brackets consistently in #include directives. * Remove CAMEL_EXPLICIT_TRANSLATION_DOMAIN from Makefiles. * Resurrect Camel's API documentation. * Fix documentation warnings identified by Gtk-Doc. * camel.h: Expose Camel's entire "core" (non-provider) API. * camel-i18n.h: Deprecate this API. Use GLib's i18n support instead. * camel-folder.h (camel_folder_get_message_flags): * camel-folder.h (camel_folder_set_message_flags): * camel-folder.h (camel_folder_get_message_user_flag): * camel-folder.h (camel_folder_set_message_user_flag): * camel-folder.h (camel_folder_get_message_user_tag): * camel-folder.h (camel_folder_set_message_user_tag): * camel-folder.h (camel_folder_get_unread_message_count): * camel-folder.h (camel_folder_ref_message_info): Add deprecation guards around these function declarations. svn path=/trunk/; revision=7720 --- ChangeLog | 9 + camel/ChangeLog | 34 + camel/Makefile.am | 1 - camel/broken-date-parser.c | 10 +- camel/broken-date-parser.h | 7 +- camel/camel-address.h | 11 +- camel/camel-arg.c | 1 + camel/camel-arg.h | 13 +- camel/camel-block-file.c | 15 +- camel/camel-block-file.h | 3 + camel/camel-certdb.c | 16 +- camel/camel-certdb.h | 11 +- camel/camel-charset-map.c | 2 +- camel/camel-charset-map.h | 11 +- camel/camel-cipher-context.c | 14 +- camel/camel-cipher-context.h | 19 +- camel/camel-data-cache.c | 13 +- camel/camel-data-cache.h | 11 +- camel/camel-data-wrapper.c | 12 +- camel/camel-data-wrapper.h | 11 +- camel/camel-debug.c | 6 +- camel/camel-debug.h | 11 +- camel/camel-digest-folder.c | 5 +- camel/camel-digest-folder.h | 4 + camel/camel-digest-store.c | 5 +- camel/camel-digest-store.h | 11 +- camel/camel-digest-summary.h | 11 +- camel/camel-disco-diary.c | 3 +- camel/camel-disco-diary.h | 11 +- camel/camel-disco-folder.c | 5 +- camel/camel-disco-folder.h | 11 +- camel/camel-disco-store.c | 6 +- camel/camel-disco-store.h | 12 +- camel/camel-exception.c | 9 +- camel/camel-exception.h | 12 +- camel/camel-file-utils.c | 8 +- camel/camel-file-utils.h | 11 +- camel/camel-filter-driver.c | 25 +- camel/camel-filter-driver.h | 11 +- camel/camel-filter-search.c | 25 +- camel/camel-filter-search.h | 11 +- camel/camel-folder-search.c | 19 +- camel/camel-folder-search.h | 11 +- camel/camel-folder-summary.c | 36 +- camel/camel-folder-summary.h | 15 +- camel/camel-folder-thread.c | 12 +- camel/camel-folder-thread.h | 11 +- camel/camel-folder.c | 18 +- camel/camel-folder.h | 19 +- camel/camel-gpg-context.c | 39 +- camel/camel-gpg-context.h | 11 +- camel/camel-html-parser.c | 20 +- camel/camel-html-parser.h | 16 +- camel/camel-http-stream.c | 14 +- camel/camel-http-stream.h | 11 +- camel/camel-i18n.h | 12 +- camel/camel-iconv.h | 11 +- camel/camel-index-control.c | 21 +- camel/camel-index.c | 6 +- camel/camel-index.h | 4 + camel/camel-internet-address.c | 2 +- camel/camel-internet-address.h | 11 +- camel/camel-junk-plugin.c | 1 + camel/camel-junk-plugin.h | 4 + camel/camel-list-utils.h | 4 + camel/camel-lock-client.c | 12 +- camel/camel-lock-client.h | 11 +- camel/camel-lock-helper.c | 22 +- camel/camel-lock-helper.h | 11 +- camel/camel-lock.c | 18 +- camel/camel-lock.h | 11 +- camel/camel-medium.c | 2 +- camel/camel-medium.h | 12 +- camel/camel-mime-filter-basic.h | 11 +- camel/camel-mime-filter-bestenc.h | 11 +- camel/camel-mime-filter-canon.c | 2 +- camel/camel-mime-filter-canon.h | 11 +- camel/camel-mime-filter-charset.c | 6 +- camel/camel-mime-filter-charset.h | 11 +- camel/camel-mime-filter-crlf.h | 11 +- camel/camel-mime-filter-enriched.h | 11 +- camel/camel-mime-filter-from.h | 11 +- camel/camel-mime-filter-gzip.h | 11 +- camel/camel-mime-filter-html.c | 14 +- camel/camel-mime-filter-html.h | 11 +- camel/camel-mime-filter-index.h | 11 +- camel/camel-mime-filter-linewrap.h | 11 +- camel/camel-mime-filter-pgp.c | 2 +- camel/camel-mime-filter-pgp.h | 11 +- camel/camel-mime-filter-save.h | 11 +- camel/camel-mime-filter-tohtml.c | 2 +- camel/camel-mime-filter-tohtml.h | 11 +- camel/camel-mime-filter-windows.c | 2 +- camel/camel-mime-filter-windows.h | 11 +- camel/camel-mime-filter-yenc.h | 11 +- camel/camel-mime-filter.h | 11 +- camel/camel-mime-message.c | 6 +- camel/camel-mime-message.h | 13 +- camel/camel-mime-parser.c | 14 +- camel/camel-mime-parser.h | 11 +- camel/camel-mime-part-utils.c | 6 +- camel/camel-mime-part-utils.h | 12 +- camel/camel-mime-part.c | 6 +- camel/camel-mime-part.h | 13 +- camel/camel-mime-utils.c | 22 +- camel/camel-mime-utils.h | 11 +- camel/camel-movemail.c | 26 +- camel/camel-movemail.h | 13 +- camel/camel-multipart-encrypted.c | 4 +- camel/camel-multipart-encrypted.h | 11 +- camel/camel-multipart-signed.c | 16 +- camel/camel-multipart-signed.h | 13 +- camel/camel-multipart.c | 10 +- camel/camel-multipart.h | 13 +- camel/camel-net-utils.c | 13 +- camel/camel-net-utils.h | 11 +- camel/camel-news-address.h | 11 +- camel/camel-nntp-address.h | 11 +- camel/camel-object.c | 13 +- camel/camel-object.h | 11 +- camel/camel-offline-folder.c | 4 +- camel/camel-offline-folder.h | 11 +- camel/camel-offline-journal.c | 13 +- camel/camel-offline-journal.h | 11 +- camel/camel-offline-store.c | 4 +- camel/camel-offline-store.h | 12 +- camel/camel-operation.c | 11 +- camel/camel-operation.h | 9 +- camel/camel-partition-table.c | 8 +- camel/camel-partition-table.h | 4 + camel/camel-private.h | 10 +- camel/camel-process.c | 4 +- camel/camel-process.h | 9 +- camel/camel-provider.c | 8 +- camel/camel-provider.h | 12 +- camel/camel-sasl-anonymous.c | 4 +- camel/camel-sasl-anonymous.h | 11 +- camel/camel-sasl-cram-md5.c | 6 +- camel/camel-sasl-cram-md5.h | 11 +- camel/camel-sasl-digest-md5.c | 10 +- camel/camel-sasl-digest-md5.h | 11 +- camel/camel-sasl-gssapi.c | 12 +- camel/camel-sasl-gssapi.h | 11 +- camel/camel-sasl-kerberos4.c | 6 +- camel/camel-sasl-kerberos4.h | 11 +- camel/camel-sasl-login.c | 4 +- camel/camel-sasl-login.h | 11 +- camel/camel-sasl-ntlm.c | 4 +- camel/camel-sasl-ntlm.h | 11 +- camel/camel-sasl-plain.c | 4 +- camel/camel-sasl-plain.h | 11 +- camel/camel-sasl-popb4smtp.c | 4 +- camel/camel-sasl-popb4smtp.h | 11 +- camel/camel-sasl.h | 11 +- camel/camel-search-private.c | 14 +- camel/camel-search-private.h | 10 +- camel/camel-seekable-stream.h | 11 +- camel/camel-seekable-substream.h | 12 +- camel/camel-service.c | 10 +- camel/camel-service.h | 13 +- camel/camel-session.c | 10 +- camel/camel-session.h | 12 +- camel/camel-smime-context.c | 4 +- camel/camel-smime-context.h | 11 +- camel/camel-store-summary.c | 15 +- camel/camel-store-summary.h | 11 +- camel/camel-store.c | 6 +- camel/camel-store.h | 11 +- camel/camel-stream-buffer.c | 6 +- camel/camel-stream-buffer.h | 12 +- camel/camel-stream-filter.h | 11 +- camel/camel-stream-fs.c | 7 +- camel/camel-stream-fs.h | 12 +- camel/camel-stream-mem.c | 6 +- camel/camel-stream-mem.h | 12 +- camel/camel-stream-null.h | 11 +- camel/camel-stream-process.c | 12 +- camel/camel-stream-process.h | 11 +- camel/camel-stream-vfs.c | 7 +- camel/camel-stream-vfs.h | 13 +- camel/camel-stream.h | 12 +- camel/camel-string-utils.h | 11 +- camel/camel-tcp-stream-openssl.c | 26 +- camel/camel-tcp-stream-raw.c | 8 +- camel/camel-tcp-stream-raw.h | 12 +- camel/camel-tcp-stream-ssl.c | 14 +- camel/camel-tcp-stream-ssl.h | 16 +- camel/camel-tcp-stream.h | 12 +- camel/camel-text-index.c | 14 +- camel/camel-text-index.h | 5 +- camel/camel-transport.h | 11 +- camel/camel-types.h | 11 +- camel/camel-uid-cache.c | 10 +- camel/camel-uid-cache.h | 11 +- camel/camel-url-scanner.c | 5 +- camel/camel-url-scanner.h | 10 +- camel/camel-url.c | 6 +- camel/camel-url.h | 10 +- camel/camel-utf8.c | 2 +- camel/camel-utf8.h | 4 + camel/camel-vee-folder.c | 9 +- camel/camel-vee-folder.h | 11 +- camel/camel-vee-store.c | 3 +- camel/camel-vee-store.h | 11 +- camel/camel-vee-summary.c | 6 +- camel/camel-vee-summary.h | 10 +- camel/camel-vtrash-folder.c | 6 +- camel/camel-vtrash-folder.h | 11 +- camel/camel-win32.c | 6 +- camel/camel.c | 4 +- camel/camel.h | 92 +- camel/providers/groupwise/Makefile.am | 1 - camel/providers/groupwise/camel-groupwise-folder.c | 42 +- camel/providers/groupwise/camel-groupwise-folder.h | 12 +- .../providers/groupwise/camel-groupwise-journal.c | 25 +- .../providers/groupwise/camel-groupwise-journal.h | 11 +- .../providers/groupwise/camel-groupwise-private.h | 11 - .../providers/groupwise/camel-groupwise-provider.c | 8 +- .../groupwise/camel-groupwise-store-summary.c | 12 +- .../groupwise/camel-groupwise-store-summary.h | 12 +- camel/providers/groupwise/camel-groupwise-store.c | 22 +- camel/providers/groupwise/camel-groupwise-store.h | 12 +- .../providers/groupwise/camel-groupwise-summary.c | 15 +- .../providers/groupwise/camel-groupwise-summary.h | 4 + .../groupwise/camel-groupwise-transport.c | 26 +- .../groupwise/camel-groupwise-transport.h | 11 +- camel/providers/groupwise/camel-groupwise-utils.c | 10 +- camel/providers/groupwise/camel-groupwise-utils.h | 5 + camel/providers/hula/Makefile.am | 1 - camel/providers/hula/camel-hula-provider.c | 7 +- camel/providers/imap/Makefile.am | 1 - camel/providers/imap/camel-imap-command.c | 20 +- camel/providers/imap/camel-imap-command.h | 9 +- camel/providers/imap/camel-imap-folder.c | 51 +- camel/providers/imap/camel-imap-folder.h | 12 +- camel/providers/imap/camel-imap-message-cache.c | 11 +- camel/providers/imap/camel-imap-message-cache.h | 12 +- camel/providers/imap/camel-imap-private.h | 12 +- camel/providers/imap/camel-imap-provider.c | 6 +- camel/providers/imap/camel-imap-search.c | 16 +- camel/providers/imap/camel-imap-search.h | 4 + camel/providers/imap/camel-imap-store-summary.c | 15 +- camel/providers/imap/camel-imap-store-summary.h | 11 +- camel/providers/imap/camel-imap-store.c | 4 +- camel/providers/imap/camel-imap-store.h | 16 +- camel/providers/imap/camel-imap-summary.c | 9 +- camel/providers/imap/camel-imap-summary.h | 5 +- camel/providers/imap/camel-imap-types.h | 9 +- camel/providers/imap/camel-imap-utils.c | 16 +- camel/providers/imap/camel-imap-utils.h | 11 +- camel/providers/imap/camel-imap-wrapper.c | 12 +- camel/providers/imap/camel-imap-wrapper.h | 12 +- camel/providers/imap4/Makefile.am | 1 - camel/providers/imap4/camel-imap4-command.c | 19 +- camel/providers/imap4/camel-imap4-command.h | 9 +- camel/providers/imap4/camel-imap4-engine.c | 21 +- camel/providers/imap4/camel-imap4-engine.h | 11 +- camel/providers/imap4/camel-imap4-folder.c | 33 +- camel/providers/imap4/camel-imap4-folder.h | 11 +- camel/providers/imap4/camel-imap4-journal.c | 22 +- camel/providers/imap4/camel-imap4-journal.h | 11 +- camel/providers/imap4/camel-imap4-provider.c | 8 +- camel/providers/imap4/camel-imap4-search.c | 8 +- camel/providers/imap4/camel-imap4-search.h | 11 +- camel/providers/imap4/camel-imap4-specials.h | 9 +- camel/providers/imap4/camel-imap4-store-summary.c | 12 +- camel/providers/imap4/camel-imap4-store-summary.h | 11 +- camel/providers/imap4/camel-imap4-store.c | 29 +- camel/providers/imap4/camel-imap4-store.h | 11 +- camel/providers/imap4/camel-imap4-stream.c | 7 +- camel/providers/imap4/camel-imap4-stream.h | 17 +- camel/providers/imap4/camel-imap4-summary.c | 30 +- camel/providers/imap4/camel-imap4-summary.h | 11 +- camel/providers/imap4/camel-imap4-utils.c | 16 +- camel/providers/imap4/camel-imap4-utils.h | 9 +- camel/providers/imapp/Makefile.am | 1 - camel/providers/imapp/camel-imapp-driver.c | 25 +- camel/providers/imapp/camel-imapp-driver.h | 4 + camel/providers/imapp/camel-imapp-engine.c | 20 +- camel/providers/imapp/camel-imapp-engine.h | 4 + camel/providers/imapp/camel-imapp-exception.h | 4 + camel/providers/imapp/camel-imapp-fetch-stream.c | 8 +- camel/providers/imapp/camel-imapp-fetch-stream.h | 4 + camel/providers/imapp/camel-imapp-folder.c | 31 +- camel/providers/imapp/camel-imapp-folder.h | 11 +- camel/providers/imapp/camel-imapp-provider.c | 5 +- camel/providers/imapp/camel-imapp-store-summary.c | 17 +- camel/providers/imapp/camel-imapp-store-summary.h | 11 +- camel/providers/imapp/camel-imapp-store.c | 33 +- camel/providers/imapp/camel-imapp-store.h | 13 +- camel/providers/imapp/camel-imapp-stream.c | 8 +- camel/providers/imapp/camel-imapp-stream.h | 4 + camel/providers/imapp/camel-imapp-summary.c | 11 +- camel/providers/imapp/camel-imapp-summary.h | 5 +- camel/providers/imapp/camel-imapp-utils.c | 17 +- camel/providers/imapp/camel-imapp-utils.h | 4 + camel/providers/local/Makefile.am | 1 - camel/providers/local/camel-local-folder.c | 31 +- camel/providers/local/camel-local-folder.h | 11 +- camel/providers/local/camel-local-private.h | 11 +- camel/providers/local/camel-local-provider.c | 7 +- camel/providers/local/camel-local-store.c | 7 +- camel/providers/local/camel-local-store.h | 11 +- camel/providers/local/camel-local-summary.c | 14 +- camel/providers/local/camel-local-summary.h | 5 +- camel/providers/local/camel-maildir-folder.c | 22 +- camel/providers/local/camel-maildir-folder.h | 13 +- camel/providers/local/camel-maildir-store.c | 15 +- camel/providers/local/camel-maildir-store.h | 14 +- camel/providers/local/camel-maildir-summary.c | 28 +- camel/providers/local/camel-maildir-summary.h | 5 +- camel/providers/local/camel-mbox-folder.c | 12 +- camel/providers/local/camel-mbox-folder.h | 11 +- camel/providers/local/camel-mbox-store.c | 11 +- camel/providers/local/camel-mbox-store.h | 11 +- camel/providers/local/camel-mbox-summary.c | 14 +- camel/providers/local/camel-mbox-summary.h | 5 +- camel/providers/local/camel-mh-folder.c | 19 +- camel/providers/local/camel-mh-folder.h | 13 +- camel/providers/local/camel-mh-store.c | 18 +- camel/providers/local/camel-mh-store.h | 14 +- camel/providers/local/camel-mh-summary.c | 22 +- camel/providers/local/camel-mh-summary.h | 5 +- camel/providers/local/camel-spool-folder.c | 32 +- camel/providers/local/camel-spool-folder.h | 11 +- camel/providers/local/camel-spool-store.c | 29 +- camel/providers/local/camel-spool-store.h | 12 +- camel/providers/local/camel-spool-summary.c | 19 +- camel/providers/local/camel-spool-summary.h | 5 +- camel/providers/nntp/Makefile.am | 1 - camel/providers/nntp/camel-nntp-auth.c | 12 +- camel/providers/nntp/camel-nntp-auth.h | 9 +- camel/providers/nntp/camel-nntp-folder.c | 33 +- camel/providers/nntp/camel-nntp-folder.h | 12 +- camel/providers/nntp/camel-nntp-grouplist.c | 5 +- camel/providers/nntp/camel-nntp-grouplist.h | 4 + camel/providers/nntp/camel-nntp-newsrc.c | 12 +- camel/providers/nntp/camel-nntp-newsrc.h | 6 +- camel/providers/nntp/camel-nntp-private.h | 14 +- camel/providers/nntp/camel-nntp-provider.c | 4 +- camel/providers/nntp/camel-nntp-store-summary.c | 13 +- camel/providers/nntp/camel-nntp-store-summary.h | 12 +- camel/providers/nntp/camel-nntp-store.c | 29 +- camel/providers/nntp/camel-nntp-store.h | 18 +- camel/providers/nntp/camel-nntp-stream.c | 6 +- camel/providers/nntp/camel-nntp-stream.h | 4 + camel/providers/nntp/camel-nntp-summary.c | 17 +- camel/providers/nntp/camel-nntp-summary.h | 12 +- camel/providers/nntp/camel-nntp-types.h | 4 + camel/providers/nntp/camel-nntp-utils.c | 15 +- camel/providers/nntp/camel-nntp-utils.h | 10 +- camel/providers/pop3/Makefile.am | 1 - camel/providers/pop3/camel-pop3-engine.c | 7 +- camel/providers/pop3/camel-pop3-engine.h | 6 +- camel/providers/pop3/camel-pop3-folder.c | 22 +- camel/providers/pop3/camel-pop3-folder.h | 11 +- camel/providers/pop3/camel-pop3-provider.c | 5 +- camel/providers/pop3/camel-pop3-store.c | 27 +- camel/providers/pop3/camel-pop3-store.h | 11 +- camel/providers/pop3/camel-pop3-stream.c | 3 +- camel/providers/pop3/camel-pop3-stream.h | 4 + camel/providers/sendmail/Makefile.am | 1 - camel/providers/sendmail/camel-sendmail-provider.c | 3 +- .../providers/sendmail/camel-sendmail-transport.c | 15 +- .../providers/sendmail/camel-sendmail-transport.h | 11 +- camel/providers/smtp/Makefile.am | 1 - camel/providers/smtp/camel-smtp-provider.c | 7 +- camel/providers/smtp/camel-smtp-transport.c | 32 +- camel/providers/smtp/camel-smtp-transport.h | 11 +- configure.in | 3 +- docs/reference/Makefile.am | 2 +- .../libedata-book/tmpl/e-data-book-marshal.sgml | 28 + .../libedata-book/tmpl/libedata-book-unused.sgml | 24 - docs/reference/camel/Makefile.am | 14 +- docs/reference/camel/camel-docs.sgml | 9 + docs/reference/camel/camel-sections.txt | 1321 ++++++++++++-------- docs/reference/camel/camel.hierarchy | 67 - docs/reference/camel/tmpl/address-data.sgml | 3 + docs/reference/camel/tmpl/addresses.sgml | 3 + docs/reference/camel/tmpl/camel-address.sgml | 6 + docs/reference/camel/tmpl/camel-arg.sgml | 3 + docs/reference/camel/tmpl/camel-block-file.sgml | 21 +- docs/reference/camel/tmpl/camel-certdb.sgml | 3 + docs/reference/camel/tmpl/camel-charset-map.sgml | 3 + .../reference/camel/tmpl/camel-cipher-context.sgml | 9 + docs/reference/camel/tmpl/camel-data-cache.sgml | 3 + docs/reference/camel/tmpl/camel-data-wrapper.sgml | 9 + docs/reference/camel/tmpl/camel-debug.sgml | 3 + docs/reference/camel/tmpl/camel-digest-folder.sgml | 3 + docs/reference/camel/tmpl/camel-digest-store.sgml | 3 + .../reference/camel/tmpl/camel-digest-summary.sgml | 3 + docs/reference/camel/tmpl/camel-disco-diary.sgml | 3 + docs/reference/camel/tmpl/camel-disco-folder.sgml | 3 + docs/reference/camel/tmpl/camel-disco-store.sgml | 3 + docs/reference/camel/tmpl/camel-exception.sgml | 5 + docs/reference/camel/tmpl/camel-file-utils.sgml | 54 + docs/reference/camel/tmpl/camel-filter-driver.sgml | 3 + docs/reference/camel/tmpl/camel-filter-search.sgml | 3 + docs/reference/camel/tmpl/camel-folder-search.sgml | 3 + .../reference/camel/tmpl/camel-folder-summary.sgml | 53 + docs/reference/camel/tmpl/camel-folder-thread.sgml | 3 + docs/reference/camel/tmpl/camel-folder.sgml | 12 + docs/reference/camel/tmpl/camel-gpg-context.sgml | 5 + .../camel/tmpl/camel-groupwise-folder.sgml | 12 + .../camel/tmpl/camel-groupwise-journal.sgml | 3 + .../camel/tmpl/camel-groupwise-store-summary.sgml | 3 + .../camel/tmpl/camel-groupwise-store.sgml | 49 +- .../camel/tmpl/camel-groupwise-summary.sgml | 12 + .../camel/tmpl/camel-groupwise-transport.sgml | 3 + .../camel/tmpl/camel-groupwise-utils.sgml | 29 +- docs/reference/camel/tmpl/camel-html-parser.sgml | 3 + docs/reference/camel/tmpl/camel-http-stream.sgml | 3 + docs/reference/camel/tmpl/camel-i18n.sgml | 3 + docs/reference/camel/tmpl/camel-iconv.sgml | 3 + docs/reference/camel/tmpl/camel-imap-command.sgml | 3 + docs/reference/camel/tmpl/camel-imap-folder.sgml | 3 + .../camel/tmpl/camel-imap-message-cache.sgml | 3 + docs/reference/camel/tmpl/camel-imap-search.sgml | 3 + .../camel/tmpl/camel-imap-store-summary.sgml | 3 + docs/reference/camel/tmpl/camel-imap-store.sgml | 46 +- docs/reference/camel/tmpl/camel-imap-summary.sgml | 8 +- docs/reference/camel/tmpl/camel-imap-utils.sgml | 3 + docs/reference/camel/tmpl/camel-imap-wrapper.sgml | 11 +- docs/reference/camel/tmpl/camel-imap4-command.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-engine.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-folder.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-journal.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-search.sgml | 3 + .../reference/camel/tmpl/camel-imap4-specials.sgml | 3 + .../camel/tmpl/camel-imap4-store-summary.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-store.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-stream.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-summary.sgml | 3 + docs/reference/camel/tmpl/camel-imap4-utils.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-driver.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-engine.sgml | 3 + .../camel/tmpl/camel-imapp-exception.sgml | 3 + .../camel/tmpl/camel-imapp-fetch-stream.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-folder.sgml | 3 + .../camel/tmpl/camel-imapp-store-summary.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-store.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-stream.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-summary.sgml | 3 + docs/reference/camel/tmpl/camel-imapp-utils.sgml | 3 + docs/reference/camel/tmpl/camel-index.sgml | 20 +- .../camel/tmpl/camel-internet-address.sgml | 5 + docs/reference/camel/tmpl/camel-junk-plugin.sgml | 3 + docs/reference/camel/tmpl/camel-list-utils.sgml | 3 + docs/reference/camel/tmpl/camel-local-folder.sgml | 3 + docs/reference/camel/tmpl/camel-local-store.sgml | 3 + docs/reference/camel/tmpl/camel-local-summary.sgml | 3 + docs/reference/camel/tmpl/camel-lock-client.sgml | 3 + docs/reference/camel/tmpl/camel-lock-helper.sgml | 3 + docs/reference/camel/tmpl/camel-lock.sgml | 3 + .../reference/camel/tmpl/camel-maildir-folder.sgml | 3 + docs/reference/camel/tmpl/camel-maildir-store.sgml | 3 + .../camel/tmpl/camel-maildir-summary.sgml | 3 + docs/reference/camel/tmpl/camel-mbox-folder.sgml | 3 + docs/reference/camel/tmpl/camel-mbox-store.sgml | 3 + docs/reference/camel/tmpl/camel-mbox-summary.sgml | 3 + docs/reference/camel/tmpl/camel-medium.sgml | 5 + docs/reference/camel/tmpl/camel-mh-folder.sgml | 3 + docs/reference/camel/tmpl/camel-mh-store.sgml | 3 + docs/reference/camel/tmpl/camel-mh-summary.sgml | 3 + .../camel/tmpl/camel-mime-filter-basic.sgml | 9 + .../camel/tmpl/camel-mime-filter-bestenc.sgml | 17 + .../camel/tmpl/camel-mime-filter-canon.sgml | 5 + .../camel/tmpl/camel-mime-filter-charset.sgml | 8 + .../camel/tmpl/camel-mime-filter-crlf.sgml | 9 + .../camel/tmpl/camel-mime-filter-enriched.sgml | 6 + .../camel/tmpl/camel-mime-filter-from.sgml | 5 + .../camel/tmpl/camel-mime-filter-gzip.sgml | 3 + .../camel/tmpl/camel-mime-filter-html.sgml | 5 + .../camel/tmpl/camel-mime-filter-index.sgml | 7 + .../camel/tmpl/camel-mime-filter-linewrap.sgml | 3 + .../camel/tmpl/camel-mime-filter-save.sgml | 5 + .../camel/tmpl/camel-mime-filter-tohtml.sgml | 9 + .../camel/tmpl/camel-mime-filter-windows.sgml | 6 + .../camel/tmpl/camel-mime-filter-yenc.sgml | 9 + docs/reference/camel/tmpl/camel-mime-filter.sgml | 13 + docs/reference/camel/tmpl/camel-mime-message.sgml | 40 + docs/reference/camel/tmpl/camel-mime-parser.sgml | 5 + docs/reference/camel/tmpl/camel-mime-part.sgml | 12 + docs/reference/camel/tmpl/camel-mime-utils.sgml | 3 + docs/reference/camel/tmpl/camel-movemail.sgml | 3 + .../camel/tmpl/camel-multipart-encrypted.sgml | 8 + .../camel/tmpl/camel-multipart-signed.sgml | 13 + docs/reference/camel/tmpl/camel-multipart.sgml | 7 + docs/reference/camel/tmpl/camel-net-utils.sgml | 3 + docs/reference/camel/tmpl/camel-news-address.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-address.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-auth.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-folder.sgml | 3 + .../reference/camel/tmpl/camel-nntp-grouplist.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-newsrc.sgml | 3 + .../camel/tmpl/camel-nntp-resp-codes.sgml | 3 + .../camel/tmpl/camel-nntp-store-summary.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-store.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-stream.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-summary.sgml | 3 + docs/reference/camel/tmpl/camel-nntp-utils.sgml | 3 + docs/reference/camel/tmpl/camel-object.sgml | 70 ++ .../reference/camel/tmpl/camel-offline-folder.sgml | 5 + .../camel/tmpl/camel-offline-journal.sgml | 7 + docs/reference/camel/tmpl/camel-offline-store.sgml | 5 + docs/reference/camel/tmpl/camel-operation.sgml | 3 + .../camel/tmpl/camel-partition-table.sgml | 24 +- docs/reference/camel/tmpl/camel-pop3-engine.sgml | 3 + docs/reference/camel/tmpl/camel-pop3-folder.sgml | 14 + docs/reference/camel/tmpl/camel-pop3-store.sgml | 4 + docs/reference/camel/tmpl/camel-pop3-stream.sgml | 3 + docs/reference/camel/tmpl/camel-process.sgml | 3 + docs/reference/camel/tmpl/camel-provider.sgml | 44 + .../reference/camel/tmpl/camel-sasl-anonymous.sgml | 6 + docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml | 4 + .../camel/tmpl/camel-sasl-digest-md5.sgml | 5 + docs/reference/camel/tmpl/camel-sasl-gssapi.sgml | 5 + .../reference/camel/tmpl/camel-sasl-kerberos4.sgml | 5 + docs/reference/camel/tmpl/camel-sasl-login.sgml | 5 + docs/reference/camel/tmpl/camel-sasl-ntlm.sgml | 4 + docs/reference/camel/tmpl/camel-sasl-plain.sgml | 4 + .../reference/camel/tmpl/camel-sasl-popb4smtp.sgml | 4 + docs/reference/camel/tmpl/camel-sasl.sgml | 8 + .../camel/tmpl/camel-seekable-stream.sgml | 7 + .../camel/tmpl/camel-seekable-substream.sgml | 5 + .../camel/tmpl/camel-sendmail-transport.sgml | 3 + docs/reference/camel/tmpl/camel-service.sgml | 10 + docs/reference/camel/tmpl/camel-session.sgml | 28 + docs/reference/camel/tmpl/camel-smime-context.sgml | 5 + .../reference/camel/tmpl/camel-smtp-transport.sgml | 3 + docs/reference/camel/tmpl/camel-spool-folder.sgml | 3 + docs/reference/camel/tmpl/camel-spool-store.sgml | 3 + docs/reference/camel/tmpl/camel-spool-summary.sgml | 3 + docs/reference/camel/tmpl/camel-store-summary.sgml | 15 + docs/reference/camel/tmpl/camel-store.sgml | 44 +- docs/reference/camel/tmpl/camel-stream-buffer.sgml | 13 + docs/reference/camel/tmpl/camel-stream-filter.sgml | 6 + docs/reference/camel/tmpl/camel-stream-fs.sgml | 5 + docs/reference/camel/tmpl/camel-stream-mem.sgml | 7 + docs/reference/camel/tmpl/camel-stream-null.sgml | 5 + .../reference/camel/tmpl/camel-stream-process.sgml | 6 + docs/reference/camel/tmpl/camel-stream.sgml | 5 + docs/reference/camel/tmpl/camel-string-utils.sgml | 13 + .../reference/camel/tmpl/camel-tcp-stream-raw.sgml | 5 + .../reference/camel/tmpl/camel-tcp-stream-ssl.sgml | 5 + docs/reference/camel/tmpl/camel-tcp-stream.sgml | 4 + docs/reference/camel/tmpl/camel-test-provider.sgml | 3 + docs/reference/camel/tmpl/camel-test.sgml | 3 + docs/reference/camel/tmpl/camel-text-index.sgml | 23 +- docs/reference/camel/tmpl/camel-transport.sgml | 5 + docs/reference/camel/tmpl/camel-uid-cache.sgml | 3 + docs/reference/camel/tmpl/camel-unused.sgml | 526 ++++++++ docs/reference/camel/tmpl/camel-url-scanner.sgml | 3 + docs/reference/camel/tmpl/camel-url.sgml | 12 + docs/reference/camel/tmpl/camel-utf8.sgml | 3 + docs/reference/camel/tmpl/camel-vee-folder.sgml | 10 + docs/reference/camel/tmpl/camel-vee-store.sgml | 6 + docs/reference/camel/tmpl/camel-vee-summary.sgml | 4 + docs/reference/camel/tmpl/camel-vtrash-folder.sgml | 5 + docs/reference/camel/tmpl/camel.sgml | 3 + docs/reference/camel/tmpl/folders.sgml | 3 + docs/reference/camel/tmpl/messages.sgml | 3 + docs/reference/camel/tmpl/session.sgml | 3 + docs/reference/camel/tmpl/streams.sgml | 3 + .../tmpl/libedataserverui-unused.sgml | 76 ++ 565 files changed, 4652 insertions(+), 3063 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28ee71e..fd20f66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-04-27 Matthew Barnes + + ** Fixes part of bug #418852 + + * configure.in: + * docs/reference/camel: + * docs/reference/Makefile.am: + Resurrect Camel's API documentation. + 2007-04-24 Matthew Barnes * docs/reference: diff --git a/camel/ChangeLog b/camel/ChangeLog index 9b6b776..e3daac3 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,37 @@ +2007-04-27 Matthew Barnes + + ** Fixes part of bug #418852 + + * Note, these changes touch almost every file in Camel. + + * Replace C++ declaration guards (extern "C" { ... }) with + G_BEGIN_DECLS / G_END_DECLS, or add them to headers with + no declaration guards at all. + + * Use GLib's i18n support instead of Camel's (now deprecated). + + * Use quotes and brackets consistently in #include directives. + + * Remove CAMEL_EXPLICIT_TRANSLATION_DOMAIN from Makefiles. + + * Fix documentation warnings identified by Gtk-Doc. + + * camel.h: + Expose Camel's entire "core" (non-provider) API. + + * camel-i18n.h: + Deprecate this API. Use GLib's i18n support instead. + + * camel-folder.h (camel_folder_get_message_flags): + * camel-folder.h (camel_folder_set_message_flags): + * camel-folder.h (camel_folder_get_message_user_flag): + * camel-folder.h (camel_folder_set_message_user_flag): + * camel-folder.h (camel_folder_get_message_user_tag): + * camel-folder.h (camel_folder_set_message_user_tag): + * camel-folder.h (camel_folder_get_unread_message_count): + * camel-folder.h (camel_folder_ref_message_info): + Add deprecation guards around these function declarations. + 2007-04-05 Ross Burton * camel-data-cache.c: (camel_data_cache_new): diff --git a/camel/Makefile.am b/camel/Makefile.am index 51f92b9..180ce34 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -37,7 +37,6 @@ INCLUDES = -I.. -I$(srcdir)/.. \ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \ -DG_LOG_DOMAIN=\"camel\" \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DE_DATA_SERVER_PREFIX=\"$(prefix)\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ $(CAMEL_CFLAGS) diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c index 9d9737c..8c8cfa6 100644 --- a/camel/broken-date-parser.c +++ b/camel/broken-date-parser.c @@ -25,16 +25,18 @@ #include #endif -#include +#include #include #include #include -#include -#include #include +#include + +#include + +#include #include "broken-date-parser.h" -#include "libedataserver/e-time-utils.h" #define d(x) diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h index 8f07bf8..a9e18b1 100644 --- a/camel/broken-date-parser.h +++ b/camel/broken-date-parser.h @@ -23,11 +23,10 @@ #include +G_BEGIN_DECLS + /* prototypes for functions dealing with broken date formats */ time_t parse_broken_date (const char *datestr, int *saveoffset); - - - - +G_END_DECLS diff --git a/camel/camel-address.h b/camel/camel-address.h index 6acfbb4..d9a721f 100644 --- a/camel/camel-address.h +++ b/camel/camel-address.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_ADDRESS_H #define _CAMEL_ADDRESS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass) #define CAMEL_IS_ADDRESS(obj) CAMEL_CHECK_TYPE (obj, camel_address_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelAddressClass CamelAddressClass; struct _CamelAddress { @@ -73,8 +70,6 @@ int camel_address_copy (CamelAddress *dest, const CamelAddress *source); void camel_address_remove (CamelAddress *addr, int index); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_ADDRESS_H */ diff --git a/camel/camel-arg.c b/camel/camel-arg.c index 721239a..d985dde 100644 --- a/camel/camel-arg.c +++ b/camel/camel-arg.c @@ -25,6 +25,7 @@ #endif #include + #include "camel-arg.h" int camel_argv_build(CamelArgV *tv) diff --git a/camel/camel-arg.h b/camel/camel-arg.h index a5b7ea8..f5c573b 100644 --- a/camel/camel-arg.h +++ b/camel/camel-arg.h @@ -23,14 +23,11 @@ #ifndef CAMEL_ARG_H #define CAMEL_ARG_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus } */ - #include #include +G_BEGIN_DECLS + enum camel_arg_t { CAMEL_ARG_END = 0, CAMEL_ARG_IGNORE = 1, /* override/ignore an arg in-place */ @@ -112,8 +109,6 @@ struct _CamelProperty { char *description; }; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS -#endif /* CAMEL_ARG_H */ +#endif /* CAMEL_ARG_H */ diff --git a/camel/camel-block-file.c b/camel/camel-block-file.c index 3320133..3546bc4 100644 --- a/camel/camel-block-file.c +++ b/camel/camel-block-file.c @@ -23,18 +23,19 @@ #include #endif +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include +#include +#include +#include #include -#include "libedataserver/e-msgport.h" +#include #include "camel-block-file.h" #include "camel-file-utils.h" @@ -967,7 +968,7 @@ key_file_unuse(CamelKeyFile *bs) * camel_key_file_new: * @path: * @flags: open flags - * @version[]: Version string (header) of file. Currently + * @version: Version string (header) of file. Currently * written but not checked. * * Create a new key file. A linked list of record blocks. diff --git a/camel/camel-block-file.h b/camel/camel-block-file.h index 4e579b7..fb2e188 100644 --- a/camel/camel-block-file.h +++ b/camel/camel-block-file.h @@ -26,6 +26,8 @@ #include #include +G_BEGIN_DECLS + typedef guint32 camel_block_t; /* block offset, absolute, bottom BLOCK_SIZE_BITS always 0 */ typedef guint32 camel_key_t; /* this is a bitfield of (block offset:BLOCK_SIZE_BITS) */ @@ -140,5 +142,6 @@ int camel_key_file_delete(CamelKeyFile *kf); int camel_key_file_write(CamelKeyFile *kf, camel_block_t *parent, size_t len, camel_key_t *records); int camel_key_file_read(CamelKeyFile *kf, camel_block_t *start, size_t *len, camel_key_t **records); +G_END_DECLS #endif /* ! _CAMEL_BLOCK_FILE_H */ diff --git a/camel/camel-certdb.c b/camel/camel-certdb.c index 416945b..8f95e23 100644 --- a/camel/camel-certdb.c +++ b/camel/camel-certdb.c @@ -25,24 +25,24 @@ #include #endif -#include +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include +#include +#include +#include #include +#include + #include "camel-certdb.h" #include "camel-file-utils.h" #include "camel-private.h" -#include "libedataserver/e-memory.h" - #define CAMEL_CERTDB_GET_CLASS(db) ((CamelCertDBClass *) CAMEL_OBJECT_GET_CLASS (db)) #define CAMEL_CERTDB_VERSION 0x100 diff --git a/camel/camel-certdb.h b/camel/camel-certdb.h index c5b42d0..38af800 100644 --- a/camel/camel-certdb.h +++ b/camel/camel-certdb.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_CERTDB_H__ #define __CAMEL_CERTDB_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_CERTDB_CLASS(klass) (CAMEL_CHECK_CLASS_CAST (klass, camel_certdb_get_type (), CamelCertDBClass)) #define CAMEL_IS_CERTDB(obj) (CAMEL_CHECK_TYPE (obj, camel_certdb_get_type ())) +G_BEGIN_DECLS + typedef struct _CamelCertDB CamelCertDB; typedef struct _CamelCertDBClass CamelCertDBClass; @@ -147,8 +144,6 @@ void camel_cert_set_string (CamelCertDB *certdb, CamelCert *cert, int string, co CamelCertTrust camel_cert_get_trust (CamelCertDB *certdb, CamelCert *cert); void camel_cert_set_trust (CamelCertDB *certdb, CamelCert *cert, CamelCertTrust trust); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_CERTDB_H__ */ diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c index 1949f20..c58ca47 100644 --- a/camel/camel-charset-map.c +++ b/camel/camel-charset-map.c @@ -27,10 +27,10 @@ #include #endif +#include #include #include #include -#include /* if you want to build the charset map, compile this with something like: diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h index 0750797..eb76495 100644 --- a/camel/camel-charset-map.h +++ b/camel/camel-charset-map.h @@ -22,10 +22,9 @@ #ifndef _CAMEL_CHARSET_MAP_H #define _CAMEL_CHARSET_MAP_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +#include + +G_BEGIN_DECLS typedef struct _CamelCharset CamelCharset; @@ -44,8 +43,6 @@ const char *camel_charset_best(const char *in, int len); const char *camel_charset_iso_to_windows (const char *isocharset); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_CHARSET_MAP_H */ diff --git a/camel/camel-cipher-context.c b/camel/camel-cipher-context.c index a454f39..c06bf6d 100644 --- a/camel/camel-cipher-context.c +++ b/camel/camel-cipher-context.c @@ -27,8 +27,8 @@ #include #include +#include -#include "camel-i18n.h" #include "camel-cipher-context.h" #include "camel-stream.h" #include "camel-operation.h" @@ -195,8 +195,8 @@ cipher_encrypt (CamelCipherContext *context, const char *userid, GPtrArray *reci * @context: Cipher Context * @userid: key id (or email address) to use when signing, or NULL to not sign. * @recipients: an array of recipient key ids and/or email addresses - * @istream: cleartext input stream - * @ostream: ciphertext output stream + * @ipart: cleartext input stream + * @opart: ciphertext output stream * @ex: exception * * Encrypts (and optionally signs) the cleartext input stream and @@ -275,7 +275,7 @@ cipher_import_keys (CamelCipherContext *context, struct _CamelStream *istream, C /** * camel_cipher_import_keys: - * @ctx: Cipher Context + * @context: Cipher Context * @istream: input stream (containing keys) * @ex: exception * @@ -305,7 +305,7 @@ cipher_export_keys (CamelCipherContext *context, GPtrArray *keys, /** * camel_cipher_export_keys: - * @ctx: Cipher Context + * @context: Cipher Context * @keys: an array of key ids * @ostream: output stream * @ex: exception @@ -484,8 +484,8 @@ camel_cipher_validity_add_certinfo(CamelCipherValidity *vin, enum _camel_cipher_ /** * camel_cipher_validity_envelope: - * @validity: - * @outer: + * @parent: + * @valid: * * Calculate a conglomerate validity based on wrapping one secure part inside * another one. diff --git a/camel/camel-cipher-context.h b/camel/camel-cipher-context.h index 6224f35..0452443 100644 --- a/camel/camel-cipher-context.h +++ b/camel/camel-cipher-context.h @@ -27,21 +27,18 @@ #include /* FIXME: camelise */ -#include "libedataserver/e-msgport.h" - -struct _CamelStream; -struct _CamelMimePart; - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +#include #define CAMEL_CIPHER_CONTEXT_TYPE (camel_cipher_context_get_type ()) #define CAMEL_CIPHER_CONTEXT(obj) (CAMEL_CHECK_CAST((obj), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContext)) #define CAMEL_CIPHER_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CIPHER_CONTEXT_TYPE, CamelCipherContextClass)) #define CAMEL_IS_CIPHER_CONTEXT(o) (CAMEL_CHECK_TYPE((o), CAMEL_CIPHER_CONTEXT_TYPE)) +G_BEGIN_DECLS + +struct _CamelStream; +struct _CamelMimePart; + typedef struct _CamelCipherValidity CamelCipherValidity; typedef struct _CamelCipherCertInfo CamelCipherCertInfo; @@ -184,8 +181,6 @@ void camel_cipher_validity_free (CamelCipherValidity *validity); /* utility functions */ int camel_cipher_canonical_to_stream(CamelMimePart *part, guint32 flags, CamelStream *ostream); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_CIPHER_CONTEXT_H */ diff --git a/camel/camel-data-cache.c b/camel/camel-data-cache.c index 37a07e9..a9089db 100644 --- a/camel/camel-data-cache.c +++ b/camel/camel-data-cache.c @@ -33,10 +33,11 @@ #include #endif +#include #include +#include #include -#include "camel-i18n.h" #include "camel-data-cache.h" #include "camel-exception.h" #include "camel-stream-fs.h" @@ -149,7 +150,7 @@ camel_data_cache_new(const char *path, guint32 flags, CamelException *ex) /** * camel_data_cache_set_expire_age: - * @cdc: + * @cdc: A #CamelDataCache * @when: Timeout for age expiry, or -1 to disable. * * Set the cache expiration policy for aged entries. @@ -170,7 +171,7 @@ camel_data_cache_set_expire_age(CamelDataCache *cdc, time_t when) /** * camel_data_cache_set_expire_access: - * @cdc: + * @cdc: A #CamelDataCache * @when: Timeout for access, or -1 to disable access expiry. * * Set the cache expiration policy for access times. @@ -272,7 +273,7 @@ data_cache_path(CamelDataCache *cdc, int create, const char *path, const char *k /** * camel_data_cache_add: - * @cdc: + * @cdc: A #CamelDataCache * @path: Relative path of item to add. * @key: Key of item to add. * @ex: @@ -320,7 +321,7 @@ camel_data_cache_add(CamelDataCache *cdc, const char *path, const char *key, Cam /** * camel_data_cache_get: - * @cdc: + * @cdc: A #CamelDataCache * @path: Path to the (sub) cache the item exists in. * @key: Key for the cache item. * @ex: @@ -354,7 +355,7 @@ camel_data_cache_get(CamelDataCache *cdc, const char *path, const char *key, Cam /** * camel_data_cache_remove: - * @cdc: + * @cdc: A #CamelDataCache * @path: * @key: * @ex: diff --git a/camel/camel-data-cache.h b/camel/camel-data-cache.h index 290deb7..4ade37f 100644 --- a/camel/camel-data-cache.h +++ b/camel/camel-data-cache.h @@ -24,11 +24,6 @@ #ifndef CAMEL_DATA_CACHE_H #define CAMEL_DATA_CACHE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include @@ -39,6 +34,8 @@ extern "C" { #define CAMEL_DATA_CACHE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_CACHE_TYPE, CamelFolderClass)) #define CAMEL_IS_DATA_CACHE(o) (CAMEL_CHECK_TYPE((o), CAMEL_DATA_CACHE_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelDataCache CamelDataCache; typedef struct _CamelDataCacheClass CamelDataCacheClass; @@ -91,8 +88,6 @@ int camel_data_cache_clear(CamelDataCache *cache, /* Standard Camel function */ CamelType camel_data_cache_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DATA_CACHE_H */ diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c index e0715f9..7b76de4 100644 --- a/camel/camel-data-wrapper.c +++ b/camel/camel-data-wrapper.c @@ -28,12 +28,12 @@ #include #include "camel-data-wrapper.h" -#include "camel-stream.h" -#include "camel-stream-filter.h" +#include "camel-exception.h" #include "camel-mime-filter-basic.h" #include "camel-mime-filter-crlf.h" -#include "camel-exception.h" #include "camel-private.h" +#include "camel-stream-filter.h" +#include "camel-stream.h" #define d(x) @@ -156,10 +156,9 @@ write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) * camel_data_wrapper_write_to_stream: * @data_wrapper: a #CamelDataWrapper object * @stream: a #CamelStream for output - * @ex: a #CamelException * - * Writes the content of @data_wrapper to @stream in a machine-independent format - * appropriate for the data. It should be possible to construct an + * Writes the content of @data_wrapper to @stream in a machine-independent + * format appropriate for the data. It should be possible to construct an * equivalent data wrapper object later by passing this stream to * #camel_data_wrapper_construct_from_stream. * @@ -224,7 +223,6 @@ decode_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream) * camel_data_wrapper_decode_to_stream: * @data_wrapper: a #CamelDataWrapper object * @stream: a #CamelStream for decoded data to be written to - * @ex: a #CamelException * * Writes the decoded data content to @stream. * diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h index dd9b6d6..b2f98e0 100644 --- a/camel/camel-data-wrapper.h +++ b/camel/camel-data-wrapper.h @@ -26,11 +26,6 @@ #ifndef CAMEL_DATA_WRAPPER_H #define CAMEL_DATA_WRAPPER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -41,6 +36,8 @@ extern "C" { #define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass)) #define CAMEL_IS_DATA_WRAPPER(o) (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE)) +G_BEGIN_DECLS + struct _CamelDataWrapper { CamelObject parent_object; struct _CamelDataWrapperPrivate *priv; @@ -98,8 +95,6 @@ int camel_data_wrapper_construct_from_stream (CamelDataWrapper *d gboolean camel_data_wrapper_is_offline (CamelDataWrapper *data_wrapper); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DATA_WRAPPER_H */ diff --git a/camel/camel-debug.c b/camel/camel-debug.c index 2b3c10e..213143b 100644 --- a/camel/camel-debug.c +++ b/camel/camel-debug.c @@ -19,13 +19,13 @@ * USA */ +#include +#include #include #include -#include -#include +#include -#include "libedataserver/e-data-server-util.h" #include "camel-debug.h" int camel_verbose_debug; diff --git a/camel/camel-debug.h b/camel/camel-debug.h index 8d81fc1..5ad1c0e 100644 --- a/camel/camel-debug.h +++ b/camel/camel-debug.h @@ -22,17 +22,14 @@ #ifndef CAMEL_DEBUG_H #define CAMEL_DEBUG_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include /* This is how the basic debug checking strings should be done */ #define CAMEL_DEBUG_IMAP "imap" #define CAMEL_DEBUG_IMAP_FOLDER "imap:folder" +G_BEGIN_DECLS + void camel_debug_init(void); gboolean camel_debug(const char *mode); @@ -42,8 +39,6 @@ void camel_debug_end(void); /* This interface is deprecated */ extern int camel_verbose_debug; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DEBUG_H */ diff --git a/camel/camel-digest-folder.c b/camel/camel-digest-folder.c index 07acbe2..42b3cd2 100644 --- a/camel/camel-digest-folder.c +++ b/camel/camel-digest-folder.c @@ -26,11 +26,10 @@ #include "camel-digest-folder.h" #include "camel-digest-summary.h" - #include "camel-exception.h" -#include "camel-multipart.h" -#include "camel-mime-message.h" #include "camel-folder-search.h" +#include "camel-mime-message.h" +#include "camel-multipart.h" #define d(x) diff --git a/camel/camel-digest-folder.h b/camel/camel-digest-folder.h index 896cfd5..1a36986 100644 --- a/camel/camel-digest-folder.h +++ b/camel/camel-digest-folder.h @@ -32,6 +32,8 @@ #define CAMEL_DIGEST_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_folder_get_type (), CamelDigestFolderClass) #define CAMEL_IS_DIGEST_FOLDER(obj) CAMEL_CHECK_TYPE (obj, camel_digest_folder_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelDigestFolderClass CamelDigestFolderClass; struct _CamelDigestFolder { @@ -49,4 +51,6 @@ CamelType camel_digest_folder_get_type (void); CamelFolder *camel_digest_folder_new (CamelStore *parent_store, CamelMimeMessage *message); +G_END_DECLS + #endif /* ! _CAMEL_DIGEST_FOLDER_H */ diff --git a/camel/camel-digest-store.c b/camel/camel-digest-store.c index 4cb8308..224db64 100644 --- a/camel/camel-digest-store.c +++ b/camel/camel-digest-store.c @@ -27,10 +27,9 @@ #include -#include "camel-exception.h" -#include "camel-digest-store.h" #include "camel-digest-folder.h" - +#include "camel-digest-store.h" +#include "camel-exception.h" #include "camel-private.h" #define d(x) diff --git a/camel/camel-digest-store.h b/camel/camel-digest-store.h index d217d88..71e987c 100644 --- a/camel/camel-digest-store.h +++ b/camel/camel-digest-store.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_DIGEST_STORE_H__ #define __CAMEL_DIGEST_STORE_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_DIGEST_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_store_get_type (), CamelDigestStoreClass) #define CAMEL_IS_DIGEST_STORE(obj) CAMEL_CHECK_TYPE (obj, camel_digest_store_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelDigestStoreClass CamelDigestStoreClass; struct _CamelDigestStore { @@ -52,8 +49,6 @@ CamelType camel_digest_store_get_type (void); CamelStore *camel_digest_store_new (const char *url); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_DIGEST_STORE_H__ */ diff --git a/camel/camel-digest-summary.h b/camel/camel-digest-summary.h index b4bea49..2dad6e7 100644 --- a/camel/camel-digest-summary.h +++ b/camel/camel-digest-summary.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_DIGEST_SUMMARY_H__ #define __CAMEL_DIGEST_SUMMARY_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_DIGEST_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_digest_summary_get_type (), CamelDigestSummaryClass) #define CAMEL_IS_DIGEST_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_digest_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelDigestSummary CamelDigestSummary; typedef struct _CamelDigestSummaryClass CamelDigestSummaryClass; @@ -55,8 +52,6 @@ CamelType camel_digest_summary_get_type (void); CamelFolderSummary *camel_digest_summary_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_DIGEST_SUMMARY_H__ */ diff --git a/camel/camel-disco-diary.c b/camel/camel-disco-diary.c index caafe31..193d4e3 100644 --- a/camel/camel-disco-diary.c +++ b/camel/camel-disco-diary.c @@ -29,9 +29,10 @@ #include #include +#include #include +#include -#include "camel-i18n.h" #include "camel-disco-diary.h" #include "camel-disco-folder.h" #include "camel-disco-store.h" diff --git a/camel/camel-disco-diary.h b/camel/camel-disco-diary.h index 23f9d98..8c3e65d 100644 --- a/camel/camel-disco-diary.h +++ b/camel/camel-disco-diary.h @@ -24,11 +24,6 @@ #ifndef CAMEL_DISCO_DIARY_H #define CAMEL_DISCO_DIARY_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-object.h" #include #include @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_DISCO_DIARY_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_DIARY_TYPE, CamelDiscoDiaryClass)) #define CAMEL_IS_DISCO_DIARY(o) (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_DIARY_TYPE)) +G_BEGIN_DECLS + typedef enum { CAMEL_DISCO_DIARY_END = 0, @@ -91,8 +88,6 @@ const char *camel_disco_diary_uidmap_lookup (CamelDiscoDiary *diary, /* Standard Camel function */ CamelType camel_disco_diary_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DISCO_DIARY_H */ diff --git a/camel/camel-disco-folder.c b/camel/camel-disco-folder.c index 9986f05..dc04a6f 100644 --- a/camel/camel-disco-folder.c +++ b/camel/camel-disco-folder.c @@ -25,12 +25,13 @@ #include #endif +#include +#include + #include "camel-disco-folder.h" #include "camel-disco-store.h" #include "camel-exception.h" - #include "camel-session.h" -#include "camel-i18n.h" #define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o))) #define CDF_CLASS(o) (CAMEL_DISCO_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS (o))) diff --git a/camel/camel-disco-folder.h b/camel/camel-disco-folder.h index b0a7613..eb79405 100644 --- a/camel/camel-disco-folder.h +++ b/camel/camel-disco-folder.h @@ -24,11 +24,6 @@ #ifndef CAMEL_DISCO_FOLDER_H #define CAMEL_DISCO_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-folder.h" #define CAMEL_DISCO_FOLDER_TYPE (camel_disco_folder_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_DISCO_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_FOLDER_TYPE, CamelDiscoFolderClass)) #define CAMEL_IS_DISCO_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_FOLDER_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_DISCO_FOLDER_ARG_OFFLINE_SYNC = CAMEL_FOLDER_ARG_LAST, @@ -125,8 +122,6 @@ void camel_disco_folder_prepare_for_offline (CamelDiscoFolder *disco_folder, /* Standard Camel function */ CamelType camel_disco_folder_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DISCO_FOLDER_H */ diff --git a/camel/camel-disco-store.c b/camel/camel-disco-store.c index 2828179..ed452ba 100644 --- a/camel/camel-disco-store.c +++ b/camel/camel-disco-store.c @@ -27,12 +27,14 @@ #include #endif -#include "camel-disco-store.h" +#include +#include + #include "camel-disco-diary.h" #include "camel-disco-folder.h" +#include "camel-disco-store.h" #include "camel-exception.h" #include "camel-session.h" -#include "camel-i18n.h" #define d(x) diff --git a/camel/camel-disco-store.h b/camel/camel-disco-store.h index a679f58..b32a4a4 100644 --- a/camel/camel-disco-store.h +++ b/camel/camel-disco-store.h @@ -25,12 +25,6 @@ #ifndef CAMEL_DISCO_STORE_H #define CAMEL_DISCO_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_DISCO_STORE_TYPE (camel_disco_store_get_type ()) @@ -38,6 +32,8 @@ extern "C" { #define CAMEL_DISCO_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DISCO_STORE_TYPE, CamelDiscoStoreClass)) #define CAMEL_IS_DISCO_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_DISCO_STORE_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_DISCO_STORE_ARG_FIRST = CAMEL_STORE_ARG_FIRST + 100, }; @@ -118,8 +114,6 @@ gboolean camel_disco_store_can_work_offline (CamelDiscoStore *); /* Convenience functions */ gboolean camel_disco_store_check_online (CamelDiscoStore *store, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DISCO_STORE_H */ diff --git a/camel/camel-exception.c b/camel/camel-exception.c index f49484a..227f997 100644 --- a/camel/camel-exception.c +++ b/camel/camel-exception.c @@ -26,14 +26,15 @@ #endif #include -#include #include -#include "camel-exception.h" -#include "libedataserver/e-memory.h" -#include "camel-i18n.h" +#include +#include + +#include #include "camel-debug.h" +#include "camel-exception.h" /* dont turn this off */ #define w(x) x diff --git a/camel/camel-exception.h b/camel/camel-exception.h index 4131e82..98b92fc 100644 --- a/camel/camel-exception.h +++ b/camel/camel-exception.h @@ -28,14 +28,10 @@ #ifndef CAMEL_EXCEPTION_H #define CAMEL_EXCEPTION_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include +G_BEGIN_DECLS + typedef enum { #include "camel-exception-list.def" @@ -76,9 +72,7 @@ const char * camel_exception_get_description (CamelException *ex); #define camel_exception_is_set(ex) (camel_exception_get_id (ex) != CAMEL_EXCEPTION_NONE) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_EXCEPTION_H */ diff --git a/camel/camel-file-utils.c b/camel/camel-file-utils.c index 255c6aa..1848d23 100644 --- a/camel/camel-file-utils.c +++ b/camel/camel-file-utils.c @@ -27,12 +27,12 @@ #include #endif +#include +#include #include +#include #include #include -#include -#include -#include #include @@ -41,7 +41,7 @@ #define EWOULDBLOCK EAGAIN #endif -#include "libedataserver/e-data-server-util.h" +#include #include "camel-file-utils.h" #include "camel-operation.h" diff --git a/camel/camel-file-utils.h b/camel/camel-file-utils.h index b00c8a1..fab122f 100644 --- a/camel/camel-file-utils.h +++ b/camel/camel-file-utils.h @@ -27,11 +27,6 @@ #ifndef CAMEL_FILE_UTILS_H #define CAMEL_FILE_UTILS_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -42,6 +37,8 @@ extern "C" { #define O_BINARY 0 #endif +G_BEGIN_DECLS + int camel_file_util_encode_fixed_int32 (FILE *out, gint32); int camel_file_util_decode_fixed_int32 (FILE *in, gint32 *); int camel_file_util_encode_uint32 (FILE *out, guint32); @@ -75,8 +72,6 @@ ssize_t camel_write_socket (int fd, const char *buf, size_t n); char *camel_file_util_savename(const char *filename); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_FILE_UTILS_H */ diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c index b4bf0fa..b382b15 100644 --- a/camel/camel-filter-driver.c +++ b/camel/camel-filter-driver.c @@ -20,31 +20,33 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H #include +#endif +#include +#include #include -#include -#include #include -#include -#include - -#include -#include +#include +#include #ifndef G_OS_WIN32 #include #endif -#include "libedataserver/e-sexp.h" -#include "libedataserver/e-memory.h" -#include "libedataserver/e-msgport.h" +#include +#include +#include + +#include +#include +#include #include "camel-debug.h" #include "camel-file-utils.h" #include "camel-filter-driver.h" #include "camel-filter-search.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-private.h" #include "camel-service.h" @@ -1127,6 +1129,7 @@ camel_filter_driver_flush (CamelFilterDriver *driver, CamelException *ex) * camel_filter_driver_filter_mbox: * @driver: CamelFilterDriver * @mbox: mbox filename to be filtered + * @original_source_url: * @ex: exception * * Filters an mbox file based on rules defined in the FilterDriver diff --git a/camel/camel-filter-driver.h b/camel/camel-filter-driver.h index b693311..9709341 100644 --- a/camel/camel-filter-driver.h +++ b/camel/camel-filter-driver.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_FILTER_DRIVER_H #define _CAMEL_FILTER_DRIVER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_FILTER_DRIVER_CLASS(klass) CAMEL__CHECK_CLASS_CAST (klass, CAMEL_FILTER_DRIVER_TYPE, CamelFilterDriverClass) #define CAMEL_IS_FILTER_DRIVER(obj) CAMEL_CHECK_TYPE (obj, CAMEL_FILTER_DRIVER_TYPE) +G_BEGIN_DECLS + typedef struct _CamelFilterDriverClass CamelFilterDriverClass; struct _CamelFilterDriver { @@ -112,8 +109,6 @@ int camel_filter_driver_rule_count (CamelFilterDriver *d); struct filter_option *camel_filter_driver_rule_get (CamelFilterDriver *d, int n); #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_FILTER_DRIVER_H */ diff --git a/camel/camel-filter-search.c b/camel/camel-filter-search.c index 9f82c12..6e30020 100644 --- a/camel/camel-filter-search.c +++ b/camel/camel-filter-search.c @@ -22,34 +22,35 @@ * */ +#ifdef HAVE_CONFIG_H #include +#endif -/* (from glibc headers: - POSIX says that must be included (by the caller) before . */ +/* POSIX requires be included before */ +#include +#include +#include +#include +#include #include #include -#include -#include #include #include -#include -#include -#include - -#include #ifndef G_OS_WIN32 #include #endif -#include "libedataserver/e-sexp.h" -#include "libedataserver/e-iconv.h" +#include +#include + +#include +#include #include "camel-debug.h" #include "camel-exception.h" #include "camel-filter-search.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-multipart.h" #include "camel-provider.h" diff --git a/camel/camel-filter-search.h b/camel/camel-filter-search.h index 1d5323c..bb8ba45 100644 --- a/camel/camel-filter-search.h +++ b/camel/camel-filter-search.h @@ -25,15 +25,12 @@ #ifndef CAMEL_FILTER_SEARCH_H #define CAMEL_FILTER_SEARCH_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include +G_BEGIN_DECLS + enum { CAMEL_SEARCH_ERROR = -1, CAMEL_SEARCH_NOMATCH = 0, @@ -47,8 +44,6 @@ int camel_filter_search_match (CamelSession *session, CamelMessageInfo *info, const char *source, const char *expression, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! CAMEL_FILTER_SEARCH_H */ diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c index dc1198e..4bec0f5 100644 --- a/camel/camel-folder-search.c +++ b/camel/camel-folder-search.c @@ -27,26 +27,27 @@ #include #endif -#include -#include -#include +/* POSIX requires be included before */ #include + +#include #include +#include +#include #include +#include -#include "libedataserver/e-memory.h" +#include +#include "camel-exception.h" #include "camel-folder-search.h" #include "camel-folder-thread.h" - -#include "camel-exception.h" #include "camel-medium.h" -#include "camel-multipart.h" #include "camel-mime-message.h" -#include "camel-stream-mem.h" +#include "camel-multipart.h" #include "camel-search-private.h" -#include "camel-i18n.h" +#include "camel-stream-mem.h" #define d(x) #define r(x) diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h index f9f3831..131e76c 100644 --- a/camel/camel-folder-search.h +++ b/camel/camel-folder-search.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_FOLDER_SEARCH_H #define _CAMEL_FOLDER_SEARCH_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_FOLDER_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass) #define CAMEL_IS_FOLDER_SEARCH(obj) CAMEL_CHECK_TYPE (obj, camel_folder_search_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelFolderSearchClass CamelFolderSearchClass; struct _CamelFolderSearch { @@ -132,8 +129,6 @@ GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, con GPtrArray *camel_folder_search_search(CamelFolderSearch *search, const char *expr, GPtrArray *uids, CamelException *ex); void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_FOLDER_SEARCH_H */ diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index f0abd6a..3534ac6 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -23,39 +23,39 @@ #include #endif +#include +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include -#include +#include +#include -#include "libedataserver/e-iconv.h" +#include +#include + +#include +#include +#include -#include "camel-folder.h" -#include "camel-folder-summary.h" #include "camel-file-utils.h" -#include "camel-mime-filter.h" -#include "camel-mime-filter-index.h" -#include "camel-mime-filter-charset.h" +#include "camel-folder-summary.h" +#include "camel-folder.h" #include "camel-mime-filter-basic.h" +#include "camel-mime-filter-charset.h" #include "camel-mime-filter-html.h" +#include "camel-mime-filter-index.h" +#include "camel-mime-filter.h" #include "camel-mime-message.h" #include "camel-multipart.h" #include "camel-private.h" +#include "camel-stream-filter.h" #include "camel-stream-mem.h" #include "camel-stream-null.h" -#include "camel-stream-filter.h" #include "camel-string-utils.h" -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" - -#include - static pthread_mutex_t info_lock = PTHREAD_MUTEX_INITIALIZER; /* this lock is ONLY for the standalone messageinfo stuff */ diff --git a/camel/camel-folder-summary.h b/camel/camel-folder-summary.h index 658bd0a..fccbd54 100644 --- a/camel/camel-folder-summary.h +++ b/camel/camel-folder-summary.h @@ -22,24 +22,21 @@ #ifndef _CAMEL_FOLDER_SUMMARY_H #define _CAMEL_FOLDER_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include #include #include -struct _CamelFolder; - #define CAMEL_FOLDER_SUMMARY_TYPE camel_folder_summary_get_type () #define CAMEL_FOLDER_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary) #define CAMEL_FOLDER_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass) #define CAMEL_IS_FOLDER_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_folder_summary_get_type ()) +G_BEGIN_DECLS + +struct _CamelFolder; + /*typedef struct _CamelFolderSummary CamelFolderSummary;*/ typedef struct _CamelFolderSummaryClass CamelFolderSummaryClass; @@ -407,8 +404,6 @@ void camel_content_info_dump (CamelMessageContentInfo *ci, int depth); void camel_message_info_dump (CamelMessageInfo *mi); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_FOLDER_SUMMARY_H */ diff --git a/camel/camel-folder-thread.c b/camel/camel-folder-thread.c index 891882c..c884045 100644 --- a/camel/camel-folder-thread.c +++ b/camel/camel-folder-thread.c @@ -25,17 +25,19 @@ #include #endif -#include -#include +#include #include +#include #include +#include #include -#include -#include +#include + #include +#include + #include "camel-folder-thread.h" -#include "libedataserver/e-memory.h" #define d(x) #define m(x) diff --git a/camel/camel-folder-thread.h b/camel/camel-folder-thread.h index c41c408..a6999cc 100644 --- a/camel/camel-folder-thread.h +++ b/camel/camel-folder-thread.h @@ -22,14 +22,11 @@ #ifndef _CAMEL_FOLDER_THREAD_H #define _CAMEL_FOLDER_THREAD_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include +G_BEGIN_DECLS + typedef struct _CamelFolderThreadNode { struct _CamelFolderThreadNode *next, *parent, *child; const CamelMessageInfo *message; @@ -66,8 +63,6 @@ void camel_folder_thread_messages_unref(CamelFolderThread *threads); /* debugging function only */ int camel_folder_threaded_messages_dump(CamelFolderThreadNode *c); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* !_CAMEL_FOLDER_THREAD_H */ diff --git a/camel/camel-folder.c b/camel/camel-folder.c index 329cf24..dd8971a 100644 --- a/camel/camel-folder.c +++ b/camel/camel-folder.c @@ -22,23 +22,27 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif #include -#include "libedataserver/e-memory.h" +#include +#include -#include "camel-folder.h" +#include + +#include "camel-debug.h" #include "camel-exception.h" -#include "camel-store.h" +#include "camel-filter-driver.h" +#include "camel-folder.h" #include "camel-mime-message.h" -#include "camel-debug.h" #include "camel-operation.h" -#include "camel-session.h" -#include "camel-filter-driver.h" #include "camel-private.h" +#include "camel-session.h" +#include "camel-store.h" #include "camel-vtrash-folder.h" -#include "camel-i18n.h" #define d(x) #define w(x) diff --git a/camel/camel-folder.h b/camel/camel-folder.h index 8e2c01e..5020549 100644 --- a/camel/camel-folder.h +++ b/camel/camel-folder.h @@ -25,12 +25,6 @@ #ifndef CAMEL_FOLDER_H #define CAMEL_FOLDER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -40,6 +34,8 @@ extern "C" { #define CAMEL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass)) #define CAMEL_IS_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelFolderChangeInfo CamelFolderChangeInfo; enum { @@ -229,6 +225,7 @@ const char * camel_folder_get_full_name (CamelFolder *folder); /* various properties accessors */ guint32 camel_folder_get_permanent_flags (CamelFolder *folder); +#ifndef CAMEL_DISABLE_DEPRECATED guint32 camel_folder_get_message_flags (CamelFolder *folder, const char *uid); @@ -245,6 +242,7 @@ void camel_folder_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value); + const char * camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid, const char *name); @@ -253,6 +251,7 @@ void camel_folder_set_message_user_tag (CamelFolder *folder, const char *uid, const char *name, const char *value); +#endif @@ -270,7 +269,9 @@ gboolean camel_folder_has_summary_capability (CamelFolder *folder); int camel_folder_get_message_count (CamelFolder *folder); +#ifndef CAMEL_DISABLE_DEPRECATED int camel_folder_get_unread_message_count (CamelFolder *folder); +#endif int camel_folder_get_deleted_message_count (CamelFolder *folder); @@ -298,7 +299,9 @@ void camel_folder_search_free (CamelFolder *folder, GPtrArray *result) /* summary info */ CamelMessageInfo *camel_folder_get_message_info (CamelFolder *folder, const char *uid); void camel_folder_free_message_info (CamelFolder *folder, CamelMessageInfo *info); +#ifndef CAMEL_DISABLE_DEPRECATED void camel_folder_ref_message_info (CamelFolder *folder, CamelMessageInfo *info); +#endif void camel_folder_transfer_messages_to (CamelFolder *source, GPtrArray *uids, @@ -340,8 +343,6 @@ void camel_folder_change_info_remove_uid (CamelFolderChangeInfo *info, const c void camel_folder_change_info_change_uid (CamelFolderChangeInfo *info, const char *uid); void camel_folder_change_info_recent_uid (CamelFolderChangeInfo *info, const char *uid); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_FOLDER_H */ diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c index 79d9759..51caeca 100644 --- a/camel/camel-gpg-context.c +++ b/camel/camel-gpg-context.c @@ -30,43 +30,42 @@ #include #endif +#include +#include +#include +#include #include #include #include -#include -#include +#include #include #include -#include -#include -#include -#include -#include - -#include -#include +#include #ifndef G_OS_WIN32 #include -#include #include +#include #include #endif -#include "libedataserver/e-iconv.h" +#include +#include +#include + +#include +#include "camel-debug.h" #include "camel-gpg-context.h" +#include "camel-mime-filter-canon.h" #include "camel-mime-filter-charset.h" -#include "camel-stream-filter.h" -#include "camel-stream-mem.h" -#include "camel-stream-fs.h" -#include "camel-operation.h" #include "camel-mime-part.h" -#include "camel-mime-filter-canon.h" -#include "camel-multipart-signed.h" #include "camel-multipart-encrypted.h" -#include "camel-debug.h" -#include "camel-i18n.h" +#include "camel-multipart-signed.h" +#include "camel-operation.h" +#include "camel-stream-filter.h" +#include "camel-stream-fs.h" +#include "camel-stream-mem.h" #define d(x) diff --git a/camel/camel-gpg-context.h b/camel/camel-gpg-context.h index 13fd626..b791b21 100644 --- a/camel/camel-gpg-context.h +++ b/camel/camel-gpg-context.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_GPG_CONTEXT_H__ #define __CAMEL_GPG_CONTEXT_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_GPG_CONTEXT_TYPE (camel_gpg_context_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_GPG_CONTEXT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_GPG_CONTEXT_TYPE, CamelGpgContextClass)) #define CAMEL_IS_GPG_CONTEXT(o) (CAMEL_CHECK_TYPE((o), CAMEL_GPG_CONTEXT_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelGpgContext CamelGpgContext; typedef struct _CamelGpgContextClass CamelGpgContextClass; @@ -57,8 +54,6 @@ CamelCipherContext *camel_gpg_context_new (CamelSession *session); void camel_gpg_context_set_always_trust (CamelGpgContext *ctx, gboolean trust); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_GPG_CONTEXT_H__ */ diff --git a/camel/camel-html-parser.c b/camel/camel-html-parser.c index c71c7eb..f2bfecc 100644 --- a/camel/camel-html-parser.c +++ b/camel/camel-html-parser.c @@ -18,20 +18,20 @@ * Boston, MA 02111-1307, USA. */ -/** WARNING - ** - ** DO NOT USE THIS CODE OUTSIDE OF CAMEL - ** - ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME - **/ - -#include "camel-html-parser.h" +/* WARNING + * + * DO NOT USE THIS CODE OUTSIDE OF CAMEL + * + * IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME + */ +#include #include #include -#include -#include +#include + +#include "camel-html-parser.h" /* if defined, must also compile in dump_tag() below somewhere */ #define d(x) diff --git a/camel/camel-html-parser.h b/camel/camel-html-parser.h index 892be29..a601d96 100644 --- a/camel/camel-html-parser.h +++ b/camel/camel-html-parser.h @@ -18,12 +18,12 @@ * Boston, MA 02111-1307, USA. */ -/** WARNING - ** - ** DO NOT USE THIS CODE OUTSIDE OF CAMEL - ** - ** IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME - **/ +/* WARNING + * + * DO NOT USE THIS CODE OUTSIDE OF CAMEL + * + * IT IS SUBJECT TO CHANGE OR MAY VANISH AT ANY TIME + */ #ifndef _CAMEL_HTML_PARSER_H #define _CAMEL_HTML_PARSER_H @@ -34,6 +34,8 @@ #define CAMEL_HTML_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_html_parser_get_type (), CamelHTMLParserClass) #define CAMEL_IS_HTML_PARSER(obj) CAMEL_CHECK_TYPE (obj, camel_html_parser_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelHTMLParserClass CamelHTMLParserClass; typedef struct _CamelHTMLParser CamelHTMLParser; @@ -75,4 +77,6 @@ const char *camel_html_parser_tag(CamelHTMLParser *hp); const char *camel_html_parser_attr(CamelHTMLParser *hp, const char *name); const GPtrArray *camel_html_parser_attr_list(CamelHTMLParser *hp, const GPtrArray **values); +G_END_DECLS + #endif /* ! _CAMEL_HTML_PARSER_H */ diff --git a/camel/camel-http-stream.c b/camel/camel-http-stream.c index 19b40df..6de904f 100644 --- a/camel/camel-http-stream.c +++ b/camel/camel-http-stream.c @@ -24,24 +24,24 @@ #include #endif +#include +#include #include #include #include -#include -#include -#include "camel-net-utils.h" +#include "camel-exception.h" #include "camel-http-stream.h" - #include "camel-mime-utils.h" +#include "camel-net-utils.h" +#include "camel-service.h" /* for hostname stuff */ +#include "camel-session.h" #include "camel-stream-buffer.h" #include "camel-tcp-stream-raw.h" + #ifdef HAVE_SSL #include "camel-tcp-stream-ssl.h" #endif -#include "camel-exception.h" -#include "camel-session.h" -#include "camel-service.h" /* for hostname stuff */ #define d(x) diff --git a/camel/camel-http-stream.h b/camel/camel-http-stream.h index 7306a7f..493be42 100644 --- a/camel/camel-http-stream.h +++ b/camel/camel-http-stream.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_HTTP_STREAM_H__ #define __CAMEL_HTTP_STREAM_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -39,6 +34,8 @@ extern "C" { #define CAMEL_HTTP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_HTTP_STREAM_TYPE, CamelHttpStreamClass)) #define CAMEL_IS_HTTP_STREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_HTTP_STREAM_TYPE)) +G_BEGIN_DECLS + typedef enum { /*CAMEL_HTTP_METHOD_OPTIONS,*/ CAMEL_HTTP_METHOD_GET, @@ -98,8 +95,6 @@ void camel_http_stream_set_proxy_authpass (CamelHttpStream *http_stream, const c CamelContentType *camel_http_stream_get_content_type (CamelHttpStream *http_stream); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_HTTP_STREAM_H__ */ diff --git a/camel/camel-i18n.h b/camel/camel-i18n.h index 9583861..136c70d 100644 --- a/camel/camel-i18n.h +++ b/camel/camel-i18n.h @@ -20,17 +20,13 @@ * */ +#ifndef CAMEL_DISABLE_DEPRECATED #ifndef __CAMEL_I18N_H__ #define __CAMEL_I18N_H__ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #ifdef ENABLE_NLS # include # ifdef CAMEL_EXPLICIT_TRANSLATION_DOMAIN @@ -55,8 +51,6 @@ extern "C" { # define N_(String) (String) #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* __CAMEL_I18N_H__ */ + +#endif /* CAMEL_DISABLE_DEPRECATED */ diff --git a/camel/camel-iconv.h b/camel/camel-iconv.h index 37a3a62..9aa3837 100644 --- a/camel/camel-iconv.h +++ b/camel/camel-iconv.h @@ -24,14 +24,11 @@ #ifndef __CAMEL_ICONV_H__ #define __CAMEL_ICONV_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include +G_BEGIN_DECLS + const char *camel_iconv_locale_charset (void); const char *camel_iconv_locale_language (void); @@ -43,8 +40,6 @@ iconv_t camel_iconv_open (const char *to, const char *from); size_t camel_iconv (iconv_t cd, const char **inbuf, size_t *inleft, char **outbuf, size_t *outleft); void camel_iconv_close (iconv_t cd); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_ICONV_H__ */ diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c index 07bff60..15d4a83 100644 --- a/camel/camel-index-control.c +++ b/camel/camel-index-control.c @@ -6,25 +6,22 @@ #endif #include -#include -#include #include -#include +#include +#include #include - -#include +#include +#include #include -#include - -#include "libedataserver/e-msgport.h" -#include "libedataserver/e-memory.h" +#include +#include -#include "camel/camel-object.h" +#include +#include +#include "camel-object.h" #include "camel-text-index.h" -#include - static void do_usage(char *argv0) { diff --git a/camel/camel-index.c b/camel/camel-index.c index e455db4..ffc1bc0 100644 --- a/camel/camel-index.c +++ b/camel/camel-index.c @@ -24,11 +24,11 @@ #endif #include -#include -#include #include -#include #include +#include +#include +#include #include "camel-index.h" #include "camel-object.h" diff --git a/camel/camel-index.h b/camel/camel-index.h index c027859..f591f57 100644 --- a/camel/camel-index.h +++ b/camel/camel-index.h @@ -28,6 +28,8 @@ #define CAMEL_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_index_get_type (), CamelIndexClass) #define CAMEL_IS_INDEX(obj) CAMEL_CHECK_TYPE (obj, camel_index_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIndex CamelIndex; typedef struct _CamelIndexClass CamelIndexClass; @@ -162,4 +164,6 @@ CamelIndexCursor *camel_index_find(CamelIndex *idx, const char *word); CamelIndexCursor *camel_index_words(CamelIndex *idx); CamelIndexCursor *camel_index_names(CamelIndex *idx); +G_END_DECLS + #endif /* ! _CAMEL_INDEX_H */ diff --git a/camel/camel-internet-address.c b/camel/camel-internet-address.c index 8cf9304..95f4979 100644 --- a/camel/camel-internet-address.c +++ b/camel/camel-internet-address.c @@ -21,8 +21,8 @@ #include #include -#include "camel-mime-utils.h" #include "camel-internet-address.h" +#include "camel-mime-utils.h" #define d(x) diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h index 9d9a000..274e662 100644 --- a/camel/camel-internet-address.h +++ b/camel/camel-internet-address.h @@ -22,17 +22,14 @@ #ifndef _CAMEL_INTERNET_ADDRESS_H #define _CAMEL_INTERNET_ADDRESS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_INTERNET_ADDRESS(obj) CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress) #define CAMEL_INTERNET_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass) #define CAMEL_IS_INTERNET_ADDRESS(obj) CAMEL_CHECK_TYPE (obj, camel_internet_address_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelInternetAddressClass CamelInternetAddressClass; struct _CamelInternetAddress { @@ -58,8 +55,6 @@ int camel_internet_address_find_address(CamelInternetAddress *addr, const char char * camel_internet_address_encode_address(int *len, const char *name, const char *addr); char * camel_internet_address_format_address(const char *real, const char *addr); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_INTERNET_ADDRESS_H */ diff --git a/camel/camel-junk-plugin.c b/camel/camel-junk-plugin.c index dba4a72..8a35a7c 100644 --- a/camel/camel-junk-plugin.c +++ b/camel/camel-junk-plugin.c @@ -21,6 +21,7 @@ */ #include + #include #include "camel-debug.h" diff --git a/camel/camel-junk-plugin.h b/camel/camel-junk-plugin.h index 7d56e42..9b8da2b 100644 --- a/camel/camel-junk-plugin.h +++ b/camel/camel-junk-plugin.h @@ -25,6 +25,8 @@ #define CAMEL_JUNK_PLUGIN(x) ((CamelJunkPlugin *) x) +G_BEGIN_DECLS + typedef struct _CamelJunkPlugin CamelJunkPlugin; struct _CamelMimeMessage; @@ -60,4 +62,6 @@ void camel_junk_plugin_report_notjunk (CamelJunkPlugin *csp, struct _CamelMimeMe void camel_junk_plugin_commit_reports (CamelJunkPlugin *csp); void camel_junk_plugin_init (CamelJunkPlugin *csp); +G_END_DECLS + #endif diff --git a/camel/camel-list-utils.h b/camel/camel-list-utils.h index d7a37e1..a11e4fb 100644 --- a/camel/camel-list-utils.h +++ b/camel/camel-list-utils.h @@ -22,6 +22,8 @@ #ifndef _CAMEL_LIST_UTILS_H #define _CAMEL_LIST_UTILS_H +G_BEGIN_DECLS + /* This is a copy of Amiga's Exec lists, the head and tail nodes are * overlapped and merged into a single list header. All operations * are O(1), including node removal and addition from/to either end of @@ -123,4 +125,6 @@ CamelSListNode *camel_slist_remtail(CamelSList *l); int camel_slist_empty(CamelSList *l); int camel_slist_length(CamelSList *l); +G_END_DECLS + #endif diff --git a/camel/camel-lock-client.c b/camel/camel-lock-client.c index d8e96cd..7eba06c 100644 --- a/camel/camel-lock-client.c +++ b/camel/camel-lock-client.c @@ -23,20 +23,20 @@ #include #endif +#include +#include +#include #include #include #include -#include +#include #include +#include #include -#include -#include -#include -#include #include "camel-exception.h" -#include "camel-lock-helper.h" #include "camel-lock-client.h" +#include "camel-lock-helper.h" #define d(x) diff --git a/camel/camel-lock-client.h b/camel/camel-lock-client.h index a53e80b..f28b512 100644 --- a/camel/camel-lock-client.h +++ b/camel/camel-lock-client.h @@ -24,18 +24,13 @@ #ifndef _CAMEL_LOCK_CLIENT_H #define _CAMEL_LOCK_CLIENT_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include +G_BEGIN_DECLS + int camel_lock_helper_lock(const char *path , CamelException *ex); int camel_lock_helper_unlock(int lockid); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* !_CAMEL_LOCK_HELPER_H */ diff --git a/camel/camel-lock-helper.c b/camel/camel-lock-helper.c index 73be709..1a21d6a 100644 --- a/camel/camel-lock-helper.c +++ b/camel/camel-lock-helper.c @@ -21,24 +21,18 @@ /* lock helper process */ -#include -#include - #include - -#include -#include -#include - +#include #include - +#include +#include +#include +#include #include -#include #include - -#include - -#include +#include +#include +#include #define SETEUID_SAVES (1) diff --git a/camel/camel-lock-helper.h b/camel/camel-lock-helper.h index 988073c..5989bd0 100644 --- a/camel/camel-lock-helper.h +++ b/camel/camel-lock-helper.h @@ -24,13 +24,10 @@ #ifndef _CAMEL_LOCK_HELPER_H #define _CAMEL_LOCK_HELPER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include +G_BEGIN_DECLS + struct _CamelLockHelperMsg { guint32 magic; guint32 seq; @@ -62,8 +59,6 @@ enum { /* seconds between lock refreshes */ #define CAMEL_DOT_LOCK_REFRESH (30) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* !_CAMEL_LOCK_HELPER_H */ diff --git a/camel/camel-lock.c b/camel/camel-lock.c index d96c179..e624e6b 100644 --- a/camel/camel-lock.c +++ b/camel/camel-lock.c @@ -19,29 +19,31 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif +#include #include #include #include - -#include #include -#include +#include +#include + #ifdef HAVE_ALLOCA_H #include #endif -#include #ifdef USE_DOT -#include -#include #include +#include +#include #endif #ifdef USE_FCNTL -#include #include +#include #endif #ifdef USE_FLOCK @@ -49,6 +51,7 @@ #endif #include +#include #include #ifdef G_OS_WIN32 @@ -56,7 +59,6 @@ #endif #include "camel-lock.h" -#include "camel-i18n.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/camel-lock.h b/camel/camel-lock.h index e1c4fcb..9daad9a 100644 --- a/camel/camel-lock.h +++ b/camel/camel-lock.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_LOCK_H #define _CAMEL_LOCK_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include /* for .lock locking, retry, delay and stale counts */ @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_LOCK_RETRY (5) /* number of times to retry lock */ #define CAMEL_LOCK_DELAY (2) /* delay between locking retries */ +G_BEGIN_DECLS + typedef enum { CAMEL_LOCK_READ, CAMEL_LOCK_WRITE, @@ -56,8 +53,6 @@ void camel_unlock_flock(int fd); int camel_lock_folder(const char *path, int fd, CamelLockType type, CamelException *ex); void camel_unlock_folder(const char *path, int fd); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* !_CAMEL_LOCK_H */ diff --git a/camel/camel-medium.c b/camel/camel-medium.c index 08cba3a..14fc015 100644 --- a/camel/camel-medium.c +++ b/camel/camel-medium.c @@ -27,8 +27,8 @@ #include #endif -#include #include +#include #include "camel-medium.h" diff --git a/camel/camel-medium.h b/camel/camel-medium.h index ac55df1..870e10c 100644 --- a/camel/camel-medium.h +++ b/camel/camel-medium.h @@ -27,12 +27,6 @@ #ifndef CAMEL_MEDIUM_H #define CAMEL_MEDIUM_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MEDIUM_TYPE (camel_medium_get_type ()) @@ -40,6 +34,7 @@ extern "C" { #define CAMEL_MEDIUM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass)) #define CAMEL_IS_MEDIUM(o) (CAMEL_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE)) +G_BEGIN_DECLS typedef struct { const char *name; @@ -89,9 +84,6 @@ CamelDataWrapper *camel_medium_get_content_object (CamelMedium *medium); void camel_medium_set_content_object (CamelMedium *medium, CamelDataWrapper *content); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MEDIUM_H */ - diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h index 44943c7..ad5b4fc 100644 --- a/camel/camel-mime-filter-basic.h +++ b/camel/camel-mime-filter-basic.h @@ -22,17 +22,14 @@ #ifndef _CAMEL_MIME_FILTER_BASIC_H #define _CAMEL_MIME_FILTER_BASIC_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_BASIC(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic) #define CAMEL_MIME_FILTER_BASIC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass) #define CAMEL_IS_MIME_FILTER_BASIC(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_basic_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterBasicClass CamelMimeFilterBasicClass; typedef enum { @@ -64,8 +61,6 @@ CamelType camel_mime_filter_basic_get_type (void); CamelMimeFilterBasic *camel_mime_filter_basic_new (void); CamelMimeFilterBasic *camel_mime_filter_basic_new_type (CamelMimeFilterBasicType type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_BASIC_H */ diff --git a/camel/camel-mime-filter-bestenc.h b/camel/camel-mime-filter-bestenc.h index 8a496c5..feeb6c0 100644 --- a/camel/camel-mime-filter-bestenc.h +++ b/camel/camel-mime-filter-bestenc.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_MIME_FILTER_BESTENC_H #define _CAMEL_MIME_FILTER_BESTENC_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_MIME_FILTER_BESTENC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_bestenc_get_type (), CamelMimeFilterBestencClass) #define CAMEL_IS_MIME_FILTER_BESTENC(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_bestenc_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterBestencClass CamelMimeFilterBestencClass; typedef enum _CamelBestencRequired { @@ -92,8 +89,6 @@ CamelTransferEncoding camel_mime_filter_bestenc_get_best_encoding(CamelMimeFilte const char * camel_mime_filter_bestenc_get_best_charset(CamelMimeFilterBestenc *filter); void camel_mime_filter_bestenc_set_flags(CamelMimeFilterBestenc *filter, unsigned int flags); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_BESTENC_H */ diff --git a/camel/camel-mime-filter-canon.c b/camel/camel-mime-filter-canon.c index 1ae011e..a325d69 100644 --- a/camel/camel-mime-filter-canon.c +++ b/camel/camel-mime-filter-canon.c @@ -26,8 +26,8 @@ #include #endif -#include #include +#include #include "camel-mime-filter-canon.h" diff --git a/camel/camel-mime-filter-canon.h b/camel/camel-mime-filter-canon.h index a7a9249..2df9c76 100644 --- a/camel/camel-mime-filter-canon.h +++ b/camel/camel-mime-filter-canon.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_MIME_FILTER_CANON_H #define _CAMEL_MIME_FILTER_CANON_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_CANON_TYPE (camel_mime_filter_canon_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_MIME_FILTER_CANON_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CANON_TYPE, CamelMimeFilterCanonClass) #define CAMEL_IS_MIME_FILTER_CANON(obj) CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CANON_TYPE) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterCanon CamelMimeFilterCanon; typedef struct _CamelMimeFilterCanonClass CamelMimeFilterCanonClass; @@ -58,8 +55,6 @@ CamelType camel_mime_filter_canon_get_type (void); CamelMimeFilter *camel_mime_filter_canon_new(guint32 flags); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_CANON_H */ diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index 11f2400..57e3456 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -24,13 +24,13 @@ #include #endif -#include #include +#include -#include "libedataserver/e-iconv.h" +#include -#include "camel-mime-filter-charset.h" #include "camel-charset-map.h" +#include "camel-mime-filter-charset.h" #define d(x) #define w(x) diff --git a/camel/camel-mime-filter-charset.h b/camel/camel-mime-filter-charset.h index d2d77b5..7568921 100644 --- a/camel/camel-mime-filter-charset.h +++ b/camel/camel-mime-filter-charset.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_MIME_FILTER_CHARSET_H #define _CAMEL_MIME_FILTER_CHARSET_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass) #define CAMEL_IS_MIME_FILTER_CHARSET(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_charset_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterCharsetClass CamelMimeFilterCharsetClass; struct _CamelMimeFilterCharset { @@ -55,8 +52,6 @@ CamelMimeFilterCharset *camel_mime_filter_charset_new (void); CamelMimeFilterCharset *camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_charset); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_CHARSET_H */ diff --git a/camel/camel-mime-filter-crlf.h b/camel/camel-mime-filter-crlf.h index b721ae3..a886423 100644 --- a/camel/camel-mime-filter-crlf.h +++ b/camel/camel-mime-filter-crlf.h @@ -24,11 +24,6 @@ #ifndef _CAMEL_MIME_FILTER_CRLF_H #define _CAMEL_MIME_FILTER_CRLF_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_CRLF_TYPE (camel_mime_filter_crlf_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_MIME_FILTER_CRLF_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass) #define CAMEL_IS_MIME_FILTER_CRLF(obj) CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CRLF_TYPE) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterCRLFClass CamelMimeFilterCRLFClass; typedef enum { @@ -66,8 +63,6 @@ CamelType camel_mime_filter_crlf_get_type (void); CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_CRLF_H */ diff --git a/camel/camel-mime-filter-enriched.h b/camel/camel-mime-filter-enriched.h index 6c42e39..8646e4c 100644 --- a/camel/camel-mime-filter-enriched.h +++ b/camel/camel-mime-filter-enriched.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_MIME_FILTER_ENRICHED_H__ #define __CAMEL_MIME_FILTER_ENRICHED_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_TYPE_MIME_FILTER_ENRICHED (camel_mime_filter_enriched_get_type ()) @@ -36,9 +31,9 @@ extern "C" { #define CAMEL_MIME_FILTER_ENRICHED_CLASS(klass) (CAMEL_CHECK_CLASS_CAST (klass, CAMEL_TYPE_MIME_FILTER_ENRICHED, CamelMimeFilterEnrichedClass)) #define CAMEL_IS_MIME_FILTER_ENRICHED(obj) (CAMEL_CHECK_TYPE (obj, CAMEL_TYPE_MIME_FILTER_ENRICHED)) - #define CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT (1 << 0) +G_BEGIN_DECLS typedef struct _CamelMimeFilterEnriched CamelMimeFilterEnriched; typedef struct _CamelMimeFilterEnrichedClass CamelMimeFilterEnrichedClass; @@ -60,8 +55,6 @@ CamelType camel_mime_filter_enriched_get_type (void); CamelMimeFilter *camel_mime_filter_enriched_new (guint32 flags); char *camel_enriched_to_html(const char *in, guint32 flags); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_ENRICHED_H__ */ diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h index 2ca6286..56ba76c 100644 --- a/camel/camel-mime-filter-from.h +++ b/camel/camel-mime-filter-from.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_MIME_FILTER_FROM_H #define _CAMEL_MIME_FILTER_FROM_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_FROM(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom) #define CAMEL_MIME_FILTER_FROM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass) #define CAMEL_IS_MIME_FILTER_FROM(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_from_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterFrom CamelMimeFilterFrom; typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass; @@ -50,8 +47,6 @@ struct _CamelMimeFilterFromClass { CamelType camel_mime_filter_from_get_type (void); CamelMimeFilterFrom *camel_mime_filter_from_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_FROM_H */ diff --git a/camel/camel-mime-filter-gzip.h b/camel/camel-mime-filter-gzip.h index 20d8804..5f7a573 100644 --- a/camel/camel-mime-filter-gzip.h +++ b/camel/camel-mime-filter-gzip.h @@ -26,11 +26,6 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_MIME_FILTER_GZIP (camel_mime_filter_gzip_get_type ()) #define CAMEL_MIME_FILTER_GZIP(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_MIME_FILTER_GZIP, CamelMimeFilterGZip)) #define CAMEL_MIME_FILTER_GZIP_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_MIME_FILTER_GZIP, CamelMimeFilterGZipClass)) @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_IS_MIME_FILTER_GZIP_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_MIME_FILTER_GZIP)) #define CAMEL_MIME_FILTER_GZIP_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_MIME_FILTER_GZIP, CamelMimeFilterGZipClass)) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterGZip CamelMimeFilterGZip; typedef struct _CamelMimeFilterGZipClass CamelMimeFilterGZipClass; @@ -65,8 +62,6 @@ CamelType camel_mime_filter_gzip_get_type (void); CamelMimeFilter *camel_mime_filter_gzip_new (CamelMimeFilterGZipMode mode, int level); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_GZIP_H__ */ diff --git a/camel/camel-mime-filter-html.c b/camel/camel-mime-filter-html.c index 68ae47c..4e8e9da 100644 --- a/camel/camel-mime-filter-html.c +++ b/camel/camel-mime-filter-html.c @@ -19,19 +19,17 @@ * Boston, MA 02111-1307, USA. */ +#include +#include #include +#include #include -#include - - -#include -#include -#include #include -#include +#include +#include -#include "camel-mime-filter-html.h" #include "camel-html-parser.h" +#include "camel-mime-filter-html.h" #define d(x) diff --git a/camel/camel-mime-filter-html.h b/camel/camel-mime-filter-html.h index 6227966..f0c506b 100644 --- a/camel/camel-mime-filter-html.h +++ b/camel/camel-mime-filter-html.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_MIME_FILTER_HTML_H #define _CAMEL_MIME_FILTER_HTML_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_HTML(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_html_get_type (), CamelMimeFilterHTML) #define CAMEL_MIME_FILTER_HTML_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_html_get_type (), CamelMimeFilterHTMLClass) #define CAMEL_IS_MIME_FILTER_HTML(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_html_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterHTMLClass CamelMimeFilterHTMLClass; typedef struct _CamelMimeFilterHTML CamelMimeFilterHTML; @@ -50,8 +47,6 @@ struct _CamelMimeFilterHTMLClass { CamelType camel_mime_filter_html_get_type (void); CamelMimeFilterHTML *camel_mime_filter_html_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_HTML_H */ diff --git a/camel/camel-mime-filter-index.h b/camel/camel-mime-filter-index.h index eea10a3..587ebf3 100644 --- a/camel/camel-mime-filter-index.h +++ b/camel/camel-mime-filter-index.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_MIME_FILTER_INDEX_H #define _CAMEL_MIME_FILTER_INDEX_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_INDEX(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex) #define CAMEL_MIME_FILTER_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass) #define CAMEL_IS_MIME_FILTER_INDEX(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_index_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass; struct _CamelMimeFilterIndex { @@ -58,8 +55,6 @@ CamelMimeFilterIndex *camel_mime_filter_index_new_index(struct _CamelIndex void camel_mime_filter_index_set_name (CamelMimeFilterIndex *filter, struct _CamelIndexName *name); void camel_mime_filter_index_set_index (CamelMimeFilterIndex *filter, struct _CamelIndex *index); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_INDEX_H */ diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h index dad3d01..7effb86 100644 --- a/camel/camel-mime-filter-linewrap.h +++ b/camel/camel-mime-filter-linewrap.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_MIME_FILTER_LINEWRAP_H #define _CAMEL_MIME_FILTER_LINEWRAP_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_LINEWRAP_TYPE (camel_mime_filter_linewrap_get_type ()) @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass) #define CAMEL_IS_MIME_FILTER_LINEWRAP(obj) CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterLinewrapClass CamelMimeFilterLinewrapClass; struct _CamelMimeFilterLinewrap { @@ -53,8 +50,6 @@ CamelType camel_mime_filter_linewrap_get_type (void); CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */ diff --git a/camel/camel-mime-filter-pgp.c b/camel/camel-mime-filter-pgp.c index 746b078..4cb6eb1 100644 --- a/camel/camel-mime-filter-pgp.c +++ b/camel/camel-mime-filter-pgp.c @@ -27,8 +27,8 @@ #include #endif -#include #include +#include #include "camel-mime-filter-pgp.h" diff --git a/camel/camel-mime-filter-pgp.h b/camel/camel-mime-filter-pgp.h index cd5a418..c705f57 100644 --- a/camel/camel-mime-filter-pgp.h +++ b/camel/camel-mime-filter-pgp.h @@ -22,11 +22,6 @@ #ifndef _CAMEL_MIME_FILTER_PGP_H #define _CAMEL_MIME_FILTER_PGP_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_PGP_TYPE (camel_mime_filter_canon_get_type ()) @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MIME_FILTER_PGP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_PGP_TYPE, CamelMimeFilterPgpClass) #define CAMEL_IS_MIME_FILTER_PGP(obj) CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_PGP_TYPE) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterPgp { CamelMimeFilter filter; int state; @@ -47,8 +44,6 @@ CamelType camel_mime_filter_pgp_get_type (void); CamelMimeFilter *camel_mime_filter_pgp_new(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_PGP_H */ diff --git a/camel/camel-mime-filter-save.h b/camel/camel-mime-filter-save.h index eda8652..f4c3dc8 100644 --- a/camel/camel-mime-filter-save.h +++ b/camel/camel-mime-filter-save.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_MIME_FILTER_SAVE_H__ #define __CAMEL_MIME_FILTER_SAVE_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_MIME_FILTER_SAVE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass) #define CAMEL_IS_MIME_FILTER_SAVE(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass; struct _CamelMimeFilterSave { @@ -54,8 +51,6 @@ CamelType camel_mime_filter_save_get_type (void); CamelMimeFilter *camel_mime_filter_save_new (void); CamelMimeFilter *camel_mime_filter_save_new_with_stream (CamelStream *stream); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_SAVE_H__ */ diff --git a/camel/camel-mime-filter-tohtml.c b/camel/camel-mime-filter-tohtml.c index ba47f73..d15ecb1 100644 --- a/camel/camel-mime-filter-tohtml.c +++ b/camel/camel-mime-filter-tohtml.c @@ -28,8 +28,8 @@ #include #include -#include "camel-url-scanner.h" #include "camel-mime-filter-tohtml.h" +#include "camel-url-scanner.h" #include "camel-utf8.h" /** diff --git a/camel/camel-mime-filter-tohtml.h b/camel/camel-mime-filter-tohtml.h index a7a7dd6..1040fe0 100644 --- a/camel/camel-mime-filter-tohtml.h +++ b/camel/camel-mime-filter-tohtml.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_MIME_FILTER_TOHTML_H__ #define __CAMEL_MIME_FILTER_TOHTML_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_TOHTML(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_tohtml_get_type (), CamelMimeFilterToHTML) @@ -46,6 +41,8 @@ extern "C" { #define CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT (1 << 8) #define CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED (1 << 9) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterToHTMLClass CamelMimeFilterToHTMLClass; typedef struct _CamelMimeFilterToHTML CamelMimeFilterToHTML; @@ -75,8 +72,6 @@ CamelMimeFilter *camel_mime_filter_tohtml_new (guint32 flags, guint32 colour); char *camel_text_to_html (const char *in, guint32 flags, guint32 colour); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_TOHTML_H__ */ diff --git a/camel/camel-mime-filter-windows.c b/camel/camel-mime-filter-windows.c index b7d1bf5..8ae1738 100644 --- a/camel/camel-mime-filter-windows.c +++ b/camel/camel-mime-filter-windows.c @@ -25,9 +25,9 @@ #include #endif +#include #include #include -#include #include "camel-charset-map.h" #include "camel-mime-filter-windows.h" diff --git a/camel/camel-mime-filter-windows.h b/camel/camel-mime-filter-windows.h index dbbbcd4..9121167 100644 --- a/camel/camel-mime-filter-windows.h +++ b/camel/camel-mime-filter-windows.h @@ -24,17 +24,14 @@ #ifndef __CAMEL_MIME_FILTER_WINDOWS_H__ #define __CAMEL_MIME_FILTER_WINDOWS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MIME_FILTER_WINDOWS(obj) CAMEL_CHECK_CAST (obj, camel_mime_filter_windows_get_type (), CamelMimeFilterWindows) #define CAMEL_MIME_FILTER_WINDOWS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_windows_get_type (), CamelMimeFilterWindowsClass) #define CAMEL_IS_MIME_FILTER_WINDOWS(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_windows_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterWindowsClass CamelMimeFilterWindowsClass; typedef struct _CamelMimeFilterWindows CamelMimeFilterWindows; @@ -58,8 +55,6 @@ CamelMimeFilter *camel_mime_filter_windows_new (const char *claimed_charset); gboolean camel_mime_filter_windows_is_windows_charset (CamelMimeFilterWindows *filter); const char *camel_mime_filter_windows_real_charset (CamelMimeFilterWindows *filter); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_WINDOWS_H__ */ diff --git a/camel/camel-mime-filter-yenc.h b/camel/camel-mime-filter-yenc.h index 626376d..e3b6179 100644 --- a/camel/camel-mime-filter-yenc.h +++ b/camel/camel-mime-filter-yenc.h @@ -26,11 +26,6 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_MIME_FILTER_YENC (camel_mime_filter_yenc_get_type ()) #define CAMEL_MIME_FILTER_YENC(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_MIME_FILTER_YENC, CamelMimeFilterYenc)) #define CAMEL_MIME_FILTER_YENC_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_MIME_FILTER_YENC, CamelMimeFilterYencClass)) @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_IS_MIME_FILTER_YENC_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_MIME_FILTER_YENC)) #define CAMEL_MIME_FILTER_YENC_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_MIME_FILTER_YENC, CamelMimeFilterYencClass)) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterYenc CamelMimeFilterYenc; typedef struct _CamelMimeFilterYencClass CamelMimeFilterYencClass; @@ -102,8 +99,6 @@ size_t camel_yencode_step (const unsigned char *in, size_t inlen, unsigned char size_t camel_yencode_close (const unsigned char *in, size_t inlen, unsigned char *out, int *state, guint32 *pcrc, guint32 *crc); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MIME_FILTER_YENC_H__ */ diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h index ffc16ac..d6f626a 100644 --- a/camel/camel-mime-filter.h +++ b/camel/camel-mime-filter.h @@ -24,11 +24,6 @@ #ifndef _CAMEL_MIME_FILTER_H #define _CAMEL_MIME_FILTER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_MIME_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass) #define CAMEL_IS_MIME_FILTER(obj) CAMEL_CHECK_TYPE (obj, camel_mime_filter_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeFilterClass CamelMimeFilterClass; struct _CamelMimeFilter { @@ -87,8 +84,6 @@ void camel_mime_filter_backup(CamelMimeFilter *filter, const char *data, size_t /* ensure this much size available for filter output */ void camel_mime_filter_set_size(CamelMimeFilter *filter, size_t size, int keep); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_FILTER_H */ diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c index 5b3fd69..d82bfdc 100644 --- a/camel/camel-mime-message.c +++ b/camel/camel-mime-message.c @@ -28,12 +28,12 @@ #endif #include +#include #include #include -#include -#include "libedataserver/e-iconv.h" -#include "libedataserver/e-time-utils.h" +#include +#include #include "camel-mime-filter-bestenc.h" #include "camel-mime-filter-charset.h" diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h index 83ab111..fc312d4 100644 --- a/camel/camel-mime-message.h +++ b/camel/camel-mime-message.h @@ -25,12 +25,6 @@ #ifndef CAMEL_MIME_MESSAGE_H #define CAMEL_MIME_MESSAGE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -49,10 +43,11 @@ extern "C" { #define CAMEL_MIME_MESSAGE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass)) #define CAMEL_IS_MIME_MESSAGE(o) (CAMEL_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE)) - /* specify local time */ #define CAMEL_MESSAGE_DATE_CURRENT (~0) +G_BEGIN_DECLS + struct _CamelMimeMessage { CamelMimePart parent_object; @@ -135,8 +130,6 @@ char *camel_mime_message_build_mbox_from (CamelMimeMess void camel_mime_message_dump(CamelMimeMessage *msg, int body); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MIME_MESSAGE_H */ diff --git a/camel/camel-mime-parser.c b/camel/camel-mime-parser.c index a05008c..02799d5 100644 --- a/camel/camel-mime-parser.c +++ b/camel/camel-mime-parser.c @@ -26,18 +26,16 @@ There is almost always a reason something was done a certain way. */ -#include -#include -#include - -#include - -#include #include +#include +#include +#include +#include +#include #include -#include "libedataserver/e-memory.h" +#include #include "camel-mime-filter.h" #include "camel-mime-parser.h" diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h index 17658dc..afdea2b 100644 --- a/camel/camel-mime-parser.h +++ b/camel/camel-mime-parser.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_MIME_PARSER_H #define _CAMEL_MIME_PARSER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_MIME_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass) #define CAMEL_IS_MIME_PARSER(obj) CAMEL_CHECK_TYPE (obj, camel_mime_parser_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMimeParserClass CamelMimeParserClass; /* NOTE: if you add more states, you may need to bump the @@ -141,8 +138,6 @@ off_t camel_mime_parser_tell_start_headers (CamelMimeParser *parser); off_t camel_mime_parser_tell_start_from (CamelMimeParser *parser); off_t camel_mime_parser_tell_start_boundary(CamelMimeParser *parser); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_PARSER_H */ diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index 65a28e5..ce33401 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -26,13 +26,13 @@ #include #endif +#include +#include #include #include #include -#include -#include -#include "libedataserver/e-iconv.h" +#include #include "camel-charset-map.h" #include "camel-html-parser.h" diff --git a/camel/camel-mime-part-utils.h b/camel/camel-mime-part-utils.h index ea18675..f3a6fcc 100644 --- a/camel/camel-mime-part-utils.h +++ b/camel/camel-mime-part-utils.h @@ -27,18 +27,12 @@ #ifndef CAMEL_MIME_PART_UTILS_H #define CAMEL_MIME_PART_UTILS_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include +G_BEGIN_DECLS + void camel_mime_part_construct_content_from_parser(CamelMimePart *, CamelMimeParser *mp); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MIME_PART_UTILS_H */ - diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c index 74c2a39..7147260 100644 --- a/camel/camel-mime-part.c +++ b/camel/camel-mime-part.c @@ -28,12 +28,12 @@ #include #endif -#include -#include #include #include +#include +#include -#include "libedataserver/e-iconv.h" +#include #include "camel-charset-map.h" #include "camel-exception.h" diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h index 252cab2..a66f9d9 100644 --- a/camel/camel-mime-part.h +++ b/camel/camel-mime-part.h @@ -27,12 +27,6 @@ #ifndef CAMEL_MIME_PART_H #define CAMEL_MIME_PART_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -42,6 +36,8 @@ extern "C" { #define CAMEL_MIME_PART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass)) #define CAMEL_IS_MIME_PART(o) (CAMEL_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE)) +G_BEGIN_DECLS + /* Do not change these values directly, you would regret it one day */ struct _CamelMimePart { CamelMedium parent_object; @@ -107,9 +103,6 @@ int camel_mime_part_construct_from_parser (CamelMimePart *mime_part, CamelMime void camel_mime_part_set_content (CamelMimePart *mime_part, const char *content, int length, const char *type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MIME_PART_H */ - diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 9f68a6d..bc311ca 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -24,19 +24,21 @@ #include #endif +/* POSIX requires be included before */ +#include + +#include +#include +#include +#include +#include #include #include #include -#include +#include +#include #include /* for MAXHOSTNAMELEN */ #include -#include -#include -#include -#include -#include -#include -#include #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 1024 @@ -44,8 +46,8 @@ #include -#include "libedataserver/e-iconv.h" -#include "libedataserver/e-time-utils.h" +#include +#include #include "camel-charset-map.h" #include "camel-mime-utils.h" diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h index bff79de..1b63da5 100644 --- a/camel/camel-mime-utils.h +++ b/camel/camel-mime-utils.h @@ -24,11 +24,6 @@ #ifndef _CAMEL_MIME_UTILS_H #define _CAMEL_MIME_UTILS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -42,6 +37,8 @@ extern "C" { #define CAMEL_UUDECODE_STATE_END (1 << 17) #define CAMEL_UUDECODE_STATE_MASK (CAMEL_UUDECODE_STATE_BEGIN | CAMEL_UUDECODE_STATE_END) +G_BEGIN_DECLS + /* note, if you change this, make sure you change the 'encodings' array in camel-mime-part.c */ typedef enum _CamelTransferEncoding { CAMEL_TRANSFER_ENCODING_DEFAULT, @@ -281,8 +278,6 @@ extern unsigned short camel_mime_special_table[256]; #define camel_mime_is_psafe(x) ((camel_mime_special_table[(unsigned char)(x)] & CAMEL_MIME_IS_PSAFE) != 0) #define camel_mime_is_attrchar(x) ((camel_mime_special_table[(unsigned char)(x)] & CAMEL_MIME_IS_ATTRCHAR) != 0) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_MIME_UTILS_H */ diff --git a/camel/camel-movemail.c b/camel/camel-movemail.c index 30838e7..a3bab1e 100644 --- a/camel/camel-movemail.c +++ b/camel/camel-movemail.c @@ -26,27 +26,30 @@ #include #endif -#include -#include #include #include -#include +#include #include +#include +#include #include #include -#include -#include +#include +#include + #ifdef HAVE_ALLOCA_H #include #endif -#include "camel-movemail.h" +#include +#include + #include "camel-exception.h" -#include "camel-mime-parser.h" -#include "camel-mime-filter.h" -#include "camel-mime-filter-from.h" #include "camel-lock-client.h" -#include "camel-i18n.h" +#include "camel-mime-filter-from.h" +#include "camel-mime-filter.h" +#include "camel-mime-parser.h" +#include "camel-movemail.h" #define d(x) @@ -70,8 +73,7 @@ static int camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes); #endif /** - * camel_movemail: Copy an mbox file from a shared spool directory to a - * new folder in a Camel store + * camel_movemail: * @source: source file * @dest: destination file * @ex: a CamelException diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h index 8c99205..f861486 100644 --- a/camel/camel-movemail.h +++ b/camel/camel-movemail.h @@ -26,19 +26,12 @@ #ifndef CAMEL_MOVEMAIL_H #define CAMEL_MOVEMAIL_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include -int camel_movemail (const char *source, const char *dest, CamelException *ex); +G_BEGIN_DECLS +int camel_movemail (const char *source, const char *dest, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MOVEMAIL_H */ diff --git a/camel/camel-multipart-encrypted.c b/camel/camel-multipart-encrypted.c index df29468..3c3d654 100644 --- a/camel/camel-multipart-encrypted.c +++ b/camel/camel-multipart-encrypted.c @@ -28,7 +28,9 @@ #include #include -#include "camel-i18n.h" +#include +#include + #include "camel-mime-filter-crlf.h" #include "camel-mime-part.h" #include "camel-mime-utils.h" diff --git a/camel/camel-multipart-encrypted.h b/camel/camel-multipart-encrypted.h index dbe02f3..69e4acd 100644 --- a/camel/camel-multipart-encrypted.h +++ b/camel/camel-multipart-encrypted.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_MULTIPART_ENCRYPTED_H__ #define __CAMEL_MULTIPART_ENCRYPTED_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_MULTIPART_ENCRYPTED_TYPE (camel_multipart_encrypted_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_MULTIPART_ENCRYPTED_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_ENCRYPTED_TYPE, CamelMultipartEncryptedClass)) #define CAMEL_IS_MULTIPART_ENCRYPTED(o) (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_ENCRYPTED_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelMultipartEncrypted CamelMultipartEncrypted; typedef struct _CamelMultipartEncryptedClass CamelMultipartEncryptedClass; @@ -64,8 +61,6 @@ CamelType camel_multipart_encrypted_get_type (void); CamelMultipartEncrypted *camel_multipart_encrypted_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_MULTIPART_ENCRYPTED_H__ */ diff --git a/camel/camel-multipart-signed.c b/camel/camel-multipart-signed.c index d87b63f..c06fe5b 100644 --- a/camel/camel-multipart-signed.c +++ b/camel/camel-multipart-signed.c @@ -24,20 +24,22 @@ #include #endif +#include +#include +#include +#include +#include + #ifdef HAVE_ALLOCA_H #include #endif -#include -#include -#include -#include -#include +#include +#include -#include "libedataserver/md5-utils.h" +#include #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-mime-filter-canon.h" #include "camel-mime-filter-crlf.h" #include "camel-mime-message.h" diff --git a/camel/camel-multipart-signed.h b/camel/camel-multipart-signed.h index 597d8d9..00064a9 100644 --- a/camel/camel-multipart-signed.h +++ b/camel/camel-multipart-signed.h @@ -27,11 +27,6 @@ #ifndef CAMEL_MULTIPART_SIGNED_H #define CAMEL_MULTIPART_SIGNED_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_MULTIPART_SIGNED_TYPE (camel_multipart_signed_get_type ()) @@ -39,6 +34,8 @@ extern "C" { #define CAMEL_MULTIPART_SIGNED_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_SIGNED_TYPE, CamelMultipartSignedClass)) #define CAMEL_IS_MULTIPART_SIGNED(o) (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_SIGNED_TYPE)) +G_BEGIN_DECLS + /* enum { CAMEL_MULTIPART_EMPTY, @@ -92,10 +89,6 @@ CamelMultipartSigned *camel_multipart_signed_new (void); CamelStream *camel_multipart_signed_get_content_stream(CamelMultipartSigned *mps, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MULTIPART_SIGNED_H */ - - diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c index 2fabb90..403e167 100644 --- a/camel/camel-multipart.c +++ b/camel/camel-multipart.c @@ -26,17 +26,17 @@ #include #endif +#include #include /* strlen() */ -#include /* for getpid */ #include /* for time */ -#include +#include /* for getpid */ -#include "libedataserver/md5-utils.h" +#include -#include "camel-stream-mem.h" -#include "camel-multipart.h" #include "camel-exception.h" #include "camel-mime-part.h" +#include "camel-multipart.h" +#include "camel-stream-mem.h" #define d(x) diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h index f2ddd69..168a3d9 100644 --- a/camel/camel-multipart.h +++ b/camel/camel-multipart.h @@ -27,12 +27,6 @@ #ifndef CAMEL_MULTIPART_H #define CAMEL_MULTIPART_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_MULTIPART_TYPE (camel_multipart_get_type ()) @@ -40,6 +34,8 @@ extern "C" { #define CAMEL_MULTIPART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass)) #define CAMEL_IS_MULTIPART(o) (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE)) +G_BEGIN_DECLS + struct _CamelMimeParser; struct _CamelMultipart @@ -96,9 +92,6 @@ void camel_multipart_set_postface (CamelMultipart *multipart, const char int camel_multipart_construct_from_parser(CamelMultipart *multipart, struct _CamelMimeParser *parser); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MULTIPART_H */ - diff --git a/camel/camel-net-utils.c b/camel/camel-net-utils.c index e14f2f5..e4ad909 100644 --- a/camel/camel-net-utils.c +++ b/camel/camel-net-utils.c @@ -25,19 +25,20 @@ #include #endif -#include +#include +#include +#include #ifndef G_OS_WIN32 #include #endif -#include -#include -#include -#include "libedataserver/e-msgport.h" +#include +#include + +#include #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-net-utils.h" #include "camel-operation.h" diff --git a/camel/camel-net-utils.h b/camel/camel-net-utils.h index 0fcf84f..119f7d2 100644 --- a/camel/camel-net-utils.h +++ b/camel/camel-net-utils.h @@ -23,11 +23,6 @@ #ifndef CAMEL_NET_UTILS_H #define CAMEL_NET_UTILS_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #ifndef _WIN32 @@ -38,6 +33,8 @@ extern "C" { #include #endif +G_BEGIN_DECLS + struct _CamelException; #ifndef _WIN32 @@ -97,8 +94,6 @@ void camel_freeaddrinfo(struct addrinfo *host); int camel_getnameinfo(const struct sockaddr *sa, socklen_t salen, char **host, char **serv, int flags, struct _CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NET_UTILS_H */ diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h index 1b2945b..013a7a0 100644 --- a/camel/camel-news-address.h +++ b/camel/camel-news-address.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_NEWS_ADDRESS_H #define _CAMEL_NEWS_ADDRESS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_NEWS_ADDRESS(obj) CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress) #define CAMEL_NEWS_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass) #define CAMEL_IS_NEWS_ADDRESS(obj) CAMEL_CHECK_TYPE (obj, camel_news_address_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelNewsAddressClass CamelNewsAddressClass; struct _CamelNewsAddress { @@ -49,8 +46,6 @@ struct _CamelNewsAddressClass { CamelType camel_news_address_get_type (void); CamelNewsAddress *camel_news_address_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_NEWS_ADDRESS_H */ diff --git a/camel/camel-nntp-address.h b/camel/camel-nntp-address.h index 8243d51..0776ece 100644 --- a/camel/camel-nntp-address.h +++ b/camel/camel-nntp-address.h @@ -22,17 +22,14 @@ #ifndef _CAMEL_NNTP_ADDRESS_H #define _CAMEL_NNTP_ADDRESS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_NNTP_ADDRESS(obj) CAMEL_CHECK_CAST (obj, camel_nntp_address_get_type (), CamelNNTPAddress) #define CAMEL_NNTP_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_address_get_type (), CamelNNTPAddressClass) #define CAMEL_IS_NNTP_ADDRESS(obj) CAMEL_CHECK_TYPE (obj, camel_nntp_address_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelNNTPAddress CamelNNTPAddress; typedef struct _CamelNNTPAddressClass CamelNNTPAddressClass; @@ -52,8 +49,6 @@ CamelNNTPAddress *camel_nntp_address_new (void); int camel_nntp_address_add (CamelNNTPAddress *, const char *); gboolean camel_nntp_address_get (const CamelNNTPAddress *, int, const char **); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_NNTP_ADDRESS_H */ diff --git a/camel/camel-object.c b/camel/camel-object.c index 807bc83..7354c0b 100644 --- a/camel/camel-object.c +++ b/camel/camel-object.c @@ -20,18 +20,21 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif +#include +#include #include #include -#include -#include +#include #include -#include "libedataserver/e-memory.h" -#include "libedataserver/e-msgport.h" -#include "libedataserver/e-data-server-util.h" +#include +#include +#include #include "camel-file-utils.h" #include "camel-object.h" diff --git a/camel/camel-object.h b/camel/camel-object.h index 728007d..8de2989 100644 --- a/camel/camel-object.h +++ b/camel/camel-object.h @@ -25,11 +25,6 @@ #ifndef CAMEL_OBJECT_H #define CAMEL_OBJECT_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include /* FILE */ #include /* size_t */ @@ -42,6 +37,8 @@ extern "C" { /* turn on so that camel_object_class_dump_tree() dumps object instances as well */ #define CAMEL_OBJECT_TRACK_INSTANCES +G_BEGIN_DECLS + typedef struct _CamelObjectClass *CamelType; #ifdef G_DISABLE_CHECKS @@ -334,8 +331,6 @@ const void *camel_iterator_next(void *it, CamelException *ex); void camel_iterator_reset(void *it); int camel_iterator_length(void *it); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_OBJECT_H */ diff --git a/camel/camel-offline-folder.c b/camel/camel-offline-folder.c index 8e58a8e..55eb11a 100644 --- a/camel/camel-offline-folder.c +++ b/camel/camel-offline-folder.c @@ -25,7 +25,9 @@ #include #endif -#include "camel-i18n.h" +#include +#include + #include "camel-offline-folder.h" #include "camel-operation.h" #include "camel-service.h" diff --git a/camel/camel-offline-folder.h b/camel/camel-offline-folder.h index 5f440d0..1ffaaec 100644 --- a/camel/camel-offline-folder.h +++ b/camel/camel-offline-folder.h @@ -26,16 +26,13 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_OFFLINE_FOLDER_TYPE (camel_offline_folder_get_type ()) #define CAMEL_OFFLINE_FOLDER(obj) (CAMEL_CHECK_CAST((obj), CAMEL_OFFLINE_FOLDER_TYPE, CamelOfflineFolder)) #define CAMEL_OFFLINE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_OFFLINE_FOLDER_TYPE, CamelOfflineFolderClass)) #define CAMEL_IS_OFFLINE_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_OFFLINE_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelOfflineFolder CamelOfflineFolder; typedef struct _CamelOfflineFolderClass CamelOfflineFolderClass; @@ -65,8 +62,6 @@ CamelType camel_offline_folder_get_type (void); void camel_offline_folder_downsync (CamelOfflineFolder *folder, const char *expression, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_OFFLINE_FOLDER_H__ */ diff --git a/camel/camel-offline-journal.c b/camel/camel-offline-journal.c index af0a5a3..2862022 100644 --- a/camel/camel-offline-journal.c +++ b/camel/camel-offline-journal.c @@ -25,22 +25,23 @@ #include #endif +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include #include #include "camel-data-cache.h" #include "camel-file-utils.h" #include "camel-folder-summary.h" #include "camel-folder.h" -#include "camel-i18n.h" #include "camel-offline-journal.h" #include "camel-private.h" diff --git a/camel/camel-offline-journal.h b/camel/camel-offline-journal.h index d1cc69f..ef23908 100644 --- a/camel/camel-offline-journal.h +++ b/camel/camel-offline-journal.h @@ -32,11 +32,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_OFFLINE_JOURNAL (camel_offline_journal_get_type ()) #define CAMEL_OFFLINE_JOURNAL(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_OFFLINE_JOURNAL, CamelOfflineJournal)) #define CAMEL_OFFLINE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_OFFLINE_JOURNAL, CamelOfflineJournalClass)) @@ -44,6 +39,8 @@ extern "C" { #define CAMEL_IS_OFFLINE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_OFFLINE_JOURNAL)) #define CAMEL_OFFLINE_JOURNAL_GET_CLASS(o) (CAMEL_OFFLINE_JOURNAL_CLASS (CAMEL_OBJECT_GET_CLASS (o))) +G_BEGIN_DECLS + typedef struct _CamelOfflineJournal CamelOfflineJournal; typedef struct _CamelOfflineJournalClass CamelOfflineJournalClass; typedef struct _CamelOfflineJournalEntry CamelOfflineJournalEntry; @@ -78,8 +75,6 @@ void camel_offline_journal_set_filename (CamelOfflineJournal *journal, const cha int camel_offline_journal_write (CamelOfflineJournal *journal, CamelException *ex); int camel_offline_journal_replay (CamelOfflineJournal *journal, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_OFFLINE_JOURNAL_H__ */ diff --git a/camel/camel-offline-store.c b/camel/camel-offline-store.c index 1ef8f8f..fcc9bb8 100644 --- a/camel/camel-offline-store.c +++ b/camel/camel-offline-store.c @@ -25,8 +25,10 @@ #include #endif +#include +#include + #include "camel-folder.h" -#include "camel-i18n.h" #include "camel-offline-folder.h" #include "camel-offline-store.h" #include "camel-session.h" diff --git a/camel/camel-offline-store.h b/camel/camel-offline-store.h index 9edbb90..da9547f 100644 --- a/camel/camel-offline-store.h +++ b/camel/camel-offline-store.h @@ -26,11 +26,6 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_OFFLINE_STORE (camel_offline_store_get_type ()) #define CAMEL_OFFLINE_STORE(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStore)) #define CAMEL_OFFLINE_STORE_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStoreClass)) @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_IS_OFFLINE_STORE_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_OFFLINE_STORE)) #define CAMEL_OFFLINE_STORE_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_OFFLINE_STORE, CamelOfflineStoreClass)) +G_BEGIN_DECLS + typedef struct _CamelOfflineStore CamelOfflineStore; typedef struct _CamelOfflineStoreClass CamelOfflineStoreClass; @@ -68,9 +65,6 @@ CamelType camel_offline_store_get_type (void); void camel_offline_store_set_network_state (CamelOfflineStore *store, int state, CamelException *ex); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_OFFLINE_STORE_H__ */ diff --git a/camel/camel-operation.c b/camel/camel-operation.c index f6cf249..2d4b726 100644 --- a/camel/camel-operation.c +++ b/camel/camel-operation.c @@ -24,17 +24,18 @@ #include #endif -#include - +#include #include -#include #include -#include +#include + #ifdef HAVE_NSS #include #endif -#include "libedataserver/e-msgport.h" +#include + +#include #include "camel-operation.h" diff --git a/camel/camel-operation.h b/camel/camel-operation.h index 5c9efa9..dc03ce4 100644 --- a/camel/camel-operation.h +++ b/camel/camel-operation.h @@ -22,10 +22,7 @@ #ifndef CAMEL_OPERATION_H #define CAMEL_OPERATION_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ +G_BEGIN_DECLS /* cancellation helper stuff, not yet finalised */ @@ -66,8 +63,6 @@ void camel_operation_progress(CamelOperation *cc, int pc); void camel_operation_progress_count(CamelOperation *cc, int sofar); void camel_operation_end(CamelOperation *cc); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_OPERATION_H */ diff --git a/camel/camel-partition-table.c b/camel/camel-partition-table.c index b99c2af..11e55d0 100644 --- a/camel/camel-partition-table.c +++ b/camel/camel-partition-table.c @@ -24,15 +24,15 @@ #include #endif +#include +#include #include #include -#include #include +#include #include -#include -#include -#include "libedataserver/e-msgport.h" +#include #include "camel-block-file.h" #include "camel-partition-table.h" diff --git a/camel/camel-partition-table.h b/camel/camel-partition-table.h index 4cf75a5..777f129 100644 --- a/camel/camel-partition-table.h +++ b/camel/camel-partition-table.h @@ -27,6 +27,8 @@ #include "camel-block-file.h" +G_BEGIN_DECLS + /* ********************************************************************** */ /* CamelPartitionTable - index of key to keyid */ @@ -149,4 +151,6 @@ void camel_key_table_set_flags(CamelKeyTable *ki, camel_key_t keyid, unsigned in camel_block_t camel_key_table_lookup(CamelKeyTable *ki, camel_key_t keyid, char **key, unsigned int *flags); camel_key_t camel_key_table_next(CamelKeyTable *ki, camel_key_t next, char **keyp, unsigned int *flagsp, camel_block_t *datap); +G_END_DECLS + #endif /* ! _CAMEL_PARTITION_TABLE_H */ diff --git a/camel/camel-private.h b/camel/camel-private.h index 0ff4688..706c6f0 100644 --- a/camel/camel-private.h +++ b/camel/camel-private.h @@ -23,11 +23,6 @@ #ifndef CAMEL_PRIVATE_H #define CAMEL_PRIVATE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ @@ -38,6 +33,8 @@ extern "C" { #include #include +G_BEGIN_DECLS + struct _CamelFolderPrivate { GStaticRecMutex lock; GStaticMutex change_lock; @@ -191,7 +188,6 @@ const char *_camel_get_providerdir (void) G_GNUC_CONST; #endif /* G_OS_WIN32 */ -#ifdef __cplusplus -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_PRIVATE_H */ diff --git a/camel/camel-process.c b/camel/camel-process.c index 23cd2de..6f5675c 100644 --- a/camel/camel-process.c +++ b/camel/camel-process.c @@ -25,9 +25,9 @@ #include #endif -#include -#include #include +#include +#include #include "camel-process.h" diff --git a/camel/camel-process.h b/camel/camel-process.h index 95d2c42..162ba59 100644 --- a/camel/camel-process.h +++ b/camel/camel-process.h @@ -28,17 +28,12 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS pid_t camel_process_fork (const char *path, char **argv, int *infd, int *outfd, int *errfd, CamelException *ex); int camel_process_wait (pid_t pid); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_PROCESS_H__ */ diff --git a/camel/camel-provider.c b/camel/camel-provider.c index 8639229..ea6c0d1 100644 --- a/camel/camel-provider.c +++ b/camel/camel-provider.c @@ -29,23 +29,23 @@ #include #endif -#include #include #include #include +#include #include +#include #include #include -#include "libedataserver/e-msgport.h" +#include #include "camel-exception.h" -#include "camel-i18n.h" +#include "camel-private.h" #include "camel-provider.h" #include "camel-string-utils.h" #include "camel-vee-store.h" -#include "camel-private.h" /* table of CamelProviderModule's */ static GHashTable *module_table; diff --git a/camel/camel-provider.h b/camel/camel-provider.h index dd5b725..2165d22 100644 --- a/camel/camel-provider.h +++ b/camel/camel-provider.h @@ -28,12 +28,6 @@ #ifndef CAMEL_PROVIDER_H #define CAMEL_PROVIDER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -41,6 +35,8 @@ extern "C" { #define CAMEL_PROVIDER(obj) ((CamelProvider *)(obj)) +G_BEGIN_DECLS + typedef enum { CAMEL_PROVIDER_STORE, CAMEL_PROVIDER_TRANSPORT, @@ -236,8 +232,6 @@ void camel_provider_module_init(void); int camel_provider_auto_detect (CamelProvider *provider, CamelURL *url, GHashTable **auto_detected, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_PROVIDER_H */ diff --git a/camel/camel-sasl-anonymous.c b/camel/camel-sasl-anonymous.c index e353af6..bc8b328 100644 --- a/camel/camel-sasl-anonymous.c +++ b/camel/camel-sasl-anonymous.c @@ -27,7 +27,9 @@ #include -#include "camel-i18n.h" +#include +#include + #include "camel-internet-address.h" #include "camel-sasl-anonymous.h" diff --git a/camel/camel-sasl-anonymous.h b/camel/camel-sasl-anonymous.h index 7a27dbe..c7a1bd9 100644 --- a/camel/camel-sasl-anonymous.h +++ b/camel/camel-sasl-anonymous.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_ANONYMOUS_H #define CAMEL_SASL_ANONYMOUS_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_ANONYMOUS_TYPE (camel_sasl_anonymous_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_SASL_ANONYMOUS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_ANONYMOUS_TYPE, CamelSaslAnonymousClass)) #define CAMEL_IS_SASL_ANONYMOUS(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_ANONYMOUS_TYPE)) +G_BEGIN_DECLS + typedef enum { CAMEL_SASL_ANON_TRACE_EMAIL, CAMEL_SASL_ANON_TRACE_OPAQUE, @@ -63,8 +60,6 @@ CamelSasl *camel_sasl_anonymous_new (CamelSaslAnonTraceType type, const char *tr extern CamelServiceAuthType camel_sasl_anonymous_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_ANONYMOUS_H */ diff --git a/camel/camel-sasl-cram-md5.c b/camel/camel-sasl-cram-md5.c index ba73f7d..9971789 100644 --- a/camel/camel-sasl-cram-md5.c +++ b/camel/camel-sasl-cram-md5.c @@ -27,9 +27,11 @@ #include #include -#include "libedataserver/md5-utils.h" +#include +#include + +#include -#include "camel-i18n.h" #include "camel-mime-utils.h" #include "camel-sasl-cram-md5.h" #include "camel-service.h" diff --git a/camel/camel-sasl-cram-md5.h b/camel/camel-sasl-cram-md5.h index 3f0972a..96e733d 100644 --- a/camel/camel-sasl-cram-md5.h +++ b/camel/camel-sasl-cram-md5.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_CRAM_MD5_H #define CAMEL_SASL_CRAM_MD5_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_CRAM_MD5_TYPE (camel_sasl_cram_md5_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_SASL_CRAM_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_CRAM_MD5_TYPE, CamelSaslCramMd5Class)) #define CAMEL_IS_SASL_CRAM_MD5(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_CRAM_MD5_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslCramMd5 { CamelSasl parent_object; @@ -52,8 +49,6 @@ CamelType camel_sasl_cram_md5_get_type (void); extern CamelServiceAuthType camel_sasl_cram_md5_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_CRAM_MD5_H */ diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c index 7a520f1..1c5e744 100644 --- a/camel/camel-sasl-digest-md5.c +++ b/camel/camel-sasl-digest-md5.c @@ -24,16 +24,18 @@ #include #endif +#include #include #include -#include #include -#include "libedataserver/e-iconv.h" -#include "libedataserver/md5-utils.h" +#include +#include + +#include +#include #include "camel-charset-map.h" -#include "camel-i18n.h" #include "camel-mime-utils.h" #include "camel-net-utils.h" #include "camel-sasl-digest-md5.h" diff --git a/camel/camel-sasl-digest-md5.h b/camel/camel-sasl-digest-md5.h index a3903cd..3073486 100644 --- a/camel/camel-sasl-digest-md5.h +++ b/camel/camel-sasl-digest-md5.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_DIGEST_MD5_H #define CAMEL_SASL_DIGEST_MD5_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_SASL_DIGEST_MD5_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_DIGEST_MD5_TYPE, CamelSaslDigestMd5Class)) #define CAMEL_IS_SASL_DIGEST_MD5(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_DIGEST_MD5_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslDigestMd5 { CamelSasl parent_object; struct _CamelSaslDigestMd5Private *priv; @@ -54,8 +51,6 @@ CamelType camel_sasl_digest_md5_get_type (void); extern CamelServiceAuthType camel_sasl_digest_md5_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_DIGEST_MD5_H */ diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c index c20a0a2..5f1d00e 100644 --- a/camel/camel-sasl-gssapi.c +++ b/camel/camel-sasl-gssapi.c @@ -25,12 +25,13 @@ #include #endif -#ifdef HAVE_KRB5 +#include +#ifdef HAVE_KRB5 +#include #include -#include #include -#include +#include #ifdef HAVE_ET_COM_ERR_H #include #else @@ -43,13 +44,14 @@ #include #define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE #endif -#include #ifndef GSS_C_OID_KRBV5_DES #define GSS_C_OID_KRBV5_DES GSS_C_NO_OID #endif -#include "camel-i18n.h" +#include +#include + #include "camel-net-utils.h" #include "camel-sasl-gssapi.h" diff --git a/camel/camel-sasl-gssapi.h b/camel/camel-sasl-gssapi.h index db09808..dfc92de 100644 --- a/camel/camel-sasl-gssapi.h +++ b/camel/camel-sasl-gssapi.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_SASL_GSSAPI_H__ #define __CAMEL_SASL_GSSAPI_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_SASL_GSSAPI_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_GSSAPI_TYPE, CamelSaslGssapiClass)) #define CAMEL_IS_SASL_GSSAPI(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_GSSAPI_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslGssapi CamelSaslGssapi; typedef struct _CamelSaslGssapiClass CamelSaslGssapiClass; @@ -57,8 +54,6 @@ CamelType camel_sasl_gssapi_get_type (void); extern CamelServiceAuthType camel_sasl_gssapi_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_SASL_GSSAPI_H__ */ diff --git a/camel/camel-sasl-kerberos4.c b/camel/camel-sasl-kerberos4.c index a954ee7..1c9ca07 100644 --- a/camel/camel-sasl-kerberos4.c +++ b/camel/camel-sasl-kerberos4.c @@ -32,10 +32,12 @@ */ #undef _ -#include #include +#include + +#include +#include -#include "camel-i18n.h" #include "camel-net-utils.h" #include "camel-sasl-kerberos4.h" #include "camel-service.h" diff --git a/camel/camel-sasl-kerberos4.h b/camel/camel-sasl-kerberos4.h index c0e504f..c4ca37f 100644 --- a/camel/camel-sasl-kerberos4.h +++ b/camel/camel-sasl-kerberos4.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_KERBEROS4_H #define CAMEL_SASL_KERBEROS4_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_SASL_KERBEROS4_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_KERBEROS4_TYPE, CamelSaslKerberos4Class)) #define CAMEL_IS_SASL_KERBEROS4(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_KERBEROS4_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslKerberos4 { CamelSasl parent_object; struct _CamelSaslKerberos4Private *priv; @@ -54,8 +51,6 @@ CamelType camel_sasl_kerberos4_get_type (void); extern CamelServiceAuthType camel_sasl_kerberos4_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_KERBEROS4_H */ diff --git a/camel/camel-sasl-login.c b/camel/camel-sasl-login.c index 23ac82a..76c8a3b 100644 --- a/camel/camel-sasl-login.c +++ b/camel/camel-sasl-login.c @@ -26,7 +26,9 @@ #include -#include "camel-i18n.h" +#include +#include + #include "camel-sasl-login.h" #include "camel-service.h" diff --git a/camel/camel-sasl-login.h b/camel/camel-sasl-login.h index 42d2f18..40b892b 100644 --- a/camel/camel-sasl-login.h +++ b/camel/camel-sasl-login.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_LOGIN_H #define CAMEL_SASL_LOGIN_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_LOGIN_TYPE (camel_sasl_login_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_SASL_LOGIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_LOGIN_TYPE, CamelSaslLoginClass)) #define CAMEL_IS_SASL_LOGIN(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_LOGIN_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslLogin { CamelSasl parent_object; @@ -54,8 +51,6 @@ CamelType camel_sasl_login_get_type (void); extern CamelServiceAuthType camel_sasl_login_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_LOGIN_H */ diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c index 45e959e..179c39f 100644 --- a/camel/camel-sasl-ntlm.c +++ b/camel/camel-sasl-ntlm.c @@ -25,7 +25,9 @@ #include #include -#include "camel-i18n.h" +#include +#include + #include "camel-sasl-ntlm.h" CamelServiceAuthType camel_sasl_ntlm_authtype = { diff --git a/camel/camel-sasl-ntlm.h b/camel/camel-sasl-ntlm.h index 1e09f5c..dc91fc1 100644 --- a/camel/camel-sasl-ntlm.h +++ b/camel/camel-sasl-ntlm.h @@ -21,11 +21,6 @@ #ifndef CAMEL_SASL_NTLM_H #define CAMEL_SASL_NTLM_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_NTLM_TYPE (camel_sasl_ntlm_get_type ()) @@ -33,6 +28,8 @@ extern "C" { #define CAMEL_SASL_NTLM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_NTLM_TYPE, CamelSaslNTLMClass)) #define CAMEL_IS_SASL_NTLM(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_NTLM_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslNTLM { CamelSasl parent_object; @@ -50,8 +47,6 @@ CamelType camel_sasl_ntlm_get_type (void); extern CamelServiceAuthType camel_sasl_ntlm_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_NTLM_H */ diff --git a/camel/camel-sasl-plain.c b/camel/camel-sasl-plain.c index 2d03b52..70ff5b7 100644 --- a/camel/camel-sasl-plain.c +++ b/camel/camel-sasl-plain.c @@ -26,7 +26,9 @@ #include -#include "camel-i18n.h" +#include +#include + #include "camel-sasl-plain.h" #include "camel-service.h" diff --git a/camel/camel-sasl-plain.h b/camel/camel-sasl-plain.h index 2b0e78a..1493f94 100644 --- a/camel/camel-sasl-plain.h +++ b/camel/camel-sasl-plain.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_PLAIN_H #define CAMEL_SASL_PLAIN_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_PLAIN_TYPE (camel_sasl_plain_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_SASL_PLAIN_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_PLAIN_TYPE, CamelSaslPlainClass)) #define CAMEL_IS_SASL_PLAIN(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_PLAIN_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslPlain { CamelSasl parent_object; @@ -52,8 +49,6 @@ CamelType camel_sasl_plain_get_type (void); extern CamelServiceAuthType camel_sasl_plain_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_PLAIN_H */ diff --git a/camel/camel-sasl-popb4smtp.c b/camel/camel-sasl-popb4smtp.c index 90d6346..6195dfe 100644 --- a/camel/camel-sasl-popb4smtp.c +++ b/camel/camel-sasl-popb4smtp.c @@ -28,7 +28,9 @@ #include #include -#include "camel-i18n.h" +#include +#include + #include "camel-sasl-popb4smtp.h" #include "camel-service.h" #include "camel-session.h" diff --git a/camel/camel-sasl-popb4smtp.h b/camel/camel-sasl-popb4smtp.h index 32ad339..2362ef3 100644 --- a/camel/camel-sasl-popb4smtp.h +++ b/camel/camel-sasl-popb4smtp.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_POPB4SMTP_H #define CAMEL_SASL_POPB4SMTP_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_SASL_POPB4SMTP_TYPE (camel_sasl_popb4smtp_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_SASL_POPB4SMTP_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_POPB4SMTP_TYPE, CamelSaslPOPB4SMTPClass)) #define CAMEL_IS_SASL_POPB4SMTP(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_POPB4SMTP_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSaslPOPB4SMTP { CamelSasl parent_object; @@ -52,8 +49,6 @@ CamelType camel_sasl_popb4smtp_get_type (void); extern CamelServiceAuthType camel_sasl_popb4smtp_authtype; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_POPB4SMTP_H */ diff --git a/camel/camel-sasl.h b/camel/camel-sasl.h index f23d5c8..af4672a 100644 --- a/camel/camel-sasl.h +++ b/camel/camel-sasl.h @@ -23,11 +23,6 @@ #ifndef CAMEL_SASL_H #define CAMEL_SASL_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_SASL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SASL_TYPE, CamelSaslClass)) #define CAMEL_IS_SASL(o) (CAMEL_CHECK_TYPE((o), CAMEL_SASL_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelSasl { CamelObject parent_object; @@ -71,8 +68,6 @@ CamelSasl *camel_sasl_new (const char *service_name, const char *m GList *camel_sasl_authtype_list (gboolean include_plain); CamelServiceAuthType *camel_sasl_authtype (const char *mechanism); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SASL_H */ diff --git a/camel/camel-search-private.c b/camel/camel-search-private.c index eef253f..c4e8889 100644 --- a/camel/camel-search-private.c +++ b/camel/camel-search-private.c @@ -22,31 +22,29 @@ * */ -/* (from glibc headers: - POSIX says that must be included (by the caller) before . */ - #ifdef HAVE_CONFIG_H #include #endif +/* POSIX requires be included before */ #include -#include -#include + #include +#include #include +#include #include +#include -#include "libedataserver/e-sexp.h" +#include #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-multipart.h" #include "camel-search-private.h" #include "camel-stream-mem.h" - #define d(x) static inline guint32 diff --git a/camel/camel-search-private.h b/camel/camel-search-private.h index 21c3723..b6ec856 100644 --- a/camel/camel-search-private.h +++ b/camel/camel-search-private.h @@ -21,8 +21,15 @@ #ifndef _CAMEL_SEARCH_PRIVATE_H #define _CAMEL_SEARCH_PRIVATE_H +/* POSIX requires be included before */ +#include + #include +#include "camel-exception.h" + +G_BEGIN_DECLS + typedef enum { CAMEL_SEARCH_MATCH_START = 1<<0, CAMEL_SEARCH_MATCH_END = 1<<1, @@ -79,5 +86,6 @@ struct _camel_search_words *camel_search_words_split(const unsigned char *in); struct _camel_search_words *camel_search_words_simple(struct _camel_search_words *wordin); void camel_search_words_free(struct _camel_search_words *); -#endif /* ! _CAMEL_SEARCH_PRIVATE_H */ +G_END_DECLS +#endif /* ! _CAMEL_SEARCH_PRIVATE_H */ diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h index d50a731..ac2b1e3 100644 --- a/camel/camel-seekable-stream.h +++ b/camel/camel-seekable-stream.h @@ -26,12 +26,6 @@ #ifndef CAMEL_SEEKABLE_STREAM_H #define CAMEL_SEEKABLE_STREAM_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -41,6 +35,7 @@ extern "C" { #define CAMEL_SEEKABLE_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass)) #define CAMEL_IS_SEEKABLE_STREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_STREAM_TYPE)) +G_BEGIN_DECLS typedef enum { CAMEL_STREAM_SET = SEEK_SET, @@ -78,8 +73,6 @@ off_t camel_seekable_stream_seek (CamelSeekableStream *stream, off off_t camel_seekable_stream_tell (CamelSeekableStream *stream); int camel_seekable_stream_set_bounds (CamelSeekableStream *stream, off_t start, off_t end); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SEEKABLE_STREAM_H */ diff --git a/camel/camel-seekable-substream.h b/camel/camel-seekable-substream.h index 44b9db0..4863f61 100644 --- a/camel/camel-seekable-substream.h +++ b/camel/camel-seekable-substream.h @@ -26,12 +26,6 @@ #ifndef CAMEL_SEEKABLE_SUBSTREAM_H #define CAMEL_SEEKABLE_SUBSTREAM_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_SEEKABLE_SUBSTREAM_TYPE (camel_seekable_substream_get_type ()) @@ -39,6 +33,8 @@ extern "C" { #define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass)) #define CAMEL_IS_SEEKABLE_SUBSTREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE)) +G_BEGIN_DECLS + struct _CamelSeekableSubstream { CamelSeekableStream parent_object; @@ -59,8 +55,6 @@ CamelType camel_seekable_substream_get_type (void); /* obtain a new seekable substream */ CamelStream *camel_seekable_substream_new(CamelSeekableStream *parent_stream, off_t start, off_t end); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SEEKABLE_SUBSTREAM_H */ diff --git a/camel/camel-service.c b/camel/camel-service.c index 4c1f4a3..4bf4b57 100644 --- a/camel/camel-service.c +++ b/camel/camel-service.c @@ -29,15 +29,17 @@ #endif #include +#include +#include #include #include -#include -#include -#include "libedataserver/e-msgport.h" +#include +#include + +#include #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-operation.h" #include "camel-private.h" #include "camel-service.h" diff --git a/camel/camel-service.h b/camel/camel-service.h index cf634db..e19c3e9 100644 --- a/camel/camel-service.h +++ b/camel/camel-service.h @@ -25,12 +25,6 @@ #ifndef CAMEL_SERVICE_H #define CAMEL_SERVICE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -41,6 +35,8 @@ extern "C" { #define CAMEL_SERVICE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass)) #define CAMEL_IS_SERVICE(o) (CAMEL_CHECK_TYPE((o), CAMEL_SERVICE_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_SERVICE_ARG_FIRST = CAMEL_ARG_FIRST + 100, CAMEL_SERVICE_ARG_USERNAME, @@ -132,9 +128,6 @@ GList * camel_service_query_auth_types (CamelService *service, /* Standard Camel function */ CamelType camel_service_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SERVICE_H */ - diff --git a/camel/camel-session.c b/camel/camel-session.c index 8eea9de..6e88303 100644 --- a/camel/camel-session.c +++ b/camel/camel-session.c @@ -28,18 +28,20 @@ #include #endif +#include #include #include -#include #include -#include +#include +#include +#include #include -#include "libedataserver/e-data-server-util.h" +#include + #include "camel-exception.h" #include "camel-file-utils.h" -#include "camel-i18n.h" #include "camel-private.h" #include "camel-session.h" #include "camel-store.h" diff --git a/camel/camel-session.h b/camel/camel-session.h index ffd66c6..ad642de 100644 --- a/camel/camel-session.h +++ b/camel/camel-session.h @@ -27,12 +27,6 @@ #ifndef CAMEL_SESSION_H #define CAMEL_SESSION_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -44,6 +38,7 @@ extern "C" { #define CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass)) #define CAMEL_IS_SESSION(o) (CAMEL_CHECK_TYPE((o), CAMEL_SESSION_TYPE)) +G_BEGIN_DECLS typedef gboolean (*CamelTimeoutCallback) (gpointer data); typedef enum { @@ -197,8 +192,7 @@ int camel_session_thread_queue(CamelSession *session, CamelSessionThreadMsg *msg void camel_session_thread_wait(CamelSession *session, int id); gboolean camel_session_get_network_state (CamelSession *session); void camel_session_set_network_state (CamelSession *session, gboolean network_state); -#ifdef __cplusplus -} -#endif /* __cplusplus */ + +G_END_DECLS #endif /* CAMEL_SESSION_H */ diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c index 2cb249d..b216736 100644 --- a/camel/camel-smime-context.c +++ b/camel/camel-smime-context.c @@ -43,9 +43,11 @@ #include +#include +#include + #include "camel-data-wrapper.h" #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-mime-filter-basic.h" #include "camel-mime-filter-canon.h" #include "camel-mime-part.h" diff --git a/camel/camel-smime-context.h b/camel/camel-smime-context.h index f7595b0..4234b6e 100644 --- a/camel/camel-smime-context.h +++ b/camel/camel-smime-context.h @@ -24,11 +24,6 @@ #ifndef __CAMEL_SMIME_CONTEXT_H__ #define __CAMEL_SMIME_CONTEXT_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_SMIME_CONTEXT_TYPE (camel_smime_context_get_type()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_SMIME_CONTEXT_CLASS(k)(CAMEL_CHECK_CLASS_CAST((k), CAMEL_SMIME_CONTEXT_TYPE, CamelSMIMEContextClass)) #define CAMEL_IS_SMIME_CONTEXT(o) (CAMEL_CHECK_TYPE((o), CAMEL_SMIME_CONTEXT_TYPE)) +G_BEGIN_DECLS + typedef enum _camel_smime_sign_t { CAMEL_SMIME_SIGN_CLEARSIGN, CAMEL_SMIME_SIGN_ENVELOPED @@ -72,8 +69,6 @@ void camel_smime_context_set_sign_mode(CamelSMIMEContext *context, camel_smime_s guint32 camel_smime_context_describe_part(CamelSMIMEContext *, struct _CamelMimePart *); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_SMIME_CONTEXT_H__ */ diff --git a/camel/camel-store-summary.c b/camel/camel-store-summary.c index 9ddc541..00f4ca8 100644 --- a/camel/camel-store-summary.c +++ b/camel/camel-store-summary.c @@ -23,19 +23,20 @@ #include #endif +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include +#include +#include +#include #include -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" +#include +#include #include "camel-file-utils.h" #include "camel-private.h" diff --git a/camel/camel-store-summary.h b/camel/camel-store-summary.h index c2c056b..2e4e335 100644 --- a/camel/camel-store-summary.h +++ b/camel/camel-store-summary.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_STORE_SUMMARY_H #define _CAMEL_STORE_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -40,6 +35,8 @@ extern "C" { #define CAMEL_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_store_summary_get_type (), CamelStoreSummaryClass) #define CAMEL_IS_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelStoreSummary CamelStoreSummary; typedef struct _CamelStoreSummaryClass CamelStoreSummaryClass; @@ -181,8 +178,6 @@ void camel_store_info_set_string(CamelStoreSummary *summary, CamelStoreInfo *inf #define camel_store_info_uri(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_URI)) #define camel_store_info_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_NAME)) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_STORE_SUMMARY_H */ diff --git a/camel/camel-store.c b/camel/camel-store.c index 0eb1d1b..cb04452 100644 --- a/camel/camel-store.c +++ b/camel/camel-store.c @@ -28,13 +28,15 @@ #endif #include -#include #include +#include + +#include +#include #include "camel-debug.h" #include "camel-exception.h" #include "camel-folder.h" -#include "camel-i18n.h" #include "camel-private.h" #include "camel-session.h" #include "camel-store.h" diff --git a/camel/camel-store.h b/camel/camel-store.h index a4f6b53..c4d2177 100644 --- a/camel/camel-store.h +++ b/camel/camel-store.h @@ -27,17 +27,14 @@ #ifndef CAMEL_STORE_H #define CAMEL_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* for mode_t */ #include #include #include +G_BEGIN_DECLS + enum { CAMEL_STORE_ARG_FIRST = CAMEL_SERVICE_ARG_FIRST + 100, }; @@ -270,8 +267,6 @@ gboolean camel_isubscribe_subscribed(CamelStore *store, const char *name); void camel_isubscribe_subscribe(CamelStore *store, const char *folder_name, CamelException *ex); void camel_isubscribe_unsubscribe(CamelStore *store, const char *folder_name, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STORE_H */ diff --git a/camel/camel-stream-buffer.c b/camel/camel-stream-buffer.c index d066132..ad55168 100644 --- a/camel/camel-stream-buffer.c +++ b/camel/camel-stream-buffer.c @@ -25,11 +25,11 @@ #include #endif +#include +#include #include -#include #include -#include -#include +#include #include "camel-stream-buffer.h" diff --git a/camel/camel-stream-buffer.h b/camel/camel-stream-buffer.h index 826870a..1f384d2 100644 --- a/camel/camel-stream-buffer.h +++ b/camel/camel-stream-buffer.h @@ -27,12 +27,6 @@ #ifndef CAMEL_STREAM_BUFFER_H #define CAMEL_STREAM_BUFFER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include @@ -41,6 +35,8 @@ extern "C" { #define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass)) #define CAMEL_IS_STREAM_BUFFER(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE)) +G_BEGIN_DECLS + typedef enum { CAMEL_STREAM_BUFFER_BUFFER = 0, CAMEL_STREAM_BUFFER_NONE, @@ -99,8 +95,6 @@ int camel_stream_buffer_gets (CamelStreamBuffer *sbf, char *buf, unsigned int ma char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STREAM_BUFFER_H */ diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h index 3187db5..b2d3304 100644 --- a/camel/camel-stream-filter.h +++ b/camel/camel-stream-filter.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_STREAM_FILTER_H #define _CAMEL_STREAM_FILTER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_STREAM_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass) #define CAMEL_IS_STREAM_FILTER(obj) CAMEL_CHECK_TYPE (obj, camel_stream_filter_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelStreamFilterClass CamelStreamFilterClass; struct _CamelStreamFilter { @@ -56,8 +53,6 @@ CamelStreamFilter *camel_stream_filter_new_with_stream (CamelStream *stream int camel_stream_filter_add (CamelStreamFilter *stream, CamelMimeFilter *filter); void camel_stream_filter_remove (CamelStreamFilter *stream, int id); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_STREAM_FILTER_H */ diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c index d612231..cc48a2f 100644 --- a/camel/camel-stream-fs.c +++ b/camel/camel-stream-fs.c @@ -26,12 +26,13 @@ #include #endif -#include -#include -#include #include #include +#include +#include +#include +#include #include #include "camel-file-utils.h" diff --git a/camel/camel-stream-fs.h b/camel/camel-stream-fs.h index 27df366..898c81d 100644 --- a/camel/camel-stream-fs.h +++ b/camel/camel-stream-fs.h @@ -26,12 +26,6 @@ #ifndef CAMEL_STREAM_FS_H #define CAMEL_STREAM_FS_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* for open flags */ #include #include @@ -44,6 +38,8 @@ extern "C" { #define CAMEL_STREAM_FS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass)) #define CAMEL_IS_STREAM_FS(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE)) +G_BEGIN_DECLS + struct _CamelStreamFs { CamelSeekableStream parent_object; @@ -66,8 +62,6 @@ CamelStream * camel_stream_fs_new_with_name_and_bounds (const char *name, int fl CamelStream * camel_stream_fs_new_with_fd (int fd); CamelStream * camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STREAM_FS_H */ diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c index 3c60dfd..030edea 100644 --- a/camel/camel-stream-mem.c +++ b/camel/camel-stream-mem.c @@ -26,11 +26,11 @@ #include #endif +#include +#include #include -#include #include -#include -#include +#include #include "camel-stream-mem.h" diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h index b30e790..218b2f1 100644 --- a/camel/camel-stream-mem.h +++ b/camel/camel-stream-mem.h @@ -26,12 +26,6 @@ #ifndef CAMEL_STREAM_MEM_H #define CAMEL_STREAM_MEM_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -40,6 +34,8 @@ extern "C" { #define CAMEL_STREAM_MEM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass)) #define CAMEL_IS_STREAM_MEM(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelStreamMemClass CamelStreamMemClass; struct _CamelStreamMem { @@ -71,8 +67,6 @@ void camel_stream_mem_set_secure(CamelStreamMem *mem); void camel_stream_mem_set_byte_array(CamelStreamMem *mem, GByteArray *buffer); void camel_stream_mem_set_buffer(CamelStreamMem *mem, const char *buffer, size_t len); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STREAM_MEM_H */ diff --git a/camel/camel-stream-null.h b/camel/camel-stream-null.h index a03008f..536f193 100644 --- a/camel/camel-stream-null.h +++ b/camel/camel-stream-null.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_STREAM_NULL_H #define _CAMEL_STREAM_NULL_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_STREAM_NULL(obj) CAMEL_CHECK_CAST (obj, camel_stream_null_get_type (), CamelStreamNull) #define CAMEL_STREAM_NULL_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_null_get_type (), CamelStreamNullClass) #define CAMEL_IS_STREAM_NULL(obj) CAMEL_CHECK_TYPE (obj, camel_stream_null_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelStreamNullClass CamelStreamNullClass; struct _CamelStreamNull { @@ -50,8 +47,6 @@ CamelType camel_stream_null_get_type (void); CamelStream *camel_stream_null_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_STREAM_NULL_H */ diff --git a/camel/camel-stream-process.c b/camel/camel-stream-process.c index 6b249d1..55a8ecd 100644 --- a/camel/camel-stream-process.c +++ b/camel/camel-stream-process.c @@ -27,17 +27,17 @@ #include #endif +#include +#include +#include #include #include #include -#include -#include +#include #include +#include +#include #include -#include -#include -#include -#include #include "camel-file-utils.h" #include "camel-stream-process.h" diff --git a/camel/camel-stream-process.h b/camel/camel-stream-process.h index 198769d..a07513c 100644 --- a/camel/camel-stream-process.h +++ b/camel/camel-stream-process.h @@ -23,17 +23,14 @@ #ifndef _CAMEL_STREAM_NULL_H #define _CAMEL_STREAM_NULL_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_STREAM_PROCESS(obj) CAMEL_CHECK_CAST (obj, camel_stream_process_get_type (), CamelStreamProcess) #define CAMEL_STREAM_PROCESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_process_get_type (), CamelStreamProcessClass) #define CAMEL_IS_STREAM_PROCESS(obj) CAMEL_CHECK_TYPE (obj, camel_stream_process_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelStreamProcessClass CamelStreamProcessClass; typedef struct _CamelStreamProcess CamelStreamProcess; @@ -52,8 +49,6 @@ CamelType camel_stream_process_get_type (void); CamelStream *camel_stream_process_new (void); int camel_stream_process_connect(CamelStreamProcess *, const char *, const char **); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_STREAM_PROCESS_H */ diff --git a/camel/camel-stream-vfs.c b/camel/camel-stream-vfs.c index 94390bb..44599f8 100644 --- a/camel/camel-stream-vfs.c +++ b/camel/camel-stream-vfs.c @@ -25,12 +25,13 @@ #include #endif -#include -#include -#include #include #include +#include +#include +#include +#include #include #include "camel-file-utils.h" diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h index c863e98..747612c 100644 --- a/camel/camel-stream-vfs.h +++ b/camel/camel-stream-vfs.h @@ -26,12 +26,6 @@ #ifndef CAMEL_STREAM_VFS_H #define CAMEL_STREAM_VFS_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* for open flags */ #include #include @@ -45,6 +39,8 @@ extern "C" { #define CAMEL_STREAM_VFS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_VFS_TYPE, CamelStreamVFSClass)) #define CAMEL_IS_STREAM_VFS(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_VFS_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelStreamVFS CamelStreamVFS; struct _CamelStreamVFS { @@ -64,9 +60,6 @@ CamelType camel_stream_vfs_get_type (void); /* public methods */ CamelStream * camel_stream_vfs_new_with_uri (const char *uri, int flags, mode_t mode); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STREAM_VFS_H */ diff --git a/camel/camel-stream.h b/camel/camel-stream.h index 95d18dc..2f78762 100644 --- a/camel/camel-stream.h +++ b/camel/camel-stream.h @@ -26,12 +26,6 @@ #ifndef CAMEL_STREAM_H #define CAMEL_STREAM_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -41,6 +35,8 @@ extern "C" { #define CAMEL_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass)) #define CAMEL_IS_STREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_TYPE)) +G_BEGIN_DECLS + struct _CamelStream { CamelObject parent_object; @@ -83,8 +79,6 @@ ssize_t camel_stream_vprintf (CamelStream *stream, const char *fmt, va_list ap); */ ssize_t camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_STREAM_H */ diff --git a/camel/camel-string-utils.h b/camel/camel-string-utils.h index 51dbd79..fe2e16d 100644 --- a/camel/camel-string-utils.h +++ b/camel/camel-string-utils.h @@ -24,13 +24,10 @@ #ifndef __CAMEL_STRING_UTILS_H__ #define __CAMEL_STRING_UTILS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include +G_BEGIN_DECLS + int camel_strcase_equal (gconstpointer a, gconstpointer b); guint camel_strcase_hash (gconstpointer v); @@ -46,8 +43,6 @@ const char *camel_pstring_add (char *str, gboolean own); const char *camel_pstring_strdup(const char *s); void camel_pstring_free(const char *s); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_STRING_UTILS_H__ */ diff --git a/camel/camel-tcp-stream-openssl.c b/camel/camel-tcp-stream-openssl.c index b646bd2..41aa2c4 100644 --- a/camel/camel-tcp-stream-openssl.c +++ b/camel/camel-tcp-stream-openssl.c @@ -27,22 +27,24 @@ #ifdef HAVE_OPENSSL -#include "camel-tcp-stream-ssl.h" - -#include -#include -#include +#include +#include #include +#include +#include #include #include -#include -#include -#include -#include -#include "camel-session.h" -#include "camel-service.h" -#include "camel-operation.h" + +#include +#include +#include + #include "camel-certdb.h" +#include "camel-operation.h" +#include "camel-service.h" +#include "camel-session.h" + +#include "camel-tcp-stream-ssl.h" #define d(x) diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c index 8ba6875..78afaac 100644 --- a/camel/camel-tcp-stream-raw.c +++ b/camel/camel-tcp-stream-raw.c @@ -20,15 +20,17 @@ * */ +#ifdef HAVE_CONFIG_H #include +#endif +#include +#include #include #include +#include #include #include -#include -#include -#include #include "camel-file-utils.h" #include "camel-operation.h" diff --git a/camel/camel-tcp-stream-raw.h b/camel/camel-tcp-stream-raw.h index c3bcd3d..4235e12 100644 --- a/camel/camel-tcp-stream-raw.h +++ b/camel/camel-tcp-stream-raw.h @@ -24,12 +24,6 @@ #ifndef CAMEL_TCP_STREAM_RAW_H #define CAMEL_TCP_STREAM_RAW_H - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_TCP_STREAM_RAW_TYPE (camel_tcp_stream_raw_get_type ()) @@ -37,6 +31,8 @@ extern "C" { #define CAMEL_TCP_STREAM_RAW_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_RAW_TYPE, CamelTcpStreamRawClass)) #define CAMEL_IS_TCP_STREAM_RAW(o) (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_RAW_TYPE)) +G_BEGIN_DECLS + struct _CamelTcpStreamRaw { CamelTcpStream parent_object; @@ -60,8 +56,6 @@ CamelType camel_tcp_stream_raw_get_type (void); /* public methods */ CamelStream *camel_tcp_stream_raw_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_TCP_STREAM_RAW_H */ diff --git a/camel/camel-tcp-stream-ssl.c b/camel/camel-tcp-stream-ssl.c index c7ac6c9..64a927d 100644 --- a/camel/camel-tcp-stream-ssl.c +++ b/camel/camel-tcp-stream-ssl.c @@ -27,15 +27,18 @@ * will be used instead. */ +#ifdef HAVE_CONFIG_H #include +#endif #ifdef HAVE_NSS -#include -#include -#include -#include + #include +#include #include +#include +#include +#include #include #include @@ -49,13 +52,14 @@ #include #include +#include +#include #include #include #include "camel-certdb.h" #include "camel-file-utils.h" -#include "camel-i18n.h" #include "camel-operation.h" #include "camel-private.h" #include "camel-session.h" diff --git a/camel/camel-tcp-stream-ssl.h b/camel/camel-tcp-stream-ssl.h index 175c390..33f24b1 100644 --- a/camel/camel-tcp-stream-ssl.h +++ b/camel/camel-tcp-stream-ssl.h @@ -24,12 +24,6 @@ #ifndef CAMEL_TCP_STREAM_SSL_H #define CAMEL_TCP_STREAM_SSL_H - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #define CAMEL_TCP_STREAM_SSL_TYPE (camel_tcp_stream_ssl_get_type ()) @@ -37,12 +31,14 @@ extern "C" { #define CAMEL_TCP_STREAM_SSL_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_SSL_TYPE, CamelTcpStreamSSLClass)) #define CAMEL_IS_TCP_STREAM_SSL(o) (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_SSL_TYPE)) -struct _CamelSession; - #define CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 (1 << 0) #define CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 (1 << 1) #define CAMEL_TCP_STREAM_SSL_ENABLE_TLS (1 << 2) +G_BEGIN_DECLS + +struct _CamelSession; + struct _CamelTcpStreamSSL { CamelTcpStream parent_object; @@ -66,8 +62,6 @@ CamelStream *camel_tcp_stream_ssl_new_raw (struct _CamelSession *session, const int camel_tcp_stream_ssl_enable_ssl (CamelTcpStreamSSL *ssl); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_TCP_STREAM_SSL_H */ diff --git a/camel/camel-tcp-stream.h b/camel/camel-tcp-stream.h index a431415..aa46986 100644 --- a/camel/camel-tcp-stream.h +++ b/camel/camel-tcp-stream.h @@ -24,12 +24,6 @@ #ifndef CAMEL_TCP_STREAM_H #define CAMEL_TCP_STREAM_H - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #ifndef G_OS_WIN32 @@ -51,6 +45,8 @@ extern "C" { #define CAMEL_TCP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TCP_STREAM_TYPE, CamelTcpStreamClass)) #define CAMEL_IS_TCP_STREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_TCP_STREAM_TYPE)) +G_BEGIN_DECLS + typedef enum { CAMEL_SOCKOPT_NONBLOCKING, /* nonblocking io */ CAMEL_SOCKOPT_LINGER, /* linger on close if data present */ @@ -123,8 +119,6 @@ int camel_tcp_stream_setsockopt (CamelTcpStream *stream, const CamelSock struct sockaddr *camel_tcp_stream_get_local_address (CamelTcpStream *stream, socklen_t *len); struct sockaddr *camel_tcp_stream_get_remote_address (CamelTcpStream *stream, socklen_t *len); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_TCP_STREAM_H */ diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c index 9bda078..41702f8 100644 --- a/camel/camel-text-index.c +++ b/camel/camel-text-index.c @@ -23,21 +23,21 @@ #include #endif +#include +#include +#include #include #include #include -#include -#include #include -#include -#include -#include +#include +#include #include #include -#include "libedataserver/e-msgport.h" -#include "libedataserver/e-memory.h" +#include +#include #include "camel-block-file.h" #include "camel-object.h" diff --git a/camel/camel-text-index.h b/camel/camel-text-index.h index 33c6dac..3a8c8b3 100644 --- a/camel/camel-text-index.h +++ b/camel/camel-text-index.h @@ -30,6 +30,8 @@ #define CAMEL_TEXT_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_text_index_get_type (), CamelTextIndexClass) #define CAMEL_IS_TEXT_INDEX(obj) CAMEL_CHECK_TYPE (obj, camel_text_index_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelTextIndex CamelTextIndex; typedef struct _CamelTextIndexClass CamelTextIndexClass; @@ -110,5 +112,6 @@ void camel_text_index_dump(CamelTextIndex *idx); void camel_text_index_info(CamelTextIndex *idx); void camel_text_index_validate(CamelTextIndex *idx); -#endif /* ! _CAMEL_TEXT_INDEX_H */ +G_END_DECLS +#endif /* ! _CAMEL_TEXT_INDEX_H */ diff --git a/camel/camel-transport.h b/camel/camel-transport.h index 039b5e2..050d08e 100644 --- a/camel/camel-transport.h +++ b/camel/camel-transport.h @@ -27,12 +27,6 @@ #ifndef CAMEL_TRANSPORT_H #define CAMEL_TRANSPORT_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include @@ -41,6 +35,7 @@ extern "C" { #define CAMEL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass)) #define CAMEL_IS_TRANSPORT(o) (CAMEL_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE)) +G_BEGIN_DECLS enum { CAMEL_TRANSPORT_ARG_FIRST = CAMEL_SERVICE_ARG_FIRST + 100, @@ -75,8 +70,6 @@ gboolean camel_transport_send_to (CamelTransport *transport, /* Standard Camel function */ CamelType camel_transport_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_TRANSPORT_H */ diff --git a/camel/camel-types.h b/camel/camel-types.h index f49594b..90ade20 100644 --- a/camel/camel-types.h +++ b/camel/camel-types.h @@ -21,10 +21,9 @@ #ifndef CAMEL_TYPES_H #define CAMEL_TYPES_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +#include + +G_BEGIN_DECLS typedef struct _CamelAddress CamelAddress; typedef struct _CamelDigestFolder CamelDigestFolder; @@ -75,8 +74,6 @@ typedef struct _CamelTcpStreamOpenSSL CamelTcpStreamOpenSSL; typedef struct _CamelHttpStream CamelHttpStream; typedef struct _CamelTransport CamelTransport; -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_TYPES_H */ diff --git a/camel/camel-uid-cache.c b/camel/camel-uid-cache.c index bbc47b0..a72fd2d 100644 --- a/camel/camel-uid-cache.c +++ b/camel/camel-uid-cache.c @@ -29,12 +29,14 @@ #include #include #include -#include #include +#include +#include #include -#include "libedataserver/e-data-server-util.h" +#include + #include "camel-file-utils.h" #include "camel-private.h" #include "camel-uid-cache.h" @@ -189,7 +191,7 @@ camel_uid_cache_save (CamelUIDCache *cache) #ifdef ENABLE_SPASMOLYTIC if (fd != -1) { - /** + /* * If our new cache size is larger than the old cache, * even if we haven't finished writing it out * successfully, we should still attempt to replace @@ -202,7 +204,7 @@ camel_uid_cache_save (CamelUIDCache *cache) * uids to make up for the difference in size (or * more), then we should replace the old cache with * the new cache as well. - **/ + */ if (g_stat (cache->filename, &st) == 0 && (cache->size > st.st_size || cache->size + cache->expired > st.st_size)) { diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h index 4fe33a3..d7bc722 100644 --- a/camel/camel-uid-cache.h +++ b/camel/camel-uid-cache.h @@ -25,16 +25,13 @@ #ifndef CAMEL_UID_CACHE_H #define CAMEL_UID_CACHE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include +G_BEGIN_DECLS + typedef struct { char *filename; GHashTable *uids; @@ -53,8 +50,6 @@ GPtrArray *camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids); void camel_uid_cache_save_uid (CamelUIDCache *cache, const char *uid); void camel_uid_cache_free_uids (GPtrArray *uids); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_UID_CACHE_H */ diff --git a/camel/camel-url-scanner.c b/camel/camel-url-scanner.c index dbc1866..da23d35 100644 --- a/camel/camel-url-scanner.c +++ b/camel/camel-url-scanner.c @@ -25,16 +25,15 @@ #include #endif +#include #include #include -#include -#include "libedataserver/e-trie.h" +#include #include "camel-url-scanner.h" #include "camel-utf8.h" - struct _CamelUrlScanner { GPtrArray *patterns; ETrie *trie; diff --git a/camel/camel-url-scanner.h b/camel/camel-url-scanner.h index 16c33ad..c2905d8 100644 --- a/camel/camel-url-scanner.h +++ b/camel/camel-url-scanner.h @@ -24,14 +24,10 @@ #ifndef __CAMEL_URL_SCANNER_H__ #define __CAMEL_URL_SCANNER_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include +G_BEGIN_DECLS typedef struct { const char *pattern; @@ -66,8 +62,6 @@ void camel_url_scanner_add (CamelUrlScanner *scanner, urlpattern_t *pattern); gboolean camel_url_scanner_scan (CamelUrlScanner *scanner, const char *in, size_t inlen, urlmatch_t *match); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_URL_SCANNER_H__ */ diff --git a/camel/camel-url.c b/camel/camel-url.c index b82bc7b..85fcdd7 100644 --- a/camel/camel-url.c +++ b/camel/camel-url.c @@ -32,8 +32,10 @@ #include #include +#include +#include + #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-mime-utils.h" #include "camel-object.h" #include "camel-string-utils.h" @@ -542,7 +544,7 @@ camel_url_set_param (CamelURL *url, const char *name, const char *value) /** * camel_url_get_param: - * @a #CamelURL + * @url: a #CamelURL * @name: name of the param * * Get the value of the specified param on the URL. diff --git a/camel/camel-url.h b/camel/camel-url.h index 21a78dc..6861918 100644 --- a/camel/camel-url.h +++ b/camel/camel-url.h @@ -30,10 +30,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* if this changes, remember to change camel_url_copy */ typedef struct _CamelURL { @@ -83,9 +80,6 @@ guint camel_url_hash (const void *v); int camel_url_equal(const void *v, const void *v2); CamelURL *camel_url_copy(const CamelURL *in); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* URL_UTIL_H */ diff --git a/camel/camel-utf8.c b/camel/camel-utf8.c index 24e9dbf..f82d9ef 100644 --- a/camel/camel-utf8.c +++ b/camel/camel-utf8.c @@ -25,8 +25,8 @@ #include #endif -#include #include +#include #include diff --git a/camel/camel-utf8.h b/camel/camel-utf8.h index d85c66b..d80e511 100644 --- a/camel/camel-utf8.h +++ b/camel/camel-utf8.h @@ -23,6 +23,8 @@ #ifndef _CAMEL_UTF8_H #define _CAMEL_UTF8_H +G_BEGIN_DECLS + void camel_utf8_putc(unsigned char **ptr, guint32 c); guint32 camel_utf8_getc(const unsigned char **ptr); guint32 camel_utf8_getc_limit (const unsigned char **ptr, const unsigned char *end); @@ -38,4 +40,6 @@ char *camel_utf8_utf7(const char *ptr); char *camel_utf8_ucs2(const char *ptr); char *camel_ucs2_utf8(const char *ptr); +G_END_DECLS + #endif /* ! _CAMEL_UTF8_H */ diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c index cc126b4..039430a 100644 --- a/camel/camel-vee-folder.c +++ b/camel/camel-vee-folder.c @@ -26,16 +26,18 @@ #include -#include "libedataserver/md5-utils.h" +#include +#include + +#include #if defined (DOEPOOLV) || defined (DOESTRV) -#include "libedataserver/e-memory.h" +#include #endif #include "camel-debug.h" #include "camel-exception.h" #include "camel-folder-search.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-private.h" #include "camel-session.h" @@ -44,7 +46,6 @@ #include "camel-vee-store.h" /* for open flags */ #include "camel-vee-summary.h" - #define d(x) #define dd(x) (camel_debug("vfolder")?(x):0) diff --git a/camel/camel-vee-folder.h b/camel/camel-vee-folder.h index 1d9fc7c..072f534 100644 --- a/camel/camel-vee-folder.h +++ b/camel/camel-vee-folder.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_VEE_FOLDER_H #define _CAMEL_VEE_FOLDER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_VEE_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass) #define CAMEL_IS_VEE_FOLDER(obj) CAMEL_CHECK_TYPE (obj, camel_vee_folder_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelVeeFolder CamelVeeFolder; typedef struct _CamelVeeFolderClass CamelVeeFolderClass; @@ -89,8 +86,6 @@ void camel_vee_folder_set_expression (CamelVeeFolder *vf, const char *expr) void camel_vee_folder_hash_folder (CamelFolder *folder, char buffer[8]); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_VEE_FOLDER_H */ diff --git a/camel/camel-vee-store.c b/camel/camel-vee-store.c index 663c7b3..e3ba4fc 100644 --- a/camel/camel-vee-store.c +++ b/camel/camel-vee-store.c @@ -24,10 +24,11 @@ #include +#include +#include #include #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-private.h" #include "camel-vee-folder.h" #include "camel-vee-store.h" diff --git a/camel/camel-vee-store.h b/camel/camel-vee-store.h index 12d1f57..30fe7e0 100644 --- a/camel/camel-vee-store.h +++ b/camel/camel-vee-store.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_VEE_STORE_H #define _CAMEL_VEE_STORE_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_VEE_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass) #define CAMEL_IS_VEE_STORE(obj) CAMEL_CHECK_TYPE (obj, camel_vee_store_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelVeeStore CamelVeeStore; typedef struct _CamelVeeStoreClass CamelVeeStoreClass; @@ -56,8 +53,6 @@ struct _CamelVeeStoreClass { CamelType camel_vee_store_get_type (void); CamelVeeStore *camel_vee_store_new (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_VEE_STORE_H */ diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c index 44ef6d2..2a1acc0 100644 --- a/camel/camel-vee-summary.c +++ b/camel/camel-vee-summary.c @@ -23,11 +23,11 @@ #include #endif -#include -#include #include -#include #include +#include +#include +#include #include "camel-folder.h" #include "camel-vee-summary.h" diff --git a/camel/camel-vee-summary.h b/camel/camel-vee-summary.h index 9baad0e..cb5538a 100644 --- a/camel/camel-vee-summary.h +++ b/camel/camel-vee-summary.h @@ -26,13 +26,15 @@ #include #include -struct _CamelVeeFolder; -struct _CamelFolder; - #define CAMEL_VEE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_vee_summary_get_type (), CamelVeeSummary) #define CAMEL_VEE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_summary_get_type (), CamelVeeSummaryClass) #define CAMEL_IS_VEE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_vee_summary_get_type ()) +G_BEGIN_DECLS + +struct _CamelVeeFolder; +struct _CamelFolder; + typedef struct _CamelVeeSummary CamelVeeSummary; typedef struct _CamelVeeSummaryClass CamelVeeSummaryClass; @@ -58,5 +60,7 @@ CamelFolderSummary *camel_vee_summary_new(struct _CamelFolder *parent); CamelVeeMessageInfo * camel_vee_summary_add(CamelVeeSummary *s, CamelMessageInfo *info, const char hash[8]); +G_END_DECLS + #endif /* ! _CAMEL_VEE_SUMMARY_H */ diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c index 9e473b1..18063e3 100644 --- a/camel/camel-vtrash-folder.c +++ b/camel/camel-vtrash-folder.c @@ -21,12 +21,16 @@ * */ +#ifdef HAVE_CONFIG_H #include +#endif #include +#include +#include + #include "camel-exception.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-private.h" #include "camel-store.h" diff --git a/camel/camel-vtrash-folder.h b/camel/camel-vtrash-folder.h index c6806e9..75b98e7 100644 --- a/camel/camel-vtrash-folder.h +++ b/camel/camel-vtrash-folder.h @@ -24,11 +24,6 @@ #ifndef _CAMEL_VTRASH_FOLDER_H #define _CAMEL_VTRASH_FOLDER_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_VTRASH_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vtrash_folder_get_type (), CamelVTrashFolderClass) #define CAMEL_IS_VTRASH_FOLDER(obj) CAMEL_CHECK_TYPE (obj, camel_vtrash_folder_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelVTrashFolder CamelVTrashFolder; typedef struct _CamelVTrashFolderClass CamelVTrashFolderClass; @@ -64,8 +61,6 @@ CamelType camel_vtrash_folder_get_type (void); CamelFolder *camel_vtrash_folder_new (CamelStore *parent_store, camel_vtrash_folder_t type); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_VTRASH_FOLDER_H */ diff --git a/camel/camel-win32.c b/camel/camel-win32.c index df1221c..95b9c59 100644 --- a/camel/camel-win32.c +++ b/camel/camel-win32.c @@ -21,12 +21,12 @@ * USA */ -#include -#include #include +#include +#include #include -#include +#include #include #include diff --git a/camel/camel.c b/camel/camel.c index 06bd1e6..09625ec 100644 --- a/camel/camel.c +++ b/camel/camel.c @@ -35,10 +35,12 @@ #include #endif /* HAVE_NSS */ +#include +#include + #include "camel.h" #include "camel-certdb.h" #include "camel-debug.h" -#include "camel-i18n.h" #include "camel-provider.h" #include "camel-private.h" diff --git a/camel/camel.h b/camel/camel.h index 60cb49c..bd02ec3 100644 --- a/camel/camel.h +++ b/camel/camel.h @@ -26,14 +26,39 @@ #ifndef CAMEL_H #define CAMEL_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -47,34 +72,77 @@ extern "C" { #include #include #include +#include #include #include #include #include #include -#include #include +#include #include +#include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include #include -#include +#include +#include +#include +#include +#include +#include #include +G_BEGIN_DECLS + int camel_init (const char *certdb_dir, gboolean nss_init); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_H */ diff --git a/camel/providers/groupwise/Makefile.am b/camel/providers/groupwise/Makefile.am index 6b33839..64215a3 100644 --- a/camel/providers/groupwise/Makefile.am +++ b/camel/providers/groupwise/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = -I.. \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(SOUP_CFLAGS) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-groupwise-provider\" libcamelgroupwise_la_SOURCES = \ diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c index 912d3bd..9475073 100644 --- a/camel/providers/groupwise/camel-groupwise-folder.c +++ b/camel/providers/groupwise/camel-groupwise-folder.c @@ -29,33 +29,39 @@ #ifdef HAVE_CONFIG_H #include #endif + #include +#include #include +#include +#include +#include + +#include +#include + +#include + #include + +#include +#include + +#include "camel-folder-search.h" +#include "camel-folder.h" +#include "camel-private.h" +#include "camel-session.h" +#include "camel-stream-mem.h" +#include "camel-string-utils.h" + #include "camel-groupwise-folder.h" +#include "camel-groupwise-journal.h" +#include "camel-groupwise-private.h" #include "camel-groupwise-store.h" -#include "camel-folder.h" -#include "camel-folder-search.h" #include "camel-groupwise-store.h" #include "camel-groupwise-summary.h" #include "camel-groupwise-utils.h" -#include "camel-i18n.h" -#include "camel-private.h" -#include "camel-groupwise-private.h" -#include "camel-groupwise-journal.h" #include "camel-groupwise-utils.h" -#include "camel-stream-mem.h" -#include "camel-string-utils.h" -#include "camel-session.h" -#include -#include - -#include - -#include -#include -#include -#include #define ADD_JUNK_ENTRY 1 #define REMOVE_JUNK_ENTRY -1 diff --git a/camel/providers/groupwise/camel-groupwise-folder.h b/camel/providers/groupwise/camel-groupwise-folder.h index f14cec2..42163a3 100644 --- a/camel/providers/groupwise/camel-groupwise-folder.h +++ b/camel/providers/groupwise/camel-groupwise-folder.h @@ -28,12 +28,6 @@ #ifndef CAMEL_GROUPWISE_FOLDER_H #define CAMEL_GROUPWISE_FOLDER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include @@ -51,6 +45,8 @@ extern "C" { #define CAMEL_GROUPWISE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_GROUPWISE_FOLDER_TYPE, CamelGroupwiseFolderClass)) #define CAMEL_IS_GROUPWISE_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_GROUPWISE_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelGroupwiseFolder CamelGroupwiseFolder; typedef struct _CamelGroupwiseFolderClass CamelGroupwiseFolderClass; struct _CamelGroupwiseFolder { @@ -86,8 +82,6 @@ CamelFolder * camel_gw_folder_new(CamelStore *store, const char *folder_dir, con void gw_update_summary ( CamelFolder *folder, GList *item_list,CamelException *ex) ; void groupwise_refresh_folder(CamelFolder *folder, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_GROUPWISE_FOLDER_H */ diff --git a/camel/providers/groupwise/camel-groupwise-journal.c b/camel/providers/groupwise/camel-groupwise-journal.c index cfbc8b5..b25c2ef 100644 --- a/camel/providers/groupwise/camel-groupwise-journal.c +++ b/camel/providers/groupwise/camel-groupwise-journal.c @@ -25,25 +25,26 @@ #include #endif +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include +#include +#include + +#include +#include -#include -#include -#include -#include -#include +#include "camel-data-cache.h" +#include "camel-file-utils.h" +#include "camel-folder-summary.h" +#include "camel-folder.h" #include "camel-groupwise-folder.h" -#include "camel-groupwise-store.h" #include "camel-groupwise-journal.h" - +#include "camel-groupwise-store.h" #define d(x) x diff --git a/camel/providers/groupwise/camel-groupwise-journal.h b/camel/providers/groupwise/camel-groupwise-journal.h index 5bdd77c..b2d9029 100644 --- a/camel/providers/groupwise/camel-groupwise-journal.h +++ b/camel/providers/groupwise/camel-groupwise-journal.h @@ -31,11 +31,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_GROUPWISE_JOURNAL (camel_groupwise_journal_get_type ()) #define CAMEL_GROUPWISE_JOURNAL(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_GROUPWISE_JOURNAL, CamelGroupwiseJournal)) #define CAMEL_GROUPWISE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_GROUPWISE_JOURNAL, CamelGroupwiseJournalClass)) @@ -43,6 +38,8 @@ extern "C" { #define CAMEL_IS_GROUPWISE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_GROUPWISE_JOURNAL)) #define CAMEL_GROUPWISE_JOURNAL_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_GROUPWISE_JOURNAL, CamelGroupwiseJournalClass)) +G_BEGIN_DECLS + typedef struct _CamelGroupwiseJournal CamelGroupwiseJournal; typedef struct _CamelGroupwiseJournalClass CamelGroupwiseJournalClass; typedef struct _CamelGroupwiseJournalEntry CamelGroupwiseJournalEntry; @@ -85,8 +82,6 @@ void camel_groupwise_journal_append (CamelGroupwiseJournal *journal, CamelMimeMe void camel_groupwise_journal_transfer (CamelGroupwiseJournal *journal, CamelGroupwiseFolder *source_folder, CamelMimeMessage *message, const CamelMessageInfo *mi, const char *orginal_uid, char **transferred_uid, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_GROUPWISE_JOURNAL_H__ */ diff --git a/camel/providers/groupwise/camel-groupwise-private.h b/camel/providers/groupwise/camel-groupwise-private.h index 9898060..304b40a 100644 --- a/camel/providers/groupwise/camel-groupwise-private.h +++ b/camel/providers/groupwise/camel-groupwise-private.h @@ -22,11 +22,6 @@ #ifndef CAMEL_GROUPWISE_PRIVATE_H #define CAMEL_GROUPWISE_PRIVATE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ @@ -50,10 +45,4 @@ extern "C" { #define GROUPWISE_FOLDER_REC_UNLOCK(f, l) #endif - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - #endif /* CAMEL_IMAP_PRIVATE_H */ - diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c index a742f88..cc2a281 100644 --- a/camel/providers/groupwise/camel-groupwise-provider.c +++ b/camel/providers/groupwise/camel-groupwise-provider.c @@ -29,12 +29,16 @@ #endif #include + +#include +#include #include + #include "camel-provider.h" +#include "camel-sasl.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-sasl.h" -#include "camel-i18n.h" + #include "camel-groupwise-store.h" #include "camel-groupwise-transport.h" diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.c b/camel/providers/groupwise/camel-groupwise-store-summary.c index 123412a..d8867b9 100644 --- a/camel/providers/groupwise/camel-groupwise-store-summary.c +++ b/camel/providers/groupwise/camel-groupwise-store-summary.c @@ -26,22 +26,20 @@ #include #endif -#include #include -#include #include #include +#include +#include -#include "camel-groupwise-store-summary.h" +#include +#include #include "camel-file-utils.h" - -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" - #include "camel-private.h" #include "camel-utf8.h" +#include "camel-groupwise-store-summary.h" #define CAMEL_GW_STORE_SUMMARY_VERSION (0) diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h index 7994622..85497aa 100644 --- a/camel/providers/groupwise/camel-groupwise-store-summary.h +++ b/camel/providers/groupwise/camel-groupwise-store-summary.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_GW_STORE_SUMMARY_H #define _CAMEL_GW_STORE_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_GW_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_groupwise_store_summary_get_type (), CamelGroupwiseStoreSummaryClass) #define CAMEL_IS_GW_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_groupwise_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelGroupwiseStoreSummary CamelGroupwiseStoreSummary; typedef struct _CamelGroupwiseStoreSummaryClass CamelGroupwiseStoreSummaryClass; @@ -88,9 +85,6 @@ void camel_groupwise_store_summary_namespace_set(CamelGroupwiseStoreSummary *s, #define camel_groupwise_store_info_full_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_STORE_INFO_LAST)) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */ - diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c index 3427dd9..5a9c73a 100644 --- a/camel/providers/groupwise/camel-groupwise-store.c +++ b/camel/providers/groupwise/camel-groupwise-store.c @@ -26,29 +26,29 @@ #include +#include #include #include #include -#include -#include #include +#include #include #include +#include #include -#include "camel/camel-session.h" -#include "camel/camel-debug.h" -#include "camel/camel-i18n.h" -#include "camel/camel-types.h" -#include "camel/camel-folder.h" -#include "camel/camel-private.h" -#include "camel/camel-net-utils.h" +#include "camel-debug.h" +#include "camel-folder.h" +#include "camel-net-utils.h" +#include "camel-private.h" +#include "camel-session.h" +#include "camel-types.h" +#include "camel-groupwise-folder.h" +#include "camel-groupwise-store-summary.h" #include "camel-groupwise-store.h" #include "camel-groupwise-summary.h" -#include "camel-groupwise-store-summary.h" -#include "camel-groupwise-folder.h" #include "camel-groupwise-utils.h" #define d(x) diff --git a/camel/providers/groupwise/camel-groupwise-store.h b/camel/providers/groupwise/camel-groupwise-store.h index 9d6ff69..c5800ad 100644 --- a/camel/providers/groupwise/camel-groupwise-store.h +++ b/camel/providers/groupwise/camel-groupwise-store.h @@ -25,12 +25,6 @@ #ifndef CAMEL_GROUPWISE_STORE_H #define CAMEL_GROUPWISE_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include #include "camel-groupwise-store-summary.h" @@ -45,6 +39,8 @@ extern "C" { #define GW_PARAM_FILTER_INBOX (1 << 0) +G_BEGIN_DECLS + typedef struct _CamelGroupwiseStore CamelGroupwiseStore; typedef struct _CamelGroupwiseStoreClass CamelGroupwiseStoreClass; typedef struct _CamelGroupwiseStorePrivate CamelGroupwiseStorePrivate; @@ -84,8 +80,6 @@ CamelFolderInfo * create_junk_folder (CamelStore *store); gboolean camel_groupwise_store_connected (CamelGroupwiseStore *store, CamelException *ex); void gw_store_reload_folder (CamelGroupwiseStore *store, CamelFolder *folder, guint32 flags, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_GROUPWISE_STORE_H */ diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c index daa7057..ba59b28 100644 --- a/camel/providers/groupwise/camel-groupwise-summary.c +++ b/camel/providers/groupwise/camel-groupwise-summary.c @@ -27,17 +27,18 @@ #include #endif -#include -#include #include -#include #include +#include +#include +#include -#include "camel-groupwise-summary.h" -#include "camel-groupwise-folder.h" +#include "camel-data-cache.h" #include "camel-file-utils.h" -#include -#include +#include "camel-folder.h" + +#include "camel-groupwise-folder.h" +#include "camel-groupwise-summary.h" #define CAMEL_GW_SUMMARY_VERSION (1) diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h index 6387491..87e9e9a 100644 --- a/camel/providers/groupwise/camel-groupwise-summary.h +++ b/camel/providers/groupwise/camel-groupwise-summary.h @@ -30,6 +30,7 @@ #define CAMEL_GROUPWISE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_groupwise_summary_get_type (), CamelGroupwiseSummaryClass) #define CAMEL_IS_GROUPWISE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_groupwise_summary_get_type ()) +G_BEGIN_DECLS typedef struct _CamelGroupwiseSummary CamelGroupwiseSummary ; typedef struct _CamelGroupwiseSummaryClass CamelGroupwiseSummaryClass ; @@ -76,4 +77,7 @@ void camel_gw_summary_add_offline (CamelFolderSummary *summary, const char *uid, void camel_gw_summary_add_offline_uncached (CamelFolderSummary *summary, const char *uid, const CamelMessageInfo *info) ; void groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache); + +G_END_DECLS + #endif /*_CAMEL_GW_SUMMARY_H*/ diff --git a/camel/providers/groupwise/camel-groupwise-transport.c b/camel/providers/groupwise/camel-groupwise-transport.c index 97aed3a..861b1e9 100644 --- a/camel/providers/groupwise/camel-groupwise-transport.c +++ b/camel/providers/groupwise/camel-groupwise-transport.c @@ -26,23 +26,25 @@ #include #endif -#include "camel-groupwise-transport.h" -#include "camel-groupwise-store.h" -#include "camel-groupwise-utils.h" +#include + +#include +#include + +#include -#include "camel-i18n.h" -#include "camel-session.h" -#include "camel-stream.h" -#include "camel-stream-mem.h" -#include "camel-medium.h" #include "camel-data-wrapper.h" +#include "camel-medium.h" #include "camel-mime-message.h" -#include "camel-multipart.h" #include "camel-mime-utils.h" +#include "camel-multipart.h" +#include "camel-session.h" +#include "camel-stream-mem.h" +#include "camel-stream.h" -#include -#include - +#include "camel-groupwise-store.h" +#include "camel-groupwise-transport.h" +#include "camel-groupwise-utils.h" static gboolean groupwise_send_to (CamelTransport *transport, CamelMimeMessage *message, diff --git a/camel/providers/groupwise/camel-groupwise-transport.h b/camel/providers/groupwise/camel-groupwise-transport.h index 750284f..47fbfcf 100644 --- a/camel/providers/groupwise/camel-groupwise-transport.h +++ b/camel/providers/groupwise/camel-groupwise-transport.h @@ -25,12 +25,6 @@ #ifndef CAMEL_GROUPWISE_TRANSPORT_H #define CAMEL_GROUPWISE_TRANSPORT_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_GROUPWISE_TRANSPORT_TYPE (camel_groupwise_transport_get_type ()) @@ -38,6 +32,7 @@ extern "C" { #define CAMEL_GROUPWISE_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_GROUPWISE_TRANSPORT_TYPE, CamelGroupwiseTransportClass)) #define CAMEL_IS_GROUPWISE_TRANSPORT(o) (CAMEL_CHECK_TYPE((o), CAMEL_GROUPWISE_TRANSPORT_TYPE)) +G_BEGIN_DECLS typedef struct { CamelTransport parent_object; @@ -55,8 +50,6 @@ typedef struct { /* Standard Camel function */ CamelType camel_groupwise_transport_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_GROUPWISE_TRANSPORT_H */ diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c index a4ecc88..c89e967 100644 --- a/camel/providers/groupwise/camel-groupwise-utils.c +++ b/camel/providers/groupwise/camel-groupwise-utils.c @@ -18,12 +18,14 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H #include +#endif -#include #include -#include #include +#include +#include #include #include @@ -31,12 +33,12 @@ #include #include "camel/camel-address.h" +#include "camel/camel-mime-filter-charset.h" #include "camel/camel-mime-message.h" #include "camel/camel-multipart.h" #include "camel/camel-service.h" -#include "camel/camel-stream-mem.h" #include "camel/camel-stream-filter.h" -#include "camel/camel-mime-filter-charset.h" +#include "camel/camel-stream-mem.h" #include "camel-groupwise-utils.h" diff --git a/camel/providers/groupwise/camel-groupwise-utils.h b/camel/providers/groupwise/camel-groupwise-utils.h index 7bb74bc..17ba049 100644 --- a/camel/providers/groupwise/camel-groupwise-utils.h +++ b/camel/providers/groupwise/camel-groupwise-utils.h @@ -49,6 +49,8 @@ #define DRAFT "" #define PERSONAL "Cabinet" +G_BEGIN_DECLS + /*for syncing flags back to server*/ typedef struct { guint32 changed; @@ -77,4 +79,7 @@ EGwItem *camel_groupwise_util_item_from_message (EGwConnection *cnc, CamelMimeMe void do_flags_diff (flags_diff_t *diff, guint32 old, guint32 _new); char *gw_concat ( const char *prefix, const char *suffix); void strip_lt_gt (char **string, int s_offset, int e_offset); + +G_END_DECLS + #endif diff --git a/camel/providers/hula/Makefile.am b/camel/providers/hula/Makefile.am index a8270b3..7d58a82 100644 --- a/camel/providers/hula/Makefile.am +++ b/camel/providers/hula/Makefile.am @@ -10,7 +10,6 @@ INCLUDES = -I.. \ -I$(top_srcdir)/libedataserver \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-hula-provider\" libcamelhula_la_SOURCES = \ diff --git a/camel/providers/hula/camel-hula-provider.c b/camel/providers/hula/camel-hula-provider.c index 5ae1b44..4f9514f 100644 --- a/camel/providers/hula/camel-hula-provider.c +++ b/camel/providers/hula/camel-hula-provider.c @@ -27,12 +27,15 @@ #endif #include + +#include +#include #include + #include "camel-provider.h" +#include "camel-sasl.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-sasl.h" -#include "camel-i18n.h" static void add_hash (guint *hash, char *s); static guint hula_url_hash (gconstpointer key); diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am index f1b5a34..7ff332f 100644 --- a/camel/providers/imap/Makefile.am +++ b/camel/providers/imap/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = -I.. \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(GTK_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-imap-provider\" libcamelimap_la_SOURCES = \ diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c index 99086b4..8f0d285 100644 --- a/camel/providers/imap/camel-imap-command.c +++ b/camel/providers/imap/camel-imap-command.c @@ -28,22 +28,24 @@ #include #endif +#include #include #include #include -#include + +#include + +#include "camel-debug.h" +#include "camel-exception.h" +#include "camel-private.h" +#include "camel-session.h" +#include "camel-utf8.h" #include "camel-imap-command.h" -#include "camel-imap-utils.h" #include "camel-imap-folder.h" -#include "camel-imap-store.h" #include "camel-imap-store-summary.h" -#include -#include -#include -#include -#include -#include +#include "camel-imap-store.h" +#include "camel-imap-utils.h" extern int camel_verbose_debug; diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h index fde9079..ae74837 100644 --- a/camel/providers/imap/camel-imap-command.h +++ b/camel/providers/imap/camel-imap-command.h @@ -27,14 +27,11 @@ #ifndef CAMEL_IMAP_COMMAND_H #define CAMEL_IMAP_COMMAND_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include "camel-imap-types.h" +G_BEGIN_DECLS + typedef enum { CAMEL_IMAP_RESPONSE_ERROR, CAMEL_IMAP_RESPONSE_CONTINUATION, @@ -77,4 +74,6 @@ CamelImapResponseType camel_imap_command_response (CamelImapStore *store, char **respbuf, CamelException *ex); +G_END_DECLS + #endif /* CAMEL_IMAP_COMMAND_H */ diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c index 02be02a..8a0156a 100644 --- a/camel/providers/imap/camel-imap-folder.c +++ b/camel/providers/imap/camel-imap-folder.c @@ -25,50 +25,51 @@ #include -#include -#include -#include -#include +#include #include -#include #include -#include +#include +#include +#include +#include +#include -/*#include "libedataserver/e-path.h"*/ -#include "libedataserver/e-time-utils.h" -#include "libedataserver/e-data-server-util.h" +#include + +#include +#include -#include "camel-imap-folder.h" -#include "camel-imap-command.h" -#include "camel-imap-message-cache.h" -#include "camel-imap-private.h" -#include "camel-imap-search.h" -#include "camel-imap-store.h" -#include "camel-imap-summary.h" -#include "camel-imap-utils.h" -#include "camel-imap-wrapper.h" #include "camel-data-wrapper.h" +#include "camel-debug.h" #include "camel-disco-diary.h" #include "camel-exception.h" +#include "camel-file-utils.h" #include "camel-mime-filter-crlf.h" #include "camel-mime-filter-from.h" #include "camel-mime-message.h" #include "camel-mime-utils.h" -#include "camel-multipart.h" -#include "camel-multipart-signed.h" #include "camel-multipart-encrypted.h" +#include "camel-multipart-signed.h" +#include "camel-multipart.h" #include "camel-operation.h" +#include "camel-private.h" #include "camel-session.h" +#include "camel-store-summary.h" #include "camel-stream-buffer.h" #include "camel-stream-filter.h" #include "camel-stream-mem.h" #include "camel-stream.h" -#include "camel-private.h" #include "camel-string-utils.h" -#include "camel-file-utils.h" -#include "camel-debug.h" -#include "camel-i18n.h" -#include "camel/camel-store-summary.h" + +#include "camel-imap-command.h" +#include "camel-imap-folder.h" +#include "camel-imap-message-cache.h" +#include "camel-imap-private.h" +#include "camel-imap-search.h" +#include "camel-imap-store.h" +#include "camel-imap-summary.h" +#include "camel-imap-utils.h" +#include "camel-imap-wrapper.h" #define d(x) diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h index 5fab20e..1bc9ee4 100644 --- a/camel/providers/imap/camel-imap-folder.h +++ b/camel/providers/imap/camel-imap-folder.h @@ -27,12 +27,6 @@ #ifndef CAMEL_IMAP_FOLDER_H #define CAMEL_IMAP_FOLDER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include "camel-imap-types.h" #include #include @@ -42,6 +36,8 @@ extern "C" { #define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass)) #define CAMEL_IS_IMAP_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_FOLDER_TYPE)) +G_BEGIN_DECLS + struct _CamelImapFolder { CamelDiscoFolder parent_object; @@ -85,8 +81,6 @@ CamelStream *camel_imap_folder_fetch_data (CamelImapFolder *imap_folder, /* Standard Camel function */ CamelType camel_imap_folder_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAP_FOLDER_H */ diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c index 4377f42..0f99e74 100644 --- a/camel/providers/imap/camel-imap-message-cache.c +++ b/camel/providers/imap/camel-imap-message-cache.c @@ -24,18 +24,19 @@ #include -#include +#include #include #include -#include +#include + +#include +#include -#include "camel-imap-message-cache.h" #include "camel-data-wrapper.h" #include "camel-exception.h" #include "camel-stream-fs.h" -#include "camel-i18n.h" -#include +#include "camel-imap-message-cache.h" #ifndef O_BINARY #define O_BINARY 0 diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h index 9286a59..6e9b5cc 100644 --- a/camel/providers/imap/camel-imap-message-cache.h +++ b/camel/providers/imap/camel-imap-message-cache.h @@ -26,12 +26,6 @@ #ifndef CAMEL_IMAP_MESSAGE_CACHE_H #define CAMEL_IMAP_MESSAGE_CACHE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-imap-types.h" #include "camel-folder.h" #include @@ -41,6 +35,8 @@ extern "C" { #define CAMEL_IMAP_MESSAGE_CACHE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_MESSAGE_CACHE_TYPE, CamelImapFolderClass)) #define CAMEL_IS_IMAP_MESSAGE_CACHE(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_MESSAGE_CACHE_TYPE)) +G_BEGIN_DECLS + struct _CamelImapMessageCache { CamelObject parent_object; @@ -104,8 +100,6 @@ void camel_imap_message_cache_copy (CamelImapMessageCache *source, /* Standard Camel function */ CamelType camel_imap_message_cache_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAP_MESSAGE_CACHE_H */ diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h index bfd3474..52b88fe 100644 --- a/camel/providers/imap/camel-imap-private.h +++ b/camel/providers/imap/camel-imap-private.h @@ -1,11 +1,6 @@ #ifndef CAMEL_IMAP_PRIVATE_H #define CAMEL_IMAP_PRIVATE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ @@ -13,6 +8,8 @@ extern "C" { #include #endif +G_BEGIN_DECLS + struct _CamelImapFolderPrivate { #ifdef ENABLE_THREADS GStaticMutex search_lock; /* for locking the search object */ @@ -50,9 +47,6 @@ struct _CamelImapWrapperPrivate { #define CAMEL_IMAP_WRAPPER_UNLOCK(f, l) #endif -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAP_PRIVATE_H */ - diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c index 6c07786..48075d6 100644 --- a/camel/providers/imap/camel-imap-provider.c +++ b/camel/providers/imap/camel-imap-provider.c @@ -25,12 +25,14 @@ #include #include + +#include + #include "camel-imap-store.h" #include "camel-provider.h" +#include "camel-sasl.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-sasl.h" -#include "camel-i18n.h" static void add_hash (guint *hash, char *s); static guint imap_url_hash (gconstpointer key); diff --git a/camel/providers/imap/camel-imap-search.c b/camel/providers/imap/camel-imap-search.c index 04e1875..d32253a 100644 --- a/camel/providers/imap/camel-imap-search.c +++ b/camel/providers/imap/camel-imap-search.c @@ -30,18 +30,18 @@ #include +#include /* md5 hash building */ + +#include "camel-mime-utils.h" /* base64 encoding */ +#include "camel-search-private.h" +#include "camel-seekable-stream.h" + #include "camel-imap-command.h" #include "camel-imap-folder.h" -#include "camel-imap-store.h" #include "camel-imap-search.h" -#include "camel-imap-utils.h" +#include "camel-imap-store.h" #include "camel-imap-summary.h" - -#include "libedataserver/md5-utils.h" /* md5 hash building */ -#include "camel-mime-utils.h" /* base64 encoding */ - -#include "camel-seekable-stream.h" -#include "camel-search-private.h" +#include "camel-imap-utils.h" #define d(x) diff --git a/camel/providers/imap/camel-imap-search.h b/camel/providers/imap/camel-imap-search.h index f10a1d1..cb000f3 100644 --- a/camel/providers/imap/camel-imap-search.h +++ b/camel/providers/imap/camel-imap-search.h @@ -35,6 +35,8 @@ #define CAMEL_IMAP_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_search_get_type (), CamelImapSearchClass) #define CAMEL_IS_IMAP_SEARCH(obj) CAMEL_CHECK_TYPE (obj, camel_imap_search_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelImapSearchClass CamelImapSearchClass; struct _CamelImapSearch { @@ -59,4 +61,6 @@ struct _CamelImapSearchClass { CamelType camel_imap_search_get_type (void); CamelFolderSearch *camel_imap_search_new (const char *cachedir); +G_END_DECLS + #endif /* ! _CAMEL_IMAP_SEARCH_H */ diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c index 38df16f..1b4ed69 100644 --- a/camel/providers/imap/camel-imap-store-summary.c +++ b/camel/providers/imap/camel-imap-store-summary.c @@ -23,22 +23,21 @@ #include #endif -#include #include -#include #include #include +#include +#include -#include "camel-imap-store-summary.h" +#include +#include #include "camel-file-utils.h" - -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" - #include "camel-private.h" -#include "camel-utf8.h" #include "camel-store.h" +#include "camel-utf8.h" + +#include "camel-imap-store-summary.h" #define d(x) #define io(x) /* io debug */ diff --git a/camel/providers/imap/camel-imap-store-summary.h b/camel/providers/imap/camel-imap-store-summary.h index b0990a8..1fd8271 100644 --- a/camel/providers/imap/camel-imap-store-summary.h +++ b/camel/providers/imap/camel-imap-store-summary.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_IMAP_STORE_SUMMARY_H #define _CAMEL_IMAP_STORE_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_IMAP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_store_summary_get_type (), CamelImapStoreSummaryClass) #define CAMEL_IS_IMAP_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_imap_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelImapStoreSummary CamelImapStoreSummary; typedef struct _CamelImapStoreSummaryClass CamelImapStoreSummaryClass; @@ -95,8 +92,6 @@ char *camel_imap_store_summary_full_from_path(CamelImapStoreSummary *s, const ch /* helper macro's */ #define camel_imap_store_info_full_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_IMAP_STORE_INFO_FULL_NAME)) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_IMAP_STORE_SUMMARY_H */ diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c index 7b40d71..3d6b199 100644 --- a/camel/providers/imap/camel-imap-store.c +++ b/camel/providers/imap/camel-imap-store.c @@ -26,13 +26,14 @@ #include +#include #include #include #include #include -#include #include +#include #include #include "camel/camel-debug.h" @@ -40,7 +41,6 @@ #include "camel/camel-exception.h" #include "camel/camel-file-utils.h" #include "camel/camel-folder.h" -#include "camel/camel-i18n.h" #include "camel/camel-net-utils.h" #include "camel/camel-private.h" #include "camel/camel-sasl.h" diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h index 9b93c86..78bd0d9 100644 --- a/camel/providers/imap/camel-imap-store.h +++ b/camel/providers/imap/camel-imap-store.h @@ -25,12 +25,6 @@ #ifndef CAMEL_IMAP_STORE_H #define CAMEL_IMAP_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include "camel-imap-types.h" #include #include @@ -38,6 +32,8 @@ extern "C" { #ifdef ENABLE_THREADS #include +G_BEGIN_DECLS + typedef struct _CamelImapMsg CamelImapMsg; struct _CamelImapMsg { @@ -52,6 +48,8 @@ CamelImapMsg *camel_imap_msg_new(void (*receive)(CamelImapStore *store, struct _ size_t size); void camel_imap_msg_queue(CamelImapStore *store, CamelImapMsg *msg); +G_END_DECLS + #endif #define CAMEL_IMAP_STORE_TYPE (camel_imap_store_get_type ()) @@ -59,6 +57,8 @@ void camel_imap_msg_queue(CamelImapStore *store, CamelImapMsg *msg); #define CAMEL_IMAP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass)) #define CAMEL_IS_IMAP_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STORE_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_IMAP_STORE_ARG_FIRST = CAMEL_DISCO_STORE_ARG_FIRST + 100, CAMEL_IMAP_STORE_ARG_NAMESPACE, @@ -159,8 +159,6 @@ gboolean camel_imap_store_connected (CamelImapStore *store, CamelException *ex); ssize_t camel_imap_store_readline (CamelImapStore *store, char **dest, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAP_STORE_H */ diff --git a/camel/providers/imap/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c index 98b01e5..37c6af8 100644 --- a/camel/providers/imap/camel-imap-summary.c +++ b/camel/providers/imap/camel-imap-summary.c @@ -25,15 +25,16 @@ #include #endif -#include -#include #include -#include #include +#include +#include +#include + +#include "camel-file-utils.h" #include "camel-imap-summary.h" #include "camel-imap-utils.h" -#include "camel-file-utils.h" #define CAMEL_IMAP_SUMMARY_VERSION (3) diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h index d6e9420..fa585d9 100644 --- a/camel/providers/imap/camel-imap-summary.h +++ b/camel/providers/imap/camel-imap-summary.h @@ -37,6 +37,8 @@ CAMEL_MESSAGE_FLAGGED | \ CAMEL_MESSAGE_SEEN) +G_BEGIN_DECLS + enum { CAMEL_IMAP_MESSAGE_RECENT = 1<<17, @@ -89,5 +91,6 @@ void camel_imap_summary_add_offline_uncached (CamelFolderSummary *summary, const char *uid, const CamelMessageInfo *info); -#endif /* ! _CAMEL_IMAP_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_IMAP_SUMMARY_H */ diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h index 1f8855e..eaa20df 100644 --- a/camel/providers/imap/camel-imap-types.h +++ b/camel/providers/imap/camel-imap-types.h @@ -22,13 +22,10 @@ #ifndef CAMEL_IMAP_TYPES_H #define CAMEL_IMAP_TYPES_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-types.h" +G_BEGIN_DECLS + typedef struct _CamelImapFolder CamelImapFolder; typedef struct _CamelImapMessageCache CamelImapMessageCache; typedef struct _CamelImapResponse CamelImapResponse; @@ -36,4 +33,6 @@ typedef struct _CamelImapSearch CamelImapSearch; typedef struct _CamelImapStore CamelImapStore; typedef struct _CamelImapSummary CamelImapSummary; +G_END_DECLS + #endif /* CAMEL_IMAP_TYPES_H */ diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c index f520f2c..467e6a6 100644 --- a/camel/providers/imap/camel-imap-utils.c +++ b/camel/providers/imap/camel-imap-utils.c @@ -26,22 +26,24 @@ #endif #include +#include #include #include #include -#include -#include -#include #include +#include +#include + +#include +#include -#include "camel-imap-utils.h" -#include "camel-imap-summary.h" -#include "camel-imap-store.h" #include "camel-folder.h" #include "camel-string-utils.h" #include "camel-utf8.h" -#include +#include "camel-imap-store.h" +#include "camel-imap-summary.h" +#include "camel-imap-utils.h" #define d(x) diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h index b53df22..ad7b8e7 100644 --- a/camel/providers/imap/camel-imap-utils.h +++ b/camel/providers/imap/camel-imap-utils.h @@ -23,16 +23,13 @@ #ifndef CAMEL_IMAP_UTILS_H #define CAMEL_IMAP_UTILS_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include "camel-folder-summary.h" #include "camel-imap-types.h" +G_BEGIN_DECLS + const char *imap_next_word (const char *buf); struct _namespace { @@ -94,8 +91,6 @@ typedef gboolean (*IMAPPathFindFoldersCallback) (const char *physical_path, cons char *imap_path_to_physical (const char *prefix, const char *vpath); gboolean imap_path_find_folders (const char *prefix, IMAPPathFindFoldersCallback callback, gpointer data); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAP_UTILS_H */ diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c index a895408..17f83e1 100644 --- a/camel/providers/imap/camel-imap-wrapper.c +++ b/camel/providers/imap/camel-imap-wrapper.c @@ -28,17 +28,17 @@ #include #include -#include "camel-imap-folder.h" -#include "camel-imap-wrapper.h" +#include + #include "camel-exception.h" -#include "camel-stream-filter.h" #include "camel-mime-filter-basic.h" -#include "camel-mime-filter-crlf.h" #include "camel-mime-filter-charset.h" +#include "camel-mime-filter-crlf.h" #include "camel-mime-part.h" +#include "camel-stream-filter.h" -#include "libedataserver/e-msgport.h" - +#include "camel-imap-folder.h" +#include "camel-imap-wrapper.h" struct _CamelImapWrapperPrivate { GMutex *lock; diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h index 8101d17..cbd9948 100644 --- a/camel/providers/imap/camel-imap-wrapper.h +++ b/camel/providers/imap/camel-imap-wrapper.h @@ -23,12 +23,6 @@ #ifndef CAMEL_IMAP_WRAPPER_H #define CAMEL_IMAP_WRAPPER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include "camel-imap-types.h" @@ -37,6 +31,8 @@ extern "C" { #define CAMEL_IMAP_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_WRAPPER_TYPE, CamelImapWrapperClass)) #define CAMEL_IS_IMAP_WRAPPER(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_WRAPPER_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelDataWrapper parent_object; @@ -63,8 +59,6 @@ CamelDataWrapper *camel_imap_wrapper_new (CamelImapFolder *imap_folder, const char *part_spec, CamelMimePart *part); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_DATA_WRAPPER_H */ diff --git a/camel/providers/imap4/Makefile.am b/camel/providers/imap4/Makefile.am index 1161f3e..9bfdd14 100644 --- a/camel/providers/imap4/Makefile.am +++ b/camel/providers/imap4/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(GTK_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-imap4-provider\" libcamelimap4_la_SOURCES = \ diff --git a/camel/providers/imap4/camel-imap4-command.c b/camel/providers/imap4/camel-imap4-command.c index 7392ad5..79dab79 100644 --- a/camel/providers/imap4/camel-imap4-command.c +++ b/camel/providers/imap4/camel-imap4-command.c @@ -22,23 +22,22 @@ #include #endif +#include #include #include -#include -#include -#include -#include -#include -#include +#include -#include "camel-imap4-stream.h" +#include "camel-debug.h" +#include "camel-mime-filter-crlf.h" +#include "camel-stream-filter.h" +#include "camel-stream-null.h" + +#include "camel-imap4-command.h" #include "camel-imap4-engine.h" #include "camel-imap4-folder.h" #include "camel-imap4-specials.h" - -#include "camel-imap4-command.h" - +#include "camel-imap4-stream.h" #define d(x) (camel_debug ("imap4:command") ? (x) : 0) diff --git a/camel/providers/imap4/camel-imap4-command.h b/camel/providers/imap4/camel-imap4-command.h index dfb0128..40874b6 100644 --- a/camel/providers/imap4/camel-imap4-command.h +++ b/camel/providers/imap4/camel-imap4-command.h @@ -31,10 +31,7 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS struct _CamelIMAP4Engine; struct _CamelIMAP4Folder; @@ -137,8 +134,6 @@ int camel_imap4_command_step (CamelIMAP4Command *ic); void camel_imap4_command_reset (CamelIMAP4Command *ic); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_COMMAND_H__ */ diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c index 85f9b7e..b9762eb 100644 --- a/camel/providers/imap4/camel-imap4-engine.c +++ b/camel/providers/imap4/camel-imap4-engine.c @@ -25,22 +25,22 @@ #include #endif -#include #include #include +#include -#include -#include -#include +#include + +#include "camel-sasl.h" +#include "camel-stream-buffer.h" -#include "camel-imap4-summary.h" #include "camel-imap4-command.h" -#include "camel-imap4-stream.h" +#include "camel-imap4-engine.h" #include "camel-imap4-folder.h" +#include "camel-imap4-stream.h" +#include "camel-imap4-summary.h" #include "camel-imap4-utils.h" -#include "camel-imap4-engine.h" - #define d(x) x @@ -758,8 +758,7 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex) } -/** - * +/* * resp-text-code = "ALERT" / * "BADCHARSET" [SP "(" astring *(SP astring) ")" ] / * capability-data / "PARSE" / @@ -768,7 +767,7 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex) * "UIDNEXT" SP nz-number / "UIDVALIDITY" SP nz-number / * "UNSEEN" SP nz-number / * atom [SP 1*] - **/ + */ static struct { const char *name; diff --git a/camel/providers/imap4/camel-imap4-engine.h b/camel/providers/imap4/camel-imap4-engine.h index 4d39689..edd0488 100644 --- a/camel/providers/imap4/camel-imap4-engine.h +++ b/camel/providers/imap4/camel-imap4-engine.h @@ -34,11 +34,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_ENGINE (camel_imap4_engine_get_type ()) #define CAMEL_IMAP4_ENGINE(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_ENGINE, CamelIMAP4Engine)) #define CAMEL_IMAP4_ENGINE_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_IMAP4_ENGINE, CamelIMAP4EngineClass)) @@ -46,6 +41,8 @@ extern "C" { #define CAMEL_IS_IMAP4_ENGINE_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_IMAP4_ENGINE)) #define CAMEL_IMAP4_ENGINE_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_IMAP4_ENGINE, CamelIMAP4EngineClass)) +G_BEGIN_DECLS + typedef struct _CamelIMAP4Engine CamelIMAP4Engine; typedef struct _CamelIMAP4EngineClass CamelIMAP4EngineClass; @@ -235,8 +232,6 @@ int camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex); int camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex); void camel_imap4_resp_code_free (CamelIMAP4RespCode *rcode); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_ENGINE_H__ */ diff --git a/camel/providers/imap4/camel-imap4-folder.c b/camel/providers/imap4/camel-imap4-folder.c index 49e52ee..7821605 100644 --- a/camel/providers/imap4/camel-imap4-folder.c +++ b/camel/providers/imap4/camel-imap4-folder.c @@ -22,28 +22,29 @@ #include #endif -#include - +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include + +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include "camel-file-utils.h" +#include "camel-mime-filter-crlf.h" +#include "camel-mime-message.h" +#include "camel-private.h" +#include "camel-stream-filter.h" +#include "camel-stream-mem.h" +#include "camel-utf8.h" #include "camel-imap4-utils.h" #include "camel-imap4-store.h" diff --git a/camel/providers/imap4/camel-imap4-folder.h b/camel/providers/imap4/camel-imap4-folder.h index 9753d98..6a1e2a1 100644 --- a/camel/providers/imap4/camel-imap4-folder.h +++ b/camel/providers/imap4/camel-imap4-folder.h @@ -27,11 +27,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_FOLDER (camel_imap4_folder_get_type ()) #define CAMEL_IMAP4_FOLDER(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_FOLDER, CamelIMAP4Folder)) #define CAMEL_IMAP4_FOLDER_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_IMAP4_FOLDER, CamelIMAP4FolderClass)) @@ -39,6 +34,8 @@ extern "C" { #define CAMEL_IS_IMAP4_FOLDER_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_IMAP4_FOLDER)) #define CAMEL_IMAP4_FOLDER_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_IMAP4_FOLDER, CamelIMAP4FolderClass)) +G_BEGIN_DECLS + typedef struct _CamelIMAP4Folder CamelIMAP4Folder; typedef struct _CamelIMAP4FolderClass CamelIMAP4FolderClass; @@ -80,8 +77,6 @@ CamelFolder *camel_imap4_folder_new (CamelStore *store, const char *full_name, C const char *camel_imap4_folder_utf7_name (CamelIMAP4Folder *folder); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_FOLDER_H__ */ diff --git a/camel/providers/imap4/camel-imap4-journal.c b/camel/providers/imap4/camel-imap4-journal.c index 2bdc24a..68c1cc9 100644 --- a/camel/providers/imap4/camel-imap4-journal.c +++ b/camel/providers/imap4/camel-imap4-journal.c @@ -25,25 +25,25 @@ #include #endif +#include +#include +#include #include #include -#include -#include #include -#include -#include -#include +#include +#include + +#include -#include -#include -#include -#include -#include +#include "camel-data-cache.h" +#include "camel-file-utils.h" +#include "camel-folder-summary.h" +#include "camel-folder.h" #include "camel-imap4-folder.h" #include "camel-imap4-journal.h" - #define d(x) x diff --git a/camel/providers/imap4/camel-imap4-journal.h b/camel/providers/imap4/camel-imap4-journal.h index 4eeb71c..8c33144 100644 --- a/camel/providers/imap4/camel-imap4-journal.h +++ b/camel/providers/imap4/camel-imap4-journal.h @@ -31,11 +31,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_JOURNAL (camel_imap4_journal_get_type ()) #define CAMEL_IMAP4_JOURNAL(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_JOURNAL, CamelIMAP4Journal)) #define CAMEL_IMAP4_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_IMAP4_JOURNAL, CamelIMAP4JournalClass)) @@ -43,6 +38,8 @@ extern "C" { #define CAMEL_IS_IMAP4_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_IMAP4_JOURNAL)) #define CAMEL_IMAP4_JOURNAL_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_IMAP4_JOURNAL, CamelIMAP4JournalClass)) +G_BEGIN_DECLS + typedef struct _CamelIMAP4Journal CamelIMAP4Journal; typedef struct _CamelIMAP4JournalClass CamelIMAP4JournalClass; typedef struct _CamelIMAP4JournalEntry CamelIMAP4JournalEntry; @@ -85,8 +82,6 @@ void camel_imap4_journal_readd_failed (CamelIMAP4Journal *journal); void camel_imap4_journal_append (CamelIMAP4Journal *journal, CamelMimeMessage *message, const CamelMessageInfo *mi, char **appended_uid, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_JOURNAL_H__ */ diff --git a/camel/providers/imap4/camel-imap4-provider.c b/camel/providers/imap4/camel-imap4-provider.c index f69887f..889b43b 100644 --- a/camel/providers/imap4/camel-imap4-provider.c +++ b/camel/providers/imap4/camel-imap4-provider.c @@ -24,12 +24,12 @@ #include -#include -#include -#include +#include -#include "camel-imap4-store.h" +#include "camel-provider.h" +#include "camel-sasl.h" +#include "camel-imap4-store.h" static CamelProviderConfEntry imap4_conf_entries[] = { { CAMEL_PROVIDER_CONF_SECTION_START, "mailcheck", NULL, diff --git a/camel/providers/imap4/camel-imap4-search.c b/camel/providers/imap4/camel-imap4-search.c index c7b8f3c..23d2392 100644 --- a/camel/providers/imap4/camel-imap4-search.c +++ b/camel/providers/imap4/camel-imap4-search.c @@ -26,19 +26,17 @@ #include #endif -#include #include +#include -#include +#include "camel-offline-store.h" #include "camel-imap4-command.h" #include "camel-imap4-engine.h" +#include "camel-imap4-search.h" #include "camel-imap4-stream.h" #include "camel-imap4-utils.h" -#include "camel-imap4-search.h" - - static void camel_imap4_search_class_init (CamelIMAP4SearchClass *klass); static void camel_imap4_search_init (CamelIMAP4Search *search, CamelIMAP4SearchClass *klass); static void camel_imap4_search_finalize (CamelObject *object); diff --git a/camel/providers/imap4/camel-imap4-search.h b/camel/providers/imap4/camel-imap4-search.h index 27973da..a2bbda9 100644 --- a/camel/providers/imap4/camel-imap4-search.h +++ b/camel/providers/imap4/camel-imap4-search.h @@ -30,16 +30,13 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_IMAP4_SEARCH_TYPE (camel_imap4_search_get_type ()) #define CAMEL_IMAP4_SEARCH(obj) CAMEL_CHECK_CAST (obj, camel_imap4_search_get_type (), CamelIMAP4Search) #define CAMEL_IMAP4_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap4_search_get_type (), CamelIMAP4SearchClass) #define CAMEL_IS_IMAP4_SEARCH(obj) CAMEL_CHECK_TYPE (obj, camel_imap4_search_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIMAP4Search CamelIMAP4Search; typedef struct _CamelIMAP4SearchClass CamelIMAP4SearchClass; @@ -71,8 +68,6 @@ CamelType camel_imap4_search_get_type (void); CamelFolderSearch *camel_imap4_search_new (struct _CamelIMAP4Engine *engine, const char *cachedir); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_SEARCH_H__ */ diff --git a/camel/providers/imap4/camel-imap4-specials.h b/camel/providers/imap4/camel-imap4-specials.h index acfd58e..7f426b5 100644 --- a/camel/providers/imap4/camel-imap4-specials.h +++ b/camel/providers/imap4/camel-imap4-specials.h @@ -21,10 +21,7 @@ #ifndef __CAMEL_IMAP4_SPECIALS_H__ #define __CAMEL_IMAP4_SPECIALS_H__ -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS enum { IS_ASPECIAL = (1 << 0), @@ -46,8 +43,6 @@ extern unsigned char camel_imap4_specials[256]; void camel_imap4_specials_init (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_SPECIALS_H__ */ diff --git a/camel/providers/imap4/camel-imap4-store-summary.c b/camel/providers/imap4/camel-imap4-store-summary.c index ef5cb0a..cab509b 100644 --- a/camel/providers/imap4/camel-imap4-store-summary.c +++ b/camel/providers/imap4/camel-imap4-store-summary.c @@ -25,19 +25,19 @@ #include #endif +#include #include #include #include #include -#include -#include -#include -#include +#include -#include "camel-imap4-utils.h" -#include "camel-imap4-store-summary.h" +#include "camel-file-utils.h" +#include "camel-store.h" +#include "camel-imap4-store-summary.h" +#include "camel-imap4-utils.h" #define CAMEL_IMAP4_STORE_SUMMARY_VERSION_0 (0) #define CAMEL_IMAP4_STORE_SUMMARY_VERSION (0) diff --git a/camel/providers/imap4/camel-imap4-store-summary.h b/camel/providers/imap4/camel-imap4-store-summary.h index b80782e..a3fe66b 100644 --- a/camel/providers/imap4/camel-imap4-store-summary.h +++ b/camel/providers/imap4/camel-imap4-store-summary.h @@ -27,15 +27,12 @@ #include #include "camel-imap4-engine.h" -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_IMAP4_STORE_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_imap4_store_summary_get_type (), CamelIMAP4StoreSummary) #define CAMEL_IMAP4_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap4_store_summary_get_type (), CamelIMAP4StoreSummaryClass) #define CAMEL_IS_IMAP4_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_imap4_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIMAP4StoreSummary CamelIMAP4StoreSummary; typedef struct _CamelIMAP4StoreSummaryClass CamelIMAP4StoreSummaryClass; @@ -85,8 +82,6 @@ void camel_imap4_store_summary_unnote_info (CamelIMAP4StoreSummary *s, struct _C struct _CamelFolderInfo *camel_imap4_store_summary_get_folder_info (CamelIMAP4StoreSummary *s, const char *top, guint32 flags); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_STORE_SUMMARY_H__ */ diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c index fdeb2ff..65afbe1 100644 --- a/camel/providers/imap4/camel-imap4-store.c +++ b/camel/providers/imap4/camel-imap4-store.c @@ -25,32 +25,31 @@ #include #endif -#include -#include #include #include +#include +#include -#include -#include -#include +#include + +#include "camel-net-utils.h" +#include "camel-private.h" +#include "camel-sasl.h" +#include "camel-tcp-stream-raw.h" +#include "camel-utf8.h" #ifdef HAVE_SSL -#include +#include "camel-tcp-stream-ssl.h" #endif -#include - -#include -#include - -#include "camel-imap4-store.h" +#include "camel-imap4-command.h" #include "camel-imap4-engine.h" #include "camel-imap4-folder.h" +#include "camel-imap4-store-summary.h" +#include "camel-imap4-store.h" #include "camel-imap4-stream.h" -#include "camel-imap4-command.h" -#include "camel-imap4-utils.h" #include "camel-imap4-summary.h" -#include "camel-imap4-store-summary.h" +#include "camel-imap4-utils.h" #define d(x) x diff --git a/camel/providers/imap4/camel-imap4-store.h b/camel/providers/imap4/camel-imap4-store.h index a7d89ce..9975c16 100644 --- a/camel/providers/imap4/camel-imap4-store.h +++ b/camel/providers/imap4/camel-imap4-store.h @@ -23,11 +23,6 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_STORE (camel_imap4_store_get_type ()) #define CAMEL_IMAP4_STORE(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_STORE, CamelIMAP4Store)) #define CAMEL_IMAP4_STORE_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_IMAP4_STORE, CamelIMAP4StoreClass)) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_IS_IMAP4_STORE_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_IMAP4_STORE)) #define CAMEL_IMAP4_STORE_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_IMAP4_STORE, CamelIMAP4StoreClass)) +G_BEGIN_DECLS + typedef struct _CamelIMAP4Store CamelIMAP4Store; typedef struct _CamelIMAP4StoreClass CamelIMAP4StoreClass; @@ -56,8 +53,6 @@ struct _CamelIMAP4StoreClass { CamelType camel_imap4_store_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_STORE_H__ */ diff --git a/camel/providers/imap4/camel-imap4-stream.c b/camel/providers/imap4/camel-imap4-stream.c index fc3664a..1db6703 100644 --- a/camel/providers/imap4/camel-imap4-stream.c +++ b/camel/providers/imap4/camel-imap4-stream.c @@ -25,16 +25,15 @@ #include #endif +#include +#include #include #include #include -#include -#include -#include +#include "camel-debug.h" #include "camel-imap4-specials.h" - #include "camel-imap4-stream.h" #define d(x) (camel_debug ("imap4:stream") ? (x) : 0) diff --git a/camel/providers/imap4/camel-imap4-stream.h b/camel/providers/imap4/camel-imap4-stream.h index e048f8d..495fedc 100644 --- a/camel/providers/imap4/camel-imap4-stream.h +++ b/camel/providers/imap4/camel-imap4-stream.h @@ -26,22 +26,19 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_STREAM (camel_imap4_stream_get_type ()) #define CAMEL_IMAP4_STREAM(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_STREAM, CamelIMAP4Stream)) #define CAMEL_IMAP4_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TYPE_IMAP4_STREAM, CamelIMAP4StreamClass)) #define CAMEL_IS_IMAP4_STREAM(o) (CAMEL_CHECK_TYPE((o), CAMEL_TYPE_IMAP4_STREAM)) -typedef struct _CamelIMAP4Stream CamelIMAP4Stream; -typedef struct _CamelIMAP4StreamClass CamelIMAP4StreamClass; - #define IMAP4_READ_PRELEN 128 #define IMAP4_READ_BUFLEN 4096 +G_BEGIN_DECLS + +typedef struct _CamelIMAP4Stream CamelIMAP4Stream; +typedef struct _CamelIMAP4StreamClass CamelIMAP4StreamClass; + enum { CAMEL_IMAP4_TOKEN_NO_DATA = -8, CAMEL_IMAP4_TOKEN_ERROR = -7, @@ -121,8 +118,6 @@ int camel_imap4_stream_unget_token (CamelIMAP4Stream *stream, camel_imap4_token_ int camel_imap4_stream_line (CamelIMAP4Stream *stream, unsigned char **line, size_t *len); int camel_imap4_stream_literal (CamelIMAP4Stream *stream, unsigned char **literal, size_t *len); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_STREAM_H__ */ diff --git a/camel/providers/imap4/camel-imap4-summary.c b/camel/providers/imap4/camel-imap4-summary.c index b585f04..3ffc2ae 100644 --- a/camel/providers/imap4/camel-imap4-summary.c +++ b/camel/providers/imap4/camel-imap4-summary.c @@ -22,33 +22,33 @@ #include #endif +#include +#include +#include +#include #include #include -#include -#include #include -#include #include -#include -#include -#include +#include +#include + +#include #include -#include -#include -#include -#include +#include "camel-file-utils.h" +#include "camel-string-utils.h" +#include "camel-offline-journal.h" -#include "camel-imap4-store.h" +#include "camel-imap4-command.h" #include "camel-imap4-engine.h" #include "camel-imap4-folder.h" -#include "camel-imap4-stream.h" -#include "camel-imap4-command.h" #include "camel-imap4-journal.h" -#include "camel-imap4-utils.h" - +#include "camel-imap4-store.h" +#include "camel-imap4-stream.h" #include "camel-imap4-summary.h" +#include "camel-imap4-utils.h" #define d(x) x diff --git a/camel/providers/imap4/camel-imap4-summary.h b/camel/providers/imap4/camel-imap4-summary.h index fe3fa62..5cd5e5e 100644 --- a/camel/providers/imap4/camel-imap4-summary.h +++ b/camel/providers/imap4/camel-imap4-summary.h @@ -26,11 +26,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #define CAMEL_TYPE_IMAP4_SUMMARY (camel_imap4_summary_get_type ()) #define CAMEL_IMAP4_SUMMARY(obj) (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_IMAP4_SUMMARY, CamelIMAP4Summary)) #define CAMEL_IMAP4_SUMMARY_CLASS(klass) (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_IMAP4_SUMMARY, CamelIMAP4SummaryClass)) @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_IS_IMAP4_SUMMARY_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_IMAP4_SUMMARY)) #define CAMEL_IMAP4_SUMMARY_GET_CLASS(obj) (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_FOLDER_SUMMARY, CamelIMAP4SummaryClass)) +G_BEGIN_DECLS + typedef struct _CamelIMAP4MessageInfo CamelIMAP4MessageInfo; typedef struct _CamelIMAP4MessageContentInfo CamelIMAP4MessageContentInfo; @@ -97,8 +94,6 @@ void camel_imap4_summary_expunge (CamelFolderSummary *summary, int seqid); int camel_imap4_summary_flush_updates (CamelFolderSummary *summary, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_SUMMARY_H__ */ diff --git a/camel/providers/imap4/camel-imap4-utils.c b/camel/providers/imap4/camel-imap4-utils.c index 0df6dcf..833913f 100644 --- a/camel/providers/imap4/camel-imap4-utils.c +++ b/camel/providers/imap4/camel-imap4-utils.c @@ -22,21 +22,21 @@ #include #endif -#include -#include #include #include +#include +#include + +#include -#include -#include -#include +#include "camel-net-utils.h" +#include "camel-store.h" +#include "camel-imap4-command.h" #include "camel-imap4-engine.h" +#include "camel-imap4-store-summary.h" #include "camel-imap4-stream.h" -#include "camel-imap4-command.h" #include "camel-imap4-summary.h" -#include "camel-imap4-store-summary.h" - #include "camel-imap4-utils.h" #define d(x) diff --git a/camel/providers/imap4/camel-imap4-utils.h b/camel/providers/imap4/camel-imap4-utils.h index 882e66c..286abb2 100644 --- a/camel/providers/imap4/camel-imap4-utils.h +++ b/camel/providers/imap4/camel-imap4-utils.h @@ -25,10 +25,7 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ +G_BEGIN_DECLS /* IMAP4 flag merging */ typedef struct { @@ -100,8 +97,6 @@ void camel_imap4_status_free (camel_imap4_status_t *status); int camel_imap4_untagged_status (struct _CamelIMAP4Engine *engine, struct _CamelIMAP4Command *ic, guint32 index, struct _camel_imap4_token_t *token, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* __CAMEL_IMAP4_UTILS_H__ */ diff --git a/camel/providers/imapp/Makefile.am b/camel/providers/imapp/Makefile.am index 2764eb2..8260c58 100644 --- a/camel/providers/imapp/Makefile.am +++ b/camel/providers/imapp/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = -I.. \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(GTK_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-imapp-provider\" libcamelimapp_la_SOURCES = \ diff --git a/camel/providers/imapp/camel-imapp-driver.c b/camel/providers/imapp/camel-imapp-driver.c index c9a9e45..c7729c2 100644 --- a/camel/providers/imapp/camel-imapp-driver.c +++ b/camel/providers/imapp/camel-imapp-driver.c @@ -4,25 +4,24 @@ #include #endif +#include +#include #include #include -#include -#include + +#include "camel-folder-summary.h" +#include "camel-mime-utils.h" +#include "camel-sasl.h" +#include "camel-store.h" +#include "camel-stream-mem.h" +#include "camel-stream-null.h" #include "camel-imapp-driver.h" -#include "camel-imapp-utils.h" -#include "camel-imapp-folder.h" #include "camel-imapp-engine.h" -#include "camel-imapp-summary.h" #include "camel-imapp-exception.h" - -#include -#include - -#include -#include -#include -#include +#include "camel-imapp-folder.h" +#include "camel-imapp-summary.h" +#include "camel-imapp-utils.h" #define d(x) x diff --git a/camel/providers/imapp/camel-imapp-driver.h b/camel/providers/imapp/camel-imapp-driver.h index 2ecdfe6..edebee5 100644 --- a/camel/providers/imapp/camel-imapp-driver.h +++ b/camel/providers/imapp/camel-imapp-driver.h @@ -11,6 +11,8 @@ #define CAMEL_IMAPP_DRIVER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAPP_DRIVER_TYPE, CamelIMAPPDriverClass)) #define CAMEL_IS_IMAP_DRIVER(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAPP_DRIVER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelIMAPPDriver CamelIMAPPDriver; typedef struct _CamelIMAPPDriverClass CamelIMAPPDriverClass; @@ -97,4 +99,6 @@ GPtrArray * camel_imapp_driver_list(CamelIMAPPDriver *id, const char *name, gui struct _CamelStream *camel_imapp_driver_get(CamelIMAPPDriver *id, struct _CamelIMAPPFolder *folder, const char *uid); void camel_imapp_driver_append(CamelIMAPPDriver *id, struct _CamelIMAPPFolder *folder, struct _CamelDataWrapper *); +G_END_DECLS + #endif diff --git a/camel/providers/imapp/camel-imapp-engine.c b/camel/providers/imapp/camel-imapp-engine.c index 1eaa4b8..87fa1d7 100644 --- a/camel/providers/imapp/camel-imapp-engine.c +++ b/camel/providers/imapp/camel-imapp-engine.c @@ -1,21 +1,21 @@ - +#ifdef HAVE_CONFIG_H #include "config.h" +#endif +#include #include #include +#include "camel-data-wrapper.h" +#include "camel-folder-summary.h" +#include "camel-sasl.h" +#include "camel-stream-mem.h" +#include "camel-stream-null.h" + #include "camel-imapp-engine.h" +#include "camel-imapp-exception.h" #include "camel-imapp-stream.h" #include "camel-imapp-utils.h" -#include "camel-imapp-exception.h" - -#include -#include -#include -#include -#include - -#include #define e(x) #define c(x) /* command build debug */ diff --git a/camel/providers/imapp/camel-imapp-engine.h b/camel/providers/imapp/camel-imapp-engine.h index 2cc19cd..1599ea5 100644 --- a/camel/providers/imapp/camel-imapp-engine.h +++ b/camel/providers/imapp/camel-imapp-engine.h @@ -13,6 +13,8 @@ #define CAMEL_IMAPP_ENGINE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAPP_ENGINE_TYPE, CamelIMAPPEngineClass)) #define CAMEL_IS_IMAP_ENGINE(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAPP_ENGINE_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelIMAPPEngine CamelIMAPPEngine; typedef struct _CamelIMAPPEngineClass CamelIMAPPEngineClass; @@ -153,4 +155,6 @@ CamelIMAPPCommand *camel_imapp_engine_command_find_tag(CamelIMAPPEngine *imap, u CamelIMAPPSelectResponse *camel_imapp_engine_select(CamelIMAPPEngine *imap, const char *name); void camel_imapp_engine_select_free(CamelIMAPPEngine *imap, CamelIMAPPSelectResponse *select); +G_END_DECLS + #endif diff --git a/camel/providers/imapp/camel-imapp-exception.h b/camel/providers/imapp/camel-imapp-exception.h index 5e18b6c..65af322 100644 --- a/camel/providers/imapp/camel-imapp-exception.h +++ b/camel/providers/imapp/camel-imapp-exception.h @@ -9,6 +9,8 @@ #include #include "camel/camel-exception.h" +G_BEGIN_DECLS + struct _CamelExceptionEnv { struct _CamelExceptionEnv *parent; CamelException *ex; @@ -32,4 +34,6 @@ void camel_exception_drop(struct _CamelExceptionEnv *env); void camel_exception_throw_ex(CamelException *ex) __attribute__ ((noreturn)); void camel_exception_throw(int id, char *fmt, ...) __attribute__ ((noreturn)); +G_END_DECLS + #endif diff --git a/camel/providers/imapp/camel-imapp-fetch-stream.c b/camel/providers/imapp/camel-imapp-fetch-stream.c index 34e5cf0..2c07dff 100644 --- a/camel/providers/imapp/camel-imapp-fetch-stream.c +++ b/camel/providers/imapp/camel-imapp-fetch-stream.c @@ -24,17 +24,17 @@ #include #endif -#include -#include #include #include +#include +#include #include -#include +#include "camel-stream-mem.h" -#include "camel-imapp-stream.h" #include "camel-imapp-exception.h" +#include "camel-imapp-stream.h" #define t(x) #define io(x) x diff --git a/camel/providers/imapp/camel-imapp-fetch-stream.h b/camel/providers/imapp/camel-imapp-fetch-stream.h index c655d23..56c43c2 100644 --- a/camel/providers/imapp/camel-imapp-fetch-stream.h +++ b/camel/providers/imapp/camel-imapp-fetch-stream.h @@ -27,6 +27,8 @@ #define CAMEL_IMAPP_FETCH_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapp_fetch_stream_get_type (), CamelIMAPPFetchStreamClass) #define CAMEL_IS_IMAP_FETCH_STREAM(obj) CAMEL_CHECK_TYPE (obj, camel_imapp_fetch_stream_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIMAPPFetchStreamClass CamelIMAPPFetchStreamClass; typedef struct _CamelIMAPPFetchStream CamelIMAPPFetchStream; @@ -44,4 +46,6 @@ CamelType camel_imapp_fetch_stream_get_type (void); CamelStream *camel_imapp_fetch_stream_new (struct _CamelIMAPPEngine *src, const char *uid, const char *spec); +G_END_DECLS + #endif /* ! _CAMEL_IMAPP_FETCH_STREAM_H */ diff --git a/camel/providers/imapp/camel-imapp-folder.c b/camel/providers/imapp/camel-imapp-folder.c index f85e757..ee1788f 100644 --- a/camel/providers/imapp/camel-imapp-folder.c +++ b/camel/providers/imapp/camel-imapp-folder.c @@ -26,26 +26,25 @@ #endif #include - -#include "camel/camel-exception.h" -#include "camel/camel-stream-mem.h" -#include "camel/camel-stream-filter.h" -#include "camel/camel-mime-message.h" -#include "camel/camel-operation.h" -#include "camel/camel-data-cache.h" -#include "camel/camel-session.h" -#include "camel/camel-file-utils.h" - -#include "camel-imapp-store.h" -#include "camel-imapp-folder.h" -#include "camel-imapp-summary.h" -#include "camel-imapp-exception.h" +#include +#include #include #include -#include -#include +#include "camel-data-cache.h" +#include "camel-exception.h" +#include "camel-file-utils.h" +#include "camel-mime-message.h" +#include "camel-operation.h" +#include "camel-session.h" +#include "camel-stream-filter.h" +#include "camel-stream-mem.h" + +#include "camel-imapp-exception.h" +#include "camel-imapp-folder.h" +#include "camel-imapp-store.h" +#include "camel-imapp-summary.h" #define d(x) diff --git a/camel/providers/imapp/camel-imapp-folder.h b/camel/providers/imapp/camel-imapp-folder.h index 5aef76a..bf8fdf0 100644 --- a/camel/providers/imapp/camel-imapp-folder.h +++ b/camel/providers/imapp/camel-imapp-folder.h @@ -24,11 +24,6 @@ #ifndef CAMEL_IMAPP_FOLDER_H #define CAMEL_IMAPP_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #define CAMEL_IMAPP_FOLDER_TYPE (camel_imapp_folder_get_type ()) @@ -36,6 +31,8 @@ extern "C" { #define CAMEL_IMAPP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAPP_FOLDER_TYPE, CamelIMAPPFolderClass)) #define CAMEL_IS_IMAP_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAPP_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelIMAPPFolder { CamelFolder parent_object; @@ -59,8 +56,6 @@ CamelType camel_imapp_folder_get_type (void); /* public methods */ CamelFolder *camel_imapp_folder_new(CamelStore *parent, const char *path); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAPP_FOLDER_H */ diff --git a/camel/providers/imapp/camel-imapp-provider.c b/camel/providers/imapp/camel-imapp-provider.c index b8b2810..1a344d1 100644 --- a/camel/providers/imapp/camel-imapp-provider.c +++ b/camel/providers/imapp/camel-imapp-provider.c @@ -27,11 +27,12 @@ #include #endif +#include + #include "camel/camel-provider.h" +#include "camel/camel-sasl.h" #include "camel/camel-session.h" #include "camel/camel-url.h" -#include "camel/camel-sasl.h" -#include "camel/camel-i18n.h" #include "camel-imapp-store.h" diff --git a/camel/providers/imapp/camel-imapp-store-summary.c b/camel/providers/imapp/camel-imapp-store-summary.c index db1f977..ae6d0ae 100644 --- a/camel/providers/imapp/camel-imapp-store-summary.c +++ b/camel/providers/imapp/camel-imapp-store-summary.c @@ -22,23 +22,22 @@ #include #endif -#include #include -#include #include #include +#include +#include -#include "camel-imapp-store-summary.h" - -#include "camel/camel-file-utils.h" - -#include "camel-string-utils.h" -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" +#include +#include +#include "camel-file-utils.h" #include "camel-private.h" +#include "camel-string-utils.h" #include "camel-utf8.h" +#include "camel-imapp-store-summary.h" + #define d(x) #define io(x) /* io debug */ diff --git a/camel/providers/imapp/camel-imapp-store-summary.h b/camel/providers/imapp/camel-imapp-store-summary.h index 73763f0..00a188f 100644 --- a/camel/providers/imapp/camel-imapp-store-summary.h +++ b/camel/providers/imapp/camel-imapp-store-summary.h @@ -23,11 +23,6 @@ #ifndef _CAMEL_IMAPP_STORE_SUMMARY_H #define _CAMEL_IMAPP_STORE_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_IMAPP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapp_store_summary_get_type (), CamelIMAPPStoreSummaryClass) #define CAMEL_IS_IMAP_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_imapp_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIMAPPStoreSummary CamelIMAPPStoreSummary; typedef struct _CamelIMAPPStoreSummaryClass CamelIMAPPStoreSummaryClass; @@ -95,8 +92,6 @@ char *camel_imapp_store_summary_full_from_path(CamelIMAPPStoreSummary *s, const /* helper macro's */ #define camel_imapp_store_info_full_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_IMAPP_STORE_INFO_FULL_NAME)) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_IMAPP_STORE_SUMMARY_H */ diff --git a/camel/providers/imapp/camel-imapp-store.c b/camel/providers/imapp/camel-imapp-store.c index 568939b..eda29c1 100644 --- a/camel/providers/imapp/camel-imapp-store.c +++ b/camel/providers/imapp/camel-imapp-store.c @@ -25,39 +25,40 @@ #include #endif -#include -#include -#include +#include #include #include #include #include #include -#include +#include +#include +#include -#include "camel/camel-operation.h" +#include -#include "camel/camel-stream-buffer.h" -#include "camel/camel-session.h" +#include "camel/camel-data-cache.h" #include "camel/camel-exception.h" -#include "camel/camel-url.h" +#include "camel/camel-net-utils.h" +#include "camel/camel-operation.h" #include "camel/camel-sasl.h" -#include "camel/camel-data-cache.h" -#include "camel/camel-tcp-stream.h" +#include "camel/camel-session.h" +#include "camel/camel-stream-buffer.h" #include "camel/camel-tcp-stream-raw.h" +#include "camel/camel-tcp-stream.h" +#include "camel/camel-url.h" + #ifdef HAVE_SSL #include "camel/camel-tcp-stream-ssl.h" #endif -#include "camel/camel-i18n.h" -#include "camel-imapp-store-summary.h" -#include "camel-imapp-store.h" -#include "camel-imapp-folder.h" +#include "camel-imapp-driver.h" #include "camel-imapp-engine.h" #include "camel-imapp-exception.h" +#include "camel-imapp-folder.h" +#include "camel-imapp-store-summary.h" +#include "camel-imapp-store.h" #include "camel-imapp-utils.h" -#include "camel-imapp-driver.h" -#include "camel-net-utils.h" /* Specified in RFC 2060 section 2.1 */ #define IMAP_PORT 143 diff --git a/camel/providers/imapp/camel-imapp-store.h b/camel/providers/imapp/camel-imapp-store.h index 76fa9a0..7833070 100644 --- a/camel/providers/imapp/camel-imapp-store.h +++ b/camel/providers/imapp/camel-imapp-store.h @@ -25,21 +25,18 @@ #ifndef CAMEL_IMAPP_STORE_H #define CAMEL_IMAPP_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include "camel-imapp-driver.h" -#include "libedataserver/e-memory.h" +#include #define CAMEL_IMAPP_STORE_TYPE (camel_imapp_store_get_type ()) #define CAMEL_IMAPP_STORE(obj) (CAMEL_CHECK_CAST((obj), CAMEL_IMAPP_STORE_TYPE, CamelIMAPPStore)) #define CAMEL_IMAPP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAPP_STORE_TYPE, CamelIMAPPStoreClass)) #define CAMEL_IS_IMAP_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_IMAPP_STORE_TYPE)) +G_BEGIN_DECLS + struct _pending_fetch { struct _pending_fetch *next; struct _pending_fetch *prev; @@ -68,9 +65,7 @@ typedef struct { /* Standard Camel function */ CamelType camel_imapp_store_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_IMAPP_STORE_H */ diff --git a/camel/providers/imapp/camel-imapp-stream.c b/camel/providers/imapp/camel-imapp-stream.c index 6abc922..6b1d953 100644 --- a/camel/providers/imapp/camel-imapp-stream.c +++ b/camel/providers/imapp/camel-imapp-stream.c @@ -24,17 +24,17 @@ #include #endif -#include -#include #include #include +#include +#include #include -#include +#include "camel-stream-mem.h" -#include "camel-imapp-stream.h" #include "camel-imapp-exception.h" +#include "camel-imapp-stream.h" #define t(x) #define io(x) x diff --git a/camel/providers/imapp/camel-imapp-stream.h b/camel/providers/imapp/camel-imapp-stream.h index cfc2f04..ff810e8 100644 --- a/camel/providers/imapp/camel-imapp-stream.h +++ b/camel/providers/imapp/camel-imapp-stream.h @@ -27,6 +27,8 @@ #define CAMEL_IMAPP_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imapp_stream_get_type (), CamelIMAPPStreamClass) #define CAMEL_IS_IMAP_STREAM(obj) CAMEL_CHECK_TYPE (obj, camel_imapp_stream_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelIMAPPStreamClass CamelIMAPPStreamClass; typedef struct _CamelIMAPPStream CamelIMAPPStream; @@ -87,4 +89,6 @@ int camel_imapp_stream_text (CamelIMAPPStream *is, unsigned char **text); /* gets a 'number' */ guint32 camel_imapp_stream_number(CamelIMAPPStream *is); +G_END_DECLS + #endif /* ! _CAMEL_IMAPP_STREAM_H */ diff --git a/camel/providers/imapp/camel-imapp-summary.c b/camel/providers/imapp/camel-imapp-summary.c index faef1da..db31fee 100644 --- a/camel/providers/imapp/camel-imapp-summary.c +++ b/camel/providers/imapp/camel-imapp-summary.c @@ -25,15 +25,16 @@ #include #endif -#include -#include -#include #include -#include #include +#include +#include +#include +#include + +#include "camel-file-utils.h" #include "camel-imapp-summary.h" -#include #define CAMEL_IMAPP_SUMMARY_VERSION (1) diff --git a/camel/providers/imapp/camel-imapp-summary.h b/camel/providers/imapp/camel-imapp-summary.h index f5a6822..2379608 100644 --- a/camel/providers/imapp/camel-imapp-summary.h +++ b/camel/providers/imapp/camel-imapp-summary.h @@ -38,6 +38,8 @@ #define CAMEL_IMAPP_MESSAGE_RECENT (1 << 8) +G_BEGIN_DECLS + typedef struct _CamelIMAPPSummaryClass CamelIMAPPSummaryClass; typedef struct _CamelIMAPPSummary CamelIMAPPSummary; @@ -62,5 +64,6 @@ struct _CamelIMAPPSummaryClass { CamelType camel_imapp_summary_get_type (void); CamelFolderSummary *camel_imapp_summary_new (void); -#endif /* ! _CAMEL_IMAPP_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_IMAPP_SUMMARY_H */ diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c index a7a4d47..f4b511d 100644 --- a/camel/providers/imapp/camel-imapp-utils.c +++ b/camel/providers/imapp/camel-imapp-utils.c @@ -3,17 +3,18 @@ #include #include -#include -#include -#include -#include +#include +#include "camel-folder-summary.h" +#include "camel-store.h" +#include "camel-string-utils.h" +#include "camel-utf8.h" + +#include "camel-imapp-engine.h" +#include "camel-imapp-exception.h" #include "camel-imapp-folder.h" #include "camel-imapp-stream.h" #include "camel-imapp-utils.h" -#include "camel-imapp-exception.h" -#include "camel-imapp-engine.h" -#include "libedataserver/e-memory.h" /* high-level parser state */ #define p(x) @@ -921,7 +922,7 @@ imap_free_fetch(struct _fetch_info *finfo) extern void camel_content_info_dump(CamelMessageContentInfo *ci, int depth); extern void camel_message_info_dump(CamelMessageInfo *mi); -#include +#include "camel-stream-fs.h" /* debug, dump one out */ void diff --git a/camel/providers/imapp/camel-imapp-utils.h b/camel/providers/imapp/camel-imapp-utils.h index 569f15f..aec3964 100644 --- a/camel/providers/imapp/camel-imapp-utils.h +++ b/camel/providers/imapp/camel-imapp-utils.h @@ -4,6 +4,8 @@ #include +G_BEGIN_DECLS + /* FIXME: the enum should be split up into logical groups, so that testing can be done more accurately? */ @@ -142,4 +144,6 @@ void imapp_uidset_init(struct _uidset_state *ss, struct _CamelIMAPPEngine *ie); int imapp_uidset_done(struct _uidset_state *ss, struct _CamelIMAPPCommand *ic); int imapp_uidset_add(struct _uidset_state *ss, struct _CamelIMAPPCommand *ic, const char *uid); +G_END_DECLS + #endif diff --git a/camel/providers/local/Makefile.am b/camel/providers/local/Makefile.am index 54b73e9..78fd4af 100644 --- a/camel/providers/local/Makefile.am +++ b/camel/providers/local/Makefile.am @@ -23,7 +23,6 @@ INCLUDES = \ -I$(top_srcdir)/intl \ -I$(top_srcdir) \ $(CAMEL_CFLAGS) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-local-provider\" libcamellocal_la_SOURCES = \ diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c index 7e58e6d..facb368 100644 --- a/camel/providers/local/camel-local-folder.c +++ b/camel/providers/local/camel-local-folder.c @@ -24,37 +24,36 @@ #include #endif -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include #include +#include #include #if !defined (G_OS_WIN32) && !defined (_POSIX_PATH_MAX) #include #endif -#include "camel-private.h" -#include "camel-local-folder.h" -#include "camel-local-store.h" -#include "camel-stream-fs.h" -#include "camel-local-summary.h" #include "camel-data-wrapper.h" +#include "camel-exception.h" +#include "camel-mime-filter-from.h" #include "camel-mime-message.h" +#include "camel-private.h" #include "camel-stream-filter.h" -#include "camel-mime-filter-from.h" -#include "camel-exception.h" -#include "camel-i18n.h" +#include "camel-stream-fs.h" +#include "camel-text-index.h" +#include "camel-local-folder.h" #include "camel-local-private.h" - -#include "camel-text-index.h" +#include "camel-local-store.h" +#include "camel-local-summary.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h index 91b4bec..017ddae 100644 --- a/camel/providers/local/camel-local-folder.h +++ b/camel/providers/local/camel-local-folder.h @@ -22,11 +22,6 @@ #ifndef CAMEL_LOCAL_FOLDER_H #define CAMEL_LOCAL_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include @@ -40,6 +35,8 @@ extern "C" { #define CAMEL_LOCAL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_FOLDER_TYPE, CamelLocalFolderClass)) #define CAMEL_IS_LOCAL_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_FOLDER_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_LOCAL_FOLDER_ARG_INDEX_BODY = CAMEL_FOLDER_ARG_LAST, @@ -98,8 +95,6 @@ CamelType camel_local_folder_get_type(void); int camel_local_folder_lock(CamelLocalFolder *lf, CamelLockType type, CamelException *ex); int camel_local_folder_unlock(CamelLocalFolder *lf); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_LOCAL_FOLDER_H */ diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h index b6c9870..42d95fe 100644 --- a/camel/providers/local/camel-local-private.h +++ b/camel/providers/local/camel-local-private.h @@ -24,11 +24,6 @@ #ifndef CAMEL_LOCAL_PRIVATE_H #define CAMEL_LOCAL_PRIVATE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ @@ -38,6 +33,8 @@ extern "C" { #include +G_BEGIN_DECLS + struct _CamelLocalFolderPrivate { GMutex *search_lock; /* for locking the search object */ }; @@ -45,9 +42,7 @@ struct _CamelLocalFolderPrivate { #define CAMEL_LOCAL_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelLocalFolder *)f)->priv->l)) #define CAMEL_LOCAL_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelLocalFolder *)f)->priv->l)) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_LOCAL_PRIVATE_H */ diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c index 92d4f19..18f9b0f 100644 --- a/camel/providers/local/camel-local-provider.c +++ b/camel/providers/local/camel-local-provider.c @@ -26,14 +26,15 @@ #include #include +#include + #include "camel-provider.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-i18n.h" -#include "camel-mh-store.h" -#include "camel-mbox-store.h" #include "camel-maildir-store.h" +#include "camel-mbox-store.h" +#include "camel-mh-store.h" #include "camel-spool-store.h" #define d(x) diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c index 7a4d522..6331513 100644 --- a/camel/providers/local/camel-local-store.c +++ b/camel/providers/local/camel-local-store.c @@ -23,19 +23,20 @@ #include #endif -#include #include +#include #include #include -#include +#include #include +#include #include #include + #include "camel/camel-exception.h" #include "camel/camel-file-utils.h" -#include "camel/camel-i18n.h" #include "camel/camel-private.h" #include "camel/camel-text-index.h" #include "camel/camel-url.h" diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h index f25af8c..73e5ba8 100644 --- a/camel/providers/local/camel-local-store.h +++ b/camel/providers/local/camel-local-store.h @@ -23,11 +23,6 @@ #ifndef CAMEL_LOCAL_STORE_H #define CAMEL_LOCAL_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-store.h" #define CAMEL_LOCAL_STORE_TYPE (camel_local_store_get_type ()) @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_LOCAL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_LOCAL_STORE_TYPE, CamelLocalStoreClass)) #define CAMEL_IS_LOCAL_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_LOCAL_STORE_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelStore parent_object; @@ -56,9 +53,7 @@ const gchar *camel_local_store_get_toplevel_dir (CamelLocalStore *store); #define camel_local_store_get_full_path(ls, name) ((CamelLocalStoreClass *)((CamelObject *)ls)->klass)->get_full_path((CamelLocalStore *)ls, name) #define camel_local_store_get_meta_path(ls, name, ext) ((CamelLocalStoreClass *)((CamelObject *)ls)->klass)->get_meta_path((CamelLocalStore *)ls, name, ext) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_LOCAL_STORE_H */ diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c index 93d2ec2..9ddd52f 100644 --- a/camel/providers/local/camel-local-summary.c +++ b/camel/providers/local/camel-local-summary.c @@ -24,19 +24,19 @@ #endif #include -#include -#include #include -#include #include +#include +#include +#include #include +#include #include -#include "camel/camel-mime-message.h" -#include "camel/camel-stream-null.h" -#include "camel/camel-file-utils.h" -#include "camel/camel-i18n.h" +#include "camel-file-utils.h" +#include "camel-mime-message.h" +#include "camel-stream-null.h" #include "camel-local-summary.h" diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h index 9840364..4f2de2a 100644 --- a/camel/providers/local/camel-local-summary.h +++ b/camel/providers/local/camel-local-summary.h @@ -30,6 +30,8 @@ #define CAMEL_LOCAL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_local_summary_get_type (), CamelLocalSummaryClass) #define CAMEL_IS_LOCAL_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_local_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelLocalSummary CamelLocalSummary; typedef struct _CamelLocalSummaryClass CamelLocalSummaryClass; @@ -92,5 +94,6 @@ int camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *x /* utility functions - write headers to a file with optional X-Evolution header and/or status header */ int camel_local_summary_write_headers(int fd, struct _camel_header_raw *header, const char *xevline, const char *status, const char *xstatus); -#endif /* ! _CAMEL_LOCAL_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_LOCAL_SUMMARY_H */ diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c index 8d6ef8e..f64d965 100644 --- a/camel/providers/local/camel-maildir-folder.c +++ b/camel/providers/local/camel-maildir-folder.c @@ -23,23 +23,25 @@ #include #endif -#include -#include #include -#include -#include #include -#include #include +#include +#include +#include +#include +#include + +#include + +#include "camel-data-wrapper.h" +#include "camel-exception.h" +#include "camel-mime-message.h" +#include "camel-stream-fs.h" #include "camel-maildir-folder.h" #include "camel-maildir-store.h" -#include "camel-stream-fs.h" #include "camel-maildir-summary.h" -#include "camel-data-wrapper.h" -#include "camel-mime-message.h" -#include "camel-exception.h" -#include "camel-i18n.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h index 67ad097..558ed60 100644 --- a/camel/providers/local/camel-maildir-folder.h +++ b/camel/providers/local/camel-maildir-folder.h @@ -23,10 +23,6 @@ #ifndef CAMEL_MAILDIR_FOLDER_H #define CAMEL_MAILDIR_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus } */ #include "camel-local-folder.h" #define CAMEL_MAILDIR_FOLDER_TYPE (camel_maildir_folder_get_type ()) @@ -34,6 +30,8 @@ extern "C" { #define CAMEL_MAILDIR_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_FOLDER_TYPE, CamelMaildirFolderClass)) #define CAMEL_IS_MAILDIR_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelLocalFolder parent_object; @@ -52,7 +50,6 @@ CamelFolder *camel_maildir_folder_new(CamelStore *parent_store, const char *full /* Standard Camel function */ CamelType camel_maildir_folder_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CAMEL_MAILDIR_FOLDER_H */ +G_END_DECLS + +#endif /* CAMEL_MAILDIR_FOLDER_H */ diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c index 86665fe..81b5fa1 100644 --- a/camel/providers/local/camel-maildir-store.c +++ b/camel/providers/local/camel-maildir-store.c @@ -23,21 +23,22 @@ #include #endif -#include -#include +#include #include #include #include +#include +#include -#include +#include -#include "camel-maildir-store.h" -#include "camel-maildir-folder.h" #include "camel-exception.h" -#include "camel-url.h" #include "camel-private.h" +#include "camel-url.h" + +#include "camel-maildir-folder.h" +#include "camel-maildir-store.h" #include "camel-maildir-summary.h" -#include "camel-i18n.h" #define d(x) diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h index 325067b..c76c7ad 100644 --- a/camel/providers/local/camel-maildir-store.h +++ b/camel/providers/local/camel-maildir-store.h @@ -22,11 +22,6 @@ #ifndef CAMEL_MAILDIR_STORE_H #define CAMEL_MAILDIR_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus } */ - #include "camel-local-store.h" #define CAMEL_MAILDIR_STORE_TYPE (camel_maildir_store_get_type ()) @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MAILDIR_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MAILDIR_STORE_TYPE, CamelMaildirStoreClass)) #define CAMEL_IS_MAILDIR_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_MAILDIR_STORE_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelLocalStore parent_object; @@ -49,7 +46,6 @@ typedef struct { /* Standard Camel function */ CamelType camel_maildir_store_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CAMEL_MAILDIR_STORE_H */ +G_END_DECLS + +#endif /* CAMEL_MAILDIR_STORE_H */ diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c index 2c55ce0..17d84f6 100644 --- a/camel/providers/local/camel-maildir-summary.c +++ b/camel/providers/local/camel-maildir-summary.c @@ -22,27 +22,27 @@ #include #endif -#include -#include -#include -#include -#include +#include +#include #include -#include +#include #include - +#include +#include +#include #include -#include +#include +#include -#include +#include -#include "camel-maildir-summary.h" -#include -#include +#include +#include "camel-mime-message.h" +#include "camel-operation.h" #include "camel-private.h" -#include "libedataserver/e-memory.h" -#include "camel-i18n.h" + +#include "camel-maildir-summary.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-maildir-summary.h b/camel/providers/local/camel-maildir-summary.h index 5828f6a..7eb4846 100644 --- a/camel/providers/local/camel-maildir-summary.h +++ b/camel/providers/local/camel-maildir-summary.h @@ -30,6 +30,8 @@ #define CAMEL_MAILDIR_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_maildir_summary_get_type (), CamelMaildirSummaryClass) #define CAMEL_IS_MAILDIR_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_maildir_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMaildirSummary CamelMaildirSummary; typedef struct _CamelMaildirSummaryClass CamelMaildirSummaryClass; @@ -72,5 +74,6 @@ int camel_maildir_summary_name_to_info(CamelMaildirMessageInfo *info, const char #define camel_maildir_info_filename(x) (((CamelMaildirMessageInfo *)x)->filename) #define camel_maildir_info_set_filename(x, s) (g_free(((CamelMaildirMessageInfo *)x)->filename),((CamelMaildirMessageInfo *)x)->filename = s) -#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_MAILDIR_SUMMARY_H */ diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c index ad50022..b0f5f0f 100644 --- a/camel/providers/local/camel-mbox-folder.c +++ b/camel/providers/local/camel-mbox-folder.c @@ -24,20 +24,20 @@ #include #endif -#include -#include -#include -#include -#include #include +#include +#include #include +#include +#include +#include #include +#include #include #include "camel/camel-data-wrapper.h" #include "camel/camel-exception.h" -#include "camel/camel-i18n.h" #include "camel/camel-mime-filter-from.h" #include "camel/camel-mime-message.h" #include "camel/camel-private.h" diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h index 7cf98bd..c358b70 100644 --- a/camel/providers/local/camel-mbox-folder.h +++ b/camel/providers/local/camel-mbox-folder.h @@ -22,11 +22,6 @@ #ifndef CAMEL_MBOX_FOLDER_H #define CAMEL_MBOX_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-local-folder.h" #include "camel-mbox-summary.h" @@ -35,6 +30,8 @@ extern "C" { #define CAMEL_MBOX_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass)) #define CAMEL_IS_MBOX_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelLocalFolder parent_object; @@ -55,8 +52,6 @@ CamelFolder *camel_mbox_folder_new(CamelStore *parent_store, const char *full_na /* Standard Camel function */ CamelType camel_mbox_folder_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MBOX_FOLDER_H */ diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c index 88ac5e2..6595ef6 100644 --- a/camel/providers/local/camel-mbox-store.c +++ b/camel/providers/local/camel-mbox-store.c @@ -23,20 +23,21 @@ #include #endif +#include +#include #include -#include -#include #include -#include -#include +#include +#include #include +#include #include #include + #include "camel/camel-exception.h" #include "camel/camel-file-utils.h" -#include "camel/camel-i18n.h" #include "camel/camel-private.h" #include "camel/camel-text-index.h" #include "camel/camel-url.h" diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h index 2332380..f5cae4e 100644 --- a/camel/providers/local/camel-mbox-store.h +++ b/camel/providers/local/camel-mbox-store.h @@ -22,11 +22,6 @@ #ifndef CAMEL_MBOX_STORE_H #define CAMEL_MBOX_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-local-store.h" #define CAMEL_MBOX_STORE_TYPE (camel_mbox_store_get_type ()) @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MBOX_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass)) #define CAMEL_IS_MBOX_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_STORE_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelLocalStore parent_object; @@ -49,9 +46,7 @@ typedef struct { /* Standard Camel function */ CamelType camel_mbox_store_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_MBOX_STORE_H */ diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c index 025fe63..a817d61 100644 --- a/camel/providers/local/camel-mbox-summary.c +++ b/camel/providers/local/camel-mbox-summary.c @@ -23,20 +23,20 @@ #include #endif -#include -#include -#include -#include +#include #include -#include +#include #include -#include +#include +#include +#include +#include #include +#include #include #include "camel-file-utils.h" -#include "camel-i18n.h" #include "camel-mime-message.h" #include "camel-operation.h" #include "camel-private.h" diff --git a/camel/providers/local/camel-mbox-summary.h b/camel/providers/local/camel-mbox-summary.h index 17d60f0..0cce678 100644 --- a/camel/providers/local/camel-mbox-summary.h +++ b/camel/providers/local/camel-mbox-summary.h @@ -30,6 +30,8 @@ #define CAMEL_MBOX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass) #define CAMEL_IS_MBOX_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_mbox_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMboxSummary CamelMboxSummary; typedef struct _CamelMboxSummaryClass CamelMboxSummaryClass; @@ -72,5 +74,6 @@ void camel_mbox_summary_xstatus(CamelMboxSummary *mbs, int state); /* build a new mbox from an existing mbox storing summary information */ int camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderChangeInfo *changeinfo, int fd, int fdout, CamelException *ex); -#endif /* ! _CAMEL_MBOX_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_MBOX_SUMMARY_H */ diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c index 7316297..1db3723 100644 --- a/camel/providers/local/camel-mh-folder.c +++ b/camel/providers/local/camel-mh-folder.c @@ -23,23 +23,24 @@ #include #endif -#include -#include #include -#include -#include #include -#include #include +#include +#include +#include +#include +#include + +#include +#include "camel-data-wrapper.h" +#include "camel-exception.h" #include "camel-mh-folder.h" #include "camel-mh-store.h" -#include "camel-stream-fs.h" #include "camel-mh-summary.h" -#include "camel-data-wrapper.h" #include "camel-mime-message.h" -#include "camel-exception.h" -#include "camel-i18n.h" +#include "camel-stream-fs.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h index 3c22e76..eec60ef 100644 --- a/camel/providers/local/camel-mh-folder.h +++ b/camel/providers/local/camel-mh-folder.h @@ -23,10 +23,6 @@ #ifndef CAMEL_MH_FOLDER_H #define CAMEL_MH_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus } */ #include "camel-local-folder.h" #define CAMEL_MH_FOLDER_TYPE (camel_mh_folder_get_type ()) @@ -34,6 +30,8 @@ extern "C" { #define CAMEL_MH_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass)) #define CAMEL_IS_MH_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelLocalFolder parent_object; @@ -52,7 +50,6 @@ CamelFolder *camel_mh_folder_new(CamelStore *parent_store, const char *full_name /* Standard Camel function */ CamelType camel_mh_folder_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CAMEL_MH_FOLDER_H */ +G_END_DECLS + +#endif /* CAMEL_MH_FOLDER_H */ diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c index 9aaf4c3..8a22374 100644 --- a/camel/providers/local/camel-mh-store.c +++ b/camel/providers/local/camel-mh-store.c @@ -23,22 +23,22 @@ #include #endif -#include +#include #include #include #include -#include +#include + +#include -#include "camel-mh-store.h" -#include "camel-mh-folder.h" #include "camel-exception.h" -#include "camel-url.h" #include "camel-private.h" -#include "camel-i18n.h" - -#include -#include +#include "camel-stream-buffer.h" +#include "camel-stream-fs.h" +#include "camel-url.h" +#include "camel-mh-folder.h" +#include "camel-mh-store.h" #include "camel-mh-summary.h" static CamelLocalStoreClass *parent_class = NULL; diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h index 63b6277..86dbbfb 100644 --- a/camel/providers/local/camel-mh-store.h +++ b/camel/providers/local/camel-mh-store.h @@ -22,11 +22,6 @@ #ifndef CAMEL_MH_STORE_H #define CAMEL_MH_STORE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus } */ - #include "camel-local-store.h" #define CAMEL_MH_STORE_TYPE (camel_mh_store_get_type ()) @@ -34,6 +29,8 @@ extern "C" { #define CAMEL_MH_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass)) #define CAMEL_IS_MH_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_MH_STORE_TYPE)) +G_BEGIN_DECLS + enum { CAMEL_MH_DOTFOLDERS = (1<<0), /* update/use .folders file */ }; @@ -54,7 +51,6 @@ typedef struct { /* Standard Camel function */ CamelType camel_mh_store_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif /* CAMEL_MH_STORE_H */ +G_END_DECLS + +#endif /* CAMEL_MH_STORE_H */ diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c index 674ede1..9184eb5 100644 --- a/camel/providers/local/camel-mh-summary.c +++ b/camel/providers/local/camel-mh-summary.c @@ -22,24 +22,22 @@ #include #endif -#include -#include -#include - -#include +#include +#include #include -#include +#include #include +#include +#include +#include +#include -#include +#include -#include +#include "camel-mime-message.h" +#include "camel-private.h" #include "camel-mh-summary.h" -#include - -#include "camel-private.h" -#include "camel-i18n.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-mh-summary.h b/camel/providers/local/camel-mh-summary.h index c04b762..a5ba501 100644 --- a/camel/providers/local/camel-mh-summary.h +++ b/camel/providers/local/camel-mh-summary.h @@ -30,6 +30,8 @@ #define CAMEL_MH_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass) #define CAMEL_IS_MH_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_mh_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelMhSummary CamelMhSummary; typedef struct _CamelMhSummaryClass CamelMhSummaryClass; @@ -49,5 +51,6 @@ struct _CamelMhSummaryClass { CamelType camel_mh_summary_get_type (void); CamelMhSummary *camel_mh_summary_new(struct _CamelFolder *, const char *filename, const char *mhdir, CamelIndex *index); -#endif /* ! _CAMEL_MH_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_MH_SUMMARY_H */ diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c index 5d95a1b..0580d94 100644 --- a/camel/providers/local/camel-spool-folder.c +++ b/camel/providers/local/camel-spool-folder.c @@ -23,29 +23,31 @@ #include #endif -#include -#include #include -#include -#include #include -#include #include +#include +#include +#include +#include +#include + +#include -#include "camel-spool-folder.h" -#include "camel-spool-store.h" -#include "camel-stream-fs.h" -#include "camel-spool-summary.h" #include "camel-data-wrapper.h" -#include "camel-mime-message.h" -#include "camel-stream-filter.h" -#include "camel-mime-filter-from.h" #include "camel-exception.h" -#include "camel-session.h" #include "camel-file-utils.h" -#include "camel-lock-client.h" #include "camel-local-private.h" -#include "camel-i18n.h" +#include "camel-lock-client.h" +#include "camel-mime-filter-from.h" +#include "camel-mime-message.h" +#include "camel-session.h" +#include "camel-stream-filter.h" +#include "camel-stream-fs.h" + +#include "camel-spool-folder.h" +#include "camel-spool-store.h" +#include "camel-spool-summary.h" #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h index 9b9ca6a..7523eaf 100644 --- a/camel/providers/local/camel-spool-folder.h +++ b/camel/providers/local/camel-spool-folder.h @@ -22,11 +22,6 @@ #ifndef CAMEL_SPOOL_FOLDER_H #define CAMEL_SPOOL_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-mbox-folder.h" #include #include @@ -40,6 +35,8 @@ extern "C" { #define CAMEL_SPOOL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SPOOL_FOLDER_TYPE, CamelSpoolFolderClass)) #define CAMEL_IS_SPOOL_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_SPOOL_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct { CamelMboxFolder parent; @@ -57,8 +54,6 @@ CamelType camel_spool_folder_get_type(void); CamelFolder *camel_spool_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SPOOL_FOLDER_H */ diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c index 5452fe6..8e9e554 100644 --- a/camel/providers/local/camel-spool-store.c +++ b/camel/providers/local/camel-spool-store.c @@ -23,28 +23,31 @@ #include #endif +#include +#include +#include +#include +#include +#include +#include +#include + #ifdef HAVE_ALLOCA_H #include #endif -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include "camel-spool-store.h" -#include "camel-spool-folder.h" + #include "camel-exception.h" -#include "camel-url.h" +#include "camel-file-utils.h" #include "camel-private.h" -#include "camel-i18n.h" #include "camel-session.h" -#include "camel-file-utils.h" +#include "camel-url.h" + +#include "camel-spool-folder.h" +#include "camel-spool-store.h" #define d(x) diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h index 2dae133..4237ee6 100644 --- a/camel/providers/local/camel-spool-store.h +++ b/camel/providers/local/camel-spool-store.h @@ -23,12 +23,6 @@ #ifndef CAMEL_SPOOL_STORE_H #define CAMEL_SPOOL_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-mbox-store.h" #define CAMEL_SPOOL_STORE_TYPE (camel_spool_store_get_type ()) @@ -36,6 +30,8 @@ extern "C" { #define CAMEL_SPOOL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SPOOL_STORE_TYPE, CamelSpoolStoreClass)) #define CAMEL_IS_SPOOL_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_SPOOL_STORE_TYPE)) +G_BEGIN_DECLS + typedef enum _camel_spool_store_t { CAMEL_SPOOL_STORE_MBOX, /* a single mbox */ CAMEL_SPOOL_STORE_ELM, /* elm/pine/etc tree of mbox files in folders */ @@ -60,9 +56,7 @@ typedef struct { /* Standard Camel function */ CamelType camel_spool_store_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SPOOL_STORE_H */ diff --git a/camel/providers/local/camel-spool-summary.c b/camel/providers/local/camel-spool-summary.c index 0771956..5549cec 100644 --- a/camel/providers/local/camel-spool-summary.c +++ b/camel/providers/local/camel-spool-summary.c @@ -23,21 +23,22 @@ #include #endif -#include -#include -#include -#include +#include #include -#include +#include #include +#include +#include +#include +#include -#include +#include -#include "camel-spool-summary.h" -#include "camel-mime-message.h" #include "camel-file-utils.h" +#include "camel-mime-message.h" #include "camel-operation.h" -#include "camel-i18n.h" + +#include "camel-spool-summary.h" #define io(x) #define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/ diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h index 2f32ae9..6df241a 100644 --- a/camel/providers/local/camel-spool-summary.h +++ b/camel/providers/local/camel-spool-summary.h @@ -31,6 +31,8 @@ #define CAMEL_SPOOL_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_spool_summary_get_type (), CamelSpoolSummaryClass) #define CAMEL_IS_SPOOL_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_spool_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelSpoolSummary CamelSpoolSummary; typedef struct _CamelSpoolSummaryClass CamelSpoolSummaryClass; @@ -65,5 +67,6 @@ int camel_spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *x /* utility functions - write headers to a file with optional X-Evolution header */ int camel_spool_summary_write_headers(int fd, struct _camel_header_raw *header, char *xevline); -#endif /* ! _CAMEL_SPOOL_SUMMARY_H */ +G_END_DECLS +#endif /* ! _CAMEL_SPOOL_SUMMARY_H */ diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am index fc3cc4a..edabbdb 100644 --- a/camel/providers/nntp/Makefile.am +++ b/camel/providers/nntp/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = -I../.. \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(GTK_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-nntp-provider\" libcamelnntp_la_SOURCES = \ diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c index cd45748..959f173 100644 --- a/camel/providers/nntp/camel-nntp-auth.c +++ b/camel/providers/nntp/camel-nntp-auth.c @@ -25,11 +25,13 @@ #endif #include -#include -#include -#include -#include -#include + +#include "camel-exception.h" +#include "camel-session.h" + +#include "camel-nntp-auth.h" +#include "camel-nntp-store.h" +#include "camel-nntp-resp-codes.h" int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex) diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h index 12723de..1c815e4 100644 --- a/camel/providers/nntp/camel-nntp-auth.h +++ b/camel/providers/nntp/camel-nntp-auth.h @@ -28,15 +28,10 @@ #include -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ +G_BEGIN_DECLS int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NNTP_AUTH_H */ diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c index 6e533bf..9fd7293 100644 --- a/camel/providers/nntp/camel-nntp-folder.c +++ b/camel/providers/nntp/camel-nntp-folder.c @@ -25,36 +25,37 @@ #include #endif +#include #include #include -#include #include -#include +#include + +#include #include -#include "camel/camel-file-utils.h" -#include "camel/camel-stream-mem.h" + +#include "camel/camel-data-cache.h" #include "camel/camel-data-wrapper.h" -#include "camel/camel-mime-message.h" -#include "camel/camel-folder-search.h" #include "camel/camel-exception.h" -#include "camel/camel-session.h" -#include "camel/camel-data-cache.h" - +#include "camel/camel-file-utils.h" +#include "camel/camel-folder-search.h" #include "camel/camel-mime-filter-crlf.h" -#include "camel/camel-stream-filter.h" #include "camel/camel-mime-message.h" -#include "camel/camel-multipart.h" +#include "camel/camel-mime-message.h" #include "camel/camel-mime-part.h" -#include "camel/camel-stream-buffer.h" -#include "camel/camel-i18n.h" +#include "camel/camel-multipart.h" #include "camel/camel-private.h" +#include "camel/camel-session.h" +#include "camel/camel-stream-buffer.h" +#include "camel/camel-stream-filter.h" +#include "camel/camel-stream-mem.h" -#include "camel-nntp-summary.h" -#include "camel-nntp-store.h" #include "camel-nntp-folder.h" -#include "camel-nntp-store.h" #include "camel-nntp-private.h" +#include "camel-nntp-store.h" +#include "camel-nntp-store.h" +#include "camel-nntp-summary.h" static CamelFolderClass *folder_class = NULL; static CamelDiscoFolderClass *parent_class = NULL; diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h index 78f6af4..05af477 100644 --- a/camel/providers/nntp/camel-nntp-folder.h +++ b/camel/providers/nntp/camel-nntp-folder.h @@ -26,12 +26,6 @@ #ifndef CAMEL_NNTP_FOLDER_H #define CAMEL_NNTP_FOLDER_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel/camel-folder.h" #include "camel/camel-disco-folder.h" @@ -42,6 +36,8 @@ extern "C" { #define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass)) #define CAMEL_IS_NNTP_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct _CamelNNTPFolder { CamelDiscoFolder parent; @@ -68,8 +64,6 @@ CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, void camel_nntp_folder_selected(CamelNNTPFolder *folder, char *line, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NNTP_FOLDER_H */ diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c index e0c071f..a126842 100644 --- a/camel/providers/nntp/camel-nntp-grouplist.c +++ b/camel/providers/nntp/camel-nntp-grouplist.c @@ -21,14 +21,17 @@ * USA */ +#ifdef HAVE_CONFIG_H #include +#endif + #include #include #include #include -#include "camel/camel-exception.h" +#include "camel-exception.h" #include "camel-nntp-grouplist.h" #include "camel-nntp-resp-codes.h" diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h index f0ca95c..ff3053b 100644 --- a/camel/providers/nntp/camel-nntp-grouplist.h +++ b/camel/providers/nntp/camel-nntp-grouplist.h @@ -27,6 +27,8 @@ #include #include "camel-nntp-store.h" +G_BEGIN_DECLS + struct CamelNNTPGroupListEntry { char *group_name; guint32 low; @@ -48,4 +50,6 @@ gint camel_nntp_grouplist_update (struct CamelNNTPGroupLis void camel_nntp_grouplist_save (struct CamelNNTPGroupList *group_list, CamelException *ex); void camel_nntp_grouplist_free (struct CamelNNTPGroupList *group_list); +G_END_DECLS + #endif /* CAMEL_NNTP_GROUPLIST_H */ diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c index 8c9bc31..f975808 100644 --- a/camel/providers/nntp/camel-nntp-newsrc.c +++ b/camel/providers/nntp/camel-nntp-newsrc.c @@ -20,20 +20,22 @@ * */ +#ifndef HAVE_CONFIG_H #include +#endif +#include +#include +#include #include -#include #include -#include +#include #include -#include -#include #include #include -#include "camel/camel-folder-summary.h" +#include "camel-folder-summary.h" #include "camel-nntp-newsrc.h" diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h index 652e3ed..9feee1f 100644 --- a/camel/providers/nntp/camel-nntp-newsrc.h +++ b/camel/providers/nntp/camel-nntp-newsrc.h @@ -5,6 +5,8 @@ #include #include "glib.h" +G_BEGIN_DECLS + typedef struct CamelNNTPNewsrc CamelNNTPNewsrc; int camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name); @@ -29,6 +31,6 @@ void camel_nntp_newsrc_write_to_file (CamelNNTPNewsrc * void camel_nntp_newsrc_write (CamelNNTPNewsrc *newsrc); CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server (const char *server); -#endif /* _CAMEL_NNTP_NEWSRC_H_ */ - +G_END_DECLS +#endif /* _CAMEL_NNTP_NEWSRC_H_ */ diff --git a/camel/providers/nntp/camel-nntp-private.h b/camel/providers/nntp/camel-nntp-private.h index 86d5422..657d4c9 100644 --- a/camel/providers/nntp/camel-nntp-private.h +++ b/camel/providers/nntp/camel-nntp-private.h @@ -23,11 +23,6 @@ #ifndef CAMEL_NNTP_PRIVATE_H #define CAMEL_NNTP_PRIVATE_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - /* need a way to configure and save this data, if this header is to be installed. For now, dont install it */ @@ -35,7 +30,9 @@ extern "C" { #include #endif -#include "libedataserver/e-msgport.h" +#include + +G_BEGIN_DECLS struct _CamelNNTPStorePrivate { int dummy; @@ -56,9 +53,6 @@ struct _CamelNNTPFolderPrivate { #define CAMEL_NNTP_FOLDER_LOCK(f, l) #define CAMEL_NNTP_FOLDER_UNLOCK(f, l) -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NNTP_PRIVATE_H */ - diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c index 66ff4d2..0d23ef0 100644 --- a/camel/providers/nntp/camel-nntp-provider.c +++ b/camel/providers/nntp/camel-nntp-provider.c @@ -27,10 +27,12 @@ #endif #include + +#include + #include "camel-nntp-store.h" #include "camel-provider.h" #include "camel-session.h" -#include "camel-i18n.h" static void add_hash (guint *hash, char *s); static guint nntp_url_hash (gconstpointer key); diff --git a/camel/providers/nntp/camel-nntp-store-summary.c b/camel/providers/nntp/camel-nntp-store-summary.c index a7bb7fe..98adc24 100644 --- a/camel/providers/nntp/camel-nntp-store-summary.c +++ b/camel/providers/nntp/camel-nntp-store-summary.c @@ -23,22 +23,21 @@ #include #endif -#include #include -#include #include #include +#include +#include -#include "camel-nntp-store-summary.h" +#include +#include #include "camel-file-utils.h" - -#include "libedataserver/md5-utils.h" -#include "libedataserver/e-memory.h" - #include "camel-private.h" #include "camel-utf8.h" +#include "camel-nntp-store-summary.h" + #define d(x) #define io(x) /* io debug */ diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h index 232bdc9..3d2f0b4 100644 --- a/camel/providers/nntp/camel-nntp-store-summary.h +++ b/camel/providers/nntp/camel-nntp-store-summary.h @@ -25,11 +25,6 @@ #ifndef _CAMEL_NNTP_STORE_SUMMARY_H #define _CAMEL_NNTP_STORE_SUMMARY_H -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include @@ -37,6 +32,8 @@ extern "C" { #define CAMEL_NNTP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_store_summary_get_type (), CamelNNTPStoreSummaryClass) #define CAMEL_IS_NNTP_STORE_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_nntp_store_summary_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelNNTPStoreSummary CamelNNTPStoreSummary; typedef struct _CamelNNTPStoreSummaryClass CamelNNTPStoreSummaryClass; @@ -94,9 +91,6 @@ CamelNNTPStoreInfo *camel_nntp_store_summary_add_from_full(CamelNNTPStoreSummary /* a convenience lookup function. always use this if path known */ char *camel_nntp_store_summary_full_from_path(CamelNNTPStoreSummary *s, const char *path); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* ! _CAMEL_NNTP_STORE_SUMMARY_H */ diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c index 2b9b302..d50c799 100644 --- a/camel/providers/nntp/camel-nntp-store.c +++ b/camel/providers/nntp/camel-nntp-store.c @@ -25,26 +25,27 @@ #include #endif +#include #include #include #include -#include #include -#include - -#include -#include -#include -#include -#include +#include -#include -#include +#include -#include -#include +#include "camel/camel-data-cache.h" +#include "camel/camel-debug.h" +#include "camel/camel-disco-diary.h" +#include "camel/camel-disco-store.h" +#include "camel/camel-net-utils.h" #include "camel/camel-private.h" -#include +#include "camel/camel-session.h" +#include "camel/camel-stream-mem.h" +#include "camel/camel-string-utils.h" +#include "camel/camel-tcp-stream-raw.h" +#include "camel/camel-tcp-stream-ssl.h" +#include "camel/camel-url.h" #include "camel-nntp-summary.h" #include "camel-nntp-store.h" @@ -52,8 +53,6 @@ #include "camel-nntp-folder.h" #include "camel-nntp-private.h" #include "camel-nntp-resp-codes.h" -#include "camel-i18n.h" -#include "camel-net-utils.h" #define w(x) #define dd(x) (camel_debug("nntp")?(x):0) diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h index 04b452a..9a63239 100644 --- a/camel/providers/nntp/camel-nntp-store.h +++ b/camel/providers/nntp/camel-nntp-store.h @@ -24,20 +24,11 @@ #ifndef CAMEL_NNTP_STORE_H #define CAMEL_NNTP_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include #include "camel-nntp-stream.h" #include "camel-nntp-store-summary.h" -struct _CamelNNTPFolder; -struct _CamelException; - #define CAMEL_NNTP_STORE_TYPE (camel_nntp_store_get_type ()) #define CAMEL_NNTP_STORE(obj) (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore)) #define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass)) @@ -52,6 +43,11 @@ struct _CamelException; #define CAMEL_NNTP_EXT_LISTSUBSCR (1<<6) #define CAMEL_NNTP_EXT_LISTPNAMES (1<<7) +G_BEGIN_DECLS + +struct _CamelNNTPFolder; +struct _CamelException; + typedef struct _CamelNNTPStore CamelNNTPStore; typedef struct _CamelNNTPStoreClass CamelNNTPStoreClass; @@ -105,9 +101,7 @@ int camel_nntp_raw_command(CamelNNTPStore *store, struct _CamelException *ex, ch int camel_nntp_raw_command_auth(CamelNNTPStore *store, struct _CamelException *ex, char **line, const char *fmt, ...); int camel_nntp_command (CamelNNTPStore *store, struct _CamelException *ex, struct _CamelNNTPFolder *folder, char **line, const char *fmt, ...); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NNTP_STORE_H */ diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c index 6951faa..4360ef0 100644 --- a/camel/providers/nntp/camel-nntp-stream.c +++ b/camel/providers/nntp/camel-nntp-stream.c @@ -25,15 +25,15 @@ #endif #include - -#include #include +#include #include -#include "camel-nntp-stream.h" #include "camel-debug.h" +#include "camel-nntp-stream.h" + #define dd(x) (camel_debug("nntp:stream")?(x):0) #ifndef ECONNRESET diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h index f71ed69..53b94f2 100644 --- a/camel/providers/nntp/camel-nntp-stream.h +++ b/camel/providers/nntp/camel-nntp-stream.h @@ -27,6 +27,8 @@ #define CAMEL_NNTP_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_stream_get_type (), CamelNNTPStreamClass) #define CAMEL_IS_NNTP_STREAM(obj) CAMEL_CHECK_TYPE (obj, camel_nntp_stream_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelNNTPStreamClass CamelNNTPStreamClass; typedef struct _CamelNNTPStream CamelNNTPStream; @@ -63,4 +65,6 @@ int camel_nntp_stream_line (CamelNNTPStream *is, unsigned char **d int camel_nntp_stream_gets (CamelNNTPStream *is, unsigned char **start, unsigned int *len); int camel_nntp_stream_getd (CamelNNTPStream *is, unsigned char **start, unsigned int *len); +G_END_DECLS + #endif /* ! _CAMEL_NNTP_STREAM_H */ diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c index 11589fe..4fa9e30 100644 --- a/camel/providers/nntp/camel-nntp-summary.c +++ b/camel/providers/nntp/camel-nntp-summary.c @@ -24,24 +24,25 @@ #endif #include -#include -#include #include -#include #include +#include +#include +#include +#include + +#include "camel/camel-data-cache.h" +#include "camel/camel-debug.h" #include "camel/camel-file-utils.h" #include "camel/camel-mime-message.h" -#include "camel/camel-stream-null.h" #include "camel/camel-operation.h" -#include "camel/camel-data-cache.h" -#include "camel/camel-i18n.h" -#include "camel/camel-debug.h" +#include "camel/camel-stream-null.h" -#include "camel-nntp-summary.h" #include "camel-nntp-folder.h" #include "camel-nntp-store.h" #include "camel-nntp-stream.h" +#include "camel-nntp-summary.h" #define w(x) #define io(x) diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h index 99be9f9..dce362d 100644 --- a/camel/providers/nntp/camel-nntp-summary.h +++ b/camel/providers/nntp/camel-nntp-summary.h @@ -23,14 +23,16 @@ #include -struct _CamelNNTPStore; -struct _CamelFolderChangeInfo; -struct _CamelException; - #define CAMEL_NNTP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary) #define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass) #define CAMEL_IS_LOCAL_SUMMARY(obj) CAMEL_CHECK_TYPE (obj, camel_nntp_summary_get_type ()) +G_BEGIN_DECLS + +struct _CamelNNTPStore; +struct _CamelFolderChangeInfo; +struct _CamelException; + typedef struct _CamelNNTPSummary CamelNNTPSummary; typedef struct _CamelNNTPSummaryClass CamelNNTPSummaryClass; @@ -52,5 +54,7 @@ CamelNNTPSummary *camel_nntp_summary_new(struct _CamelFolder *folder, const char int camel_nntp_summary_check(CamelNNTPSummary *cns, struct _CamelNNTPStore *store, char *line, struct _CamelFolderChangeInfo *changes, struct _CamelException *ex); +G_END_DECLS + #endif /* ! _CAMEL_NNTP_SUMMARY_H */ diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h index 01fb346..bba13db 100644 --- a/camel/providers/nntp/camel-nntp-types.h +++ b/camel/providers/nntp/camel-nntp-types.h @@ -24,10 +24,14 @@ #ifndef CAMEL_NNTP_TYPES_H #define CAMEL_NNTP_TYPES_H 1 +G_BEGIN_DECLS + typedef struct CamelNNTPGroupList CamelNNTPGroupList; typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry; typedef struct CamelNNTPOverField CamelNNTPOverField; typedef struct CamelNNTPStore CamelNNTPStore; typedef struct CamelNNTPStoreClass CamelNNTPStoreClass; +G_END_DECLS + #endif /* CAMEL_NNTP_TYPES_H */ diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c index e85456f..237bc36 100644 --- a/camel/providers/nntp/camel-nntp-utils.c +++ b/camel/providers/nntp/camel-nntp-utils.c @@ -21,18 +21,19 @@ * USA */ +#include +#include + +#include + #include "camel-folder-summary.h" +#include "camel-stream-mem.h" +#include "camel-exception.h" + #include "camel-nntp-resp-codes.h" #include "camel-nntp-folder.h" #include "camel-nntp-store.h" #include "camel-nntp-utils.h" -#include "camel-stream-mem.h" -#include "camel-exception.h" - -#include "libedataserver/md5-utils.h" - -#include -#include static void get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder, diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h index 36b801a..0fe4af8 100644 --- a/camel/providers/nntp/camel-nntp-utils.h +++ b/camel/providers/nntp/camel-nntp-utils.h @@ -26,16 +26,10 @@ #ifndef CAMEL_NNTP_UTILS_H #define CAMEL_NNTP_UTILS_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ +G_BEGIN_DECLS void camel_nntp_get_headers (CamelStore *store, CamelNNTPFolder *nntp_folder, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_NNTP_UTILS_H */ diff --git a/camel/providers/pop3/Makefile.am b/camel/providers/pop3/Makefile.am index f19e3d2..fe8bc33 100644 --- a/camel/providers/pop3/Makefile.am +++ b/camel/providers/pop3/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/camel \ $(CAMEL_CFLAGS) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-pop3-provider\" libcamelpop3_la_SOURCES = \ diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c index 0362100..e82e443 100644 --- a/camel/providers/pop3/camel-pop3-engine.c +++ b/camel/providers/pop3/camel-pop3-engine.c @@ -25,17 +25,16 @@ #endif #include - -#include #include +#include #include +#include #include "camel-pop3-engine.h" #include "camel-pop3-stream.h" -#include "camel-service.h" #include "camel-sasl.h" -#include "camel-i18n.h" +#include "camel-service.h" /* max 'outstanding' bytes in output stream, so we can't deadlock waiting for the server to accept our data when pipelining */ diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h index e97a7f4..3f8157f 100644 --- a/camel/providers/pop3/camel-pop3-engine.h +++ b/camel/providers/pop3/camel-pop3-engine.h @@ -22,13 +22,15 @@ #define _CAMEL_POP3_ENGINE_H #include -#include "libedataserver/e-msgport.h" +#include #include "camel-pop3-stream.h" #define CAMEL_POP3_ENGINE(obj) CAMEL_CHECK_CAST (obj, camel_pop3_engine_get_type (), CamelPOP3Engine) #define CAMEL_POP3_ENGINE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_pop3_engine_get_type (), CamelPOP3EngineClass) #define CAMEL_IS_POP3_ENGINE(obj) CAMEL_CHECK_TYPE (obj, camel_pop3_engine_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelPOP3EngineClass CamelPOP3EngineClass; typedef struct _CamelPOP3Engine CamelPOP3Engine; typedef struct _CamelPOP3Command CamelPOP3Command; @@ -131,4 +133,6 @@ int camel_pop3_engine_iterate (CamelPOP3Engine *pe, CamelPOP3Command *pc); CamelPOP3Command *camel_pop3_engine_command_new (CamelPOP3Engine *pe, guint32 flags, CamelPOP3CommandFunc func, void *data, const char *fmt, ...); +G_END_DECLS + #endif /* ! _CAMEL_POP3_ENGINE_H */ diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c index 69dbdf2..e8bd59b 100644 --- a/camel/providers/pop3/camel-pop3-folder.c +++ b/camel/providers/pop3/camel-pop3-folder.c @@ -28,21 +28,21 @@ #endif #include +#include +#include -#include "camel-pop3-folder.h" -#include "camel-pop3-store.h" -#include "camel-exception.h" -#include "camel-stream-mem.h" -#include "camel-stream-filter.h" -#include "camel-mime-message.h" -#include "camel-operation.h" -#include "camel-data-cache.h" -#include "camel-i18n.h" +#include #include -#include -#include +#include "camel-data-cache.h" +#include "camel-exception.h" +#include "camel-mime-message.h" +#include "camel-operation.h" +#include "camel-pop3-folder.h" +#include "camel-pop3-store.h" +#include "camel-stream-filter.h" +#include "camel-stream-mem.h" #define d(x) diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h index aa8e573..67b55f8 100644 --- a/camel/providers/pop3/camel-pop3-folder.h +++ b/camel/providers/pop3/camel-pop3-folder.h @@ -26,11 +26,6 @@ #ifndef CAMEL_POP3_FOLDER_H #define CAMEL_POP3_FOLDER_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-folder.h" #define CAMEL_POP3_FOLDER_TYPE (camel_pop3_folder_get_type ()) @@ -38,6 +33,8 @@ extern "C" { #define CAMEL_POP3_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPOP3FolderClass)) #define CAMEL_IS_POP3_FOLDER(o) (CAMEL_CHECK_TYPE((o), CAMEL_POP3_FOLDER_TYPE)) +G_BEGIN_DECLS + typedef struct { guint32 id; guint32 size; @@ -72,8 +69,6 @@ CamelType camel_pop3_folder_get_type (void); int camel_pop3_delete_old(CamelFolder *folder, int days_to_delete, CamelException *ex); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_POP3_FOLDER_H */ diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c index fcc159a..23890f2 100644 --- a/camel/providers/pop3/camel-pop3-provider.c +++ b/camel/providers/pop3/camel-pop3-provider.c @@ -27,12 +27,13 @@ #include #endif +#include + #include "camel-pop3-store.h" #include "camel-provider.h" +#include "camel-sasl.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-sasl.h" -#include "camel-i18n.h" static CamelProviderConfEntry pop3_conf_entries[] = { diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index ce02b55..12352ca 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -27,33 +27,34 @@ #include #endif -#include #include #include #include #include #include -#include +#include -#include "camel-operation.h" +#include -#include "camel-pop3-store.h" -#include "camel-pop3-folder.h" -#include "camel-stream-buffer.h" -#include "camel-session.h" +#include + +#include "camel-data-cache.h" #include "camel-exception.h" -#include "camel-url.h" -#include "libedataserver/md5-utils.h" +#include "camel-net-utils.h" +#include "camel-operation.h" #include "camel-pop3-engine.h" +#include "camel-pop3-folder.h" +#include "camel-pop3-store.h" #include "camel-sasl.h" -#include "camel-data-cache.h" -#include "camel-tcp-stream.h" +#include "camel-session.h" +#include "camel-stream-buffer.h" #include "camel-tcp-stream-raw.h" +#include "camel-tcp-stream.h" +#include "camel-url.h" + #ifdef HAVE_SSL #include "camel-tcp-stream-ssl.h" #endif -#include "camel-i18n.h" -#include "camel-net-utils.h" /* Specified in RFC 1939 */ #define POP3_PORT "110" diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h index 6e2e846..06f93f6 100644 --- a/camel/providers/pop3/camel-pop3-store.h +++ b/camel/providers/pop3/camel-pop3-store.h @@ -27,12 +27,6 @@ #ifndef CAMEL_POP3_STORE_H #define CAMEL_POP3_STORE_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include #include #include "camel-pop3-engine.h" @@ -42,6 +36,7 @@ extern "C" { #define CAMEL_POP3_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPOP3StoreClass)) #define CAMEL_IS_POP3_STORE(o) (CAMEL_CHECK_TYPE((o), CAMEL_POP3_STORE_TYPE)) +G_BEGIN_DECLS typedef struct { CamelStore parent_object; @@ -72,9 +67,7 @@ char *camel_pop3_command_get_additional_data (CamelPOP3Store *store, int total, /* Standard Camel function */ CamelType camel_pop3_store_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_POP3_STORE_H */ diff --git a/camel/providers/pop3/camel-pop3-stream.c b/camel/providers/pop3/camel-pop3-stream.c index 238725c..d755992 100644 --- a/camel/providers/pop3/camel-pop3-stream.c +++ b/camel/providers/pop3/camel-pop3-stream.c @@ -29,9 +29,8 @@ #endif #include - -#include #include +#include #include diff --git a/camel/providers/pop3/camel-pop3-stream.h b/camel/providers/pop3/camel-pop3-stream.h index 9d47497..eca771b 100644 --- a/camel/providers/pop3/camel-pop3-stream.h +++ b/camel/providers/pop3/camel-pop3-stream.h @@ -30,6 +30,8 @@ #define CAMEL_POP3_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_pop3_stream_get_type (), CamelPOP3StreamClass) #define CAMEL_IS_POP3_STREAM(obj) CAMEL_CHECK_TYPE (obj, camel_pop3_stream_get_type ()) +G_BEGIN_DECLS + typedef struct _CamelPOP3StreamClass CamelPOP3StreamClass; typedef struct _CamelPOP3Stream CamelPOP3Stream; @@ -66,4 +68,6 @@ int camel_pop3_stream_line (CamelPOP3Stream *is, unsigned char **d int camel_pop3_stream_gets (CamelPOP3Stream *is, unsigned char **start, unsigned int *len); int camel_pop3_stream_getd (CamelPOP3Stream *is, unsigned char **start, unsigned int *len); +G_END_DECLS + #endif /* ! _CAMEL_POP3_STREAM_H */ diff --git a/camel/providers/sendmail/Makefile.am b/camel/providers/sendmail/Makefile.am index c773cb4..46e3613 100644 --- a/camel/providers/sendmail/Makefile.am +++ b/camel/providers/sendmail/Makefile.am @@ -12,7 +12,6 @@ INCLUDES = \ $(CAMEL_CFLAGS) \ $(GNOME_INCLUDEDIR) \ $(GTK_INCLUDEDIR) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-sendmail-provider\" libcamelsendmail_la_SOURCES = \ diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c index c2347b2..0073e17 100644 --- a/camel/providers/sendmail/camel-sendmail-provider.c +++ b/camel/providers/sendmail/camel-sendmail-provider.c @@ -26,11 +26,12 @@ #include #endif +#include + #include "camel-provider.h" #include "camel-sendmail-transport.h" #include "camel-session.h" #include "camel-url.h" -#include "camel-i18n.h" static CamelProvider sendmail_provider = { "sendmail", diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c index 9bd90e2..422386f 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.c +++ b/camel/providers/sendmail/camel-sendmail-transport.c @@ -29,18 +29,19 @@ #include #include #include -#include -#include #include +#include +#include -#include "camel-sendmail-transport.h" +#include + +#include "camel-data-wrapper.h" +#include "camel-exception.h" #include "camel-mime-filter-crlf.h" -#include "camel-stream-filter.h" #include "camel-mime-message.h" -#include "camel-data-wrapper.h" +#include "camel-sendmail-transport.h" +#include "camel-stream-filter.h" #include "camel-stream-fs.h" -#include "camel-exception.h" -#include "camel-i18n.h" static char *get_name (CamelService *service, gboolean brief); diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h index 5bdda8e..33f8540 100644 --- a/camel/providers/sendmail/camel-sendmail-transport.h +++ b/camel/providers/sendmail/camel-sendmail-transport.h @@ -27,12 +27,6 @@ #ifndef CAMEL_SENDMAIL_TRANSPORT_H #define CAMEL_SENDMAIL_TRANSPORT_H 1 - -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus }*/ - #include "camel-transport.h" #define CAMEL_SENDMAIL_TRANSPORT_TYPE (camel_sendmail_transport_get_type ()) @@ -40,6 +34,7 @@ extern "C" { #define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass)) #define CAMEL_IS_SENDMAIL_TRANSPORT(o) (CAMEL_CHECK_TYPE((o), CAMEL_SENDMAIL_TRANSPORT_TYPE)) +G_BEGIN_DECLS typedef struct { CamelTransport parent_object; @@ -56,8 +51,6 @@ typedef struct { /* Standard Camel function */ CamelType camel_sendmail_transport_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SENDMAIL_TRANSPORT_H */ diff --git a/camel/providers/smtp/Makefile.am b/camel/providers/smtp/Makefile.am index 98fef9f..a89b967 100644 --- a/camel/providers/smtp/Makefile.am +++ b/camel/providers/smtp/Makefile.am @@ -8,7 +8,6 @@ INCLUDES = \ -I$(top_srcdir)/intl \ -I$(top_srcdir)/camel \ $(CAMEL_CFLAGS) \ - -DCAMEL_EXPLICIT_TRANSLATION_DOMAIN=\"$(GETTEXT_PACKAGE)\" \ -DG_LOG_DOMAIN=\"camel-smtp-provider\" libcamelsmtp_la_SOURCES = \ diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c index 186e7f8..5130f06 100644 --- a/camel/providers/smtp/camel-smtp-provider.c +++ b/camel/providers/smtp/camel-smtp-provider.c @@ -26,12 +26,13 @@ #include #endif -#include "camel-smtp-transport.h" +#include + #include "camel-provider.h" +#include "camel-sasl.h" #include "camel-session.h" +#include "camel-smtp-transport.h" #include "camel-url.h" -#include "camel-sasl.h" -#include "camel-i18n.h" static CamelProvider smtp_provider = { "smtp", diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c index d20f048..80f1f12 100644 --- a/camel/providers/smtp/camel-smtp-transport.c +++ b/camel/providers/smtp/camel-smtp-transport.c @@ -26,34 +26,38 @@ #include #endif -#include -#include +#include #include #include #include #include -#include #include +#include +#include + +#include + #undef MIN #undef MAX + +#include "camel-exception.h" #include "camel-mime-filter-crlf.h" -#include "camel-stream-filter.h" -#include "camel-smtp-transport.h" #include "camel-mime-message.h" -#include "camel-multipart.h" #include "camel-mime-part.h" +#include "camel-multipart.h" +#include "camel-net-utils.h" #include "camel-operation.h" +#include "camel-sasl.h" +#include "camel-session.h" +#include "camel-smtp-transport.h" #include "camel-stream-buffer.h" -#include "camel-tcp-stream.h" +#include "camel-stream-filter.h" #include "camel-tcp-stream-raw.h" +#include "camel-tcp-stream.h" + #ifdef HAVE_SSL #include "camel-tcp-stream-ssl.h" #endif -#include "camel-session.h" -#include "camel-exception.h" -#include "camel-sasl.h" -#include "camel-i18n.h" -#include "camel-net-utils.h" extern int camel_verbose_debug; #define d(x) (camel_verbose_debug ? (x) : 0) @@ -762,7 +766,7 @@ smtp_next_token (const char *buf) #define HEXVAL(c) (isdigit (c) ? (c) - '0' : (c) - 'A' + 10) -/** +/* * example (rfc2034): * 5.1.1 Mailbox "nosuchuser" does not exist * @@ -783,7 +787,7 @@ smtp_next_token (const char *buf) * * hexchar = ASCII "+" immediately followed by two upper case * hexadecimal digits - **/ + */ static char * smtp_decode_status_code (const char *in, size_t len) { diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h index fd674ae..2092631 100644 --- a/camel/providers/smtp/camel-smtp-transport.h +++ b/camel/providers/smtp/camel-smtp-transport.h @@ -25,11 +25,6 @@ #ifndef CAMEL_SMTP_TRANSPORT_H #define CAMEL_SMTP_TRANSPORT_H 1 -#ifdef __cplusplus -extern "C" { -#pragma } -#endif /* __cplusplus */ - #include "camel-transport.h" #include "camel-tcp-stream.h" @@ -45,6 +40,8 @@ extern "C" { #define CAMEL_SMTP_TRANSPORT_AUTH_EQUAL (1 << 4) /* set if we are using authtypes from a broken AUTH= */ +G_BEGIN_DECLS + typedef struct { CamelTransport parent_object; @@ -67,8 +64,6 @@ typedef struct { /* Standard Camel function */ CamelType camel_smtp_transport_get_type (void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ +G_END_DECLS #endif /* CAMEL_SMTP_TRANSPORT_H */ diff --git a/configure.in b/configure.in index e2d3800..986dfda 100644 --- a/configure.in +++ b/configure.in @@ -1257,7 +1257,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUA AC_SUBST(E_DATA_SERVER_CFLAGS) AC_SUBST(E_DATA_SERVER_LIBS) -E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0 $GNOME_KEYRING_REQUIREMENT" +E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0 gnome-vfs-2.0 $GNOME_KEYRING_REQUIREMENT" EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS) AC_SUBST(E_DATA_SERVER_UI_CFLAGS) @@ -1493,6 +1493,7 @@ docs/reference/addressbook/libedata-book/Makefile docs/reference/calendar/Makefile docs/reference/calendar/libecal/Makefile docs/reference/calendar/libedata-cal/Makefile +docs/reference/camel/Makefile docs/reference/libedataserver/Makefile docs/reference/libedataserverui/Makefile po/Makefile.in diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 689ef9f..337803b 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = addressbook calendar libedataserver libedataserverui +SUBDIRS = addressbook calendar camel libedataserver libedataserverui MKDB_OPTIONS=--output-format=xml diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-marshal.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-marshal.sgml index 46a0312..f87ce9a 100644 --- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-marshal.sgml +++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-marshal.sgml @@ -17,3 +17,31 @@ e-data-book-marshal + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml index a05dc9e..4d621db 100644 --- a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml +++ b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml @@ -134,27 +134,3 @@ e-data-book-types - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/docs/reference/camel/Makefile.am b/docs/reference/camel/Makefile.am index 0d93d06..8bcafe3 100644 --- a/docs/reference/camel/Makefile.am +++ b/docs/reference/camel/Makefile.am @@ -18,7 +18,7 @@ HTML_IMAGES = #TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE_VERSIONED) # Extra options to supply to gtkdoc-scan -#SCAN_OPTIONS = --deprecated-guards="" +SCAN_OPTIONS = --deprecated-guards="CAMEL_DISABLE_DEPRECATED" # Extra options to pass to gtkdoc-scangobj SCANGOBJ_OPTIONS=--type-init-func="camel_init (\".\", 0)" @@ -51,9 +51,17 @@ CFILE_GLOB=$(top_srcdir)/camel/*.c # Header files to ignore when scanning IGNORE_HFILES = \ - camel-charset-map-private.h \ broken-date-parser.h \ - camel-private.h + camel-charset-map-private.h \ + camel-private.h \ + camel-search-private.h \ + camel-types.h \ + camel-groupwise-private.h \ + camel-imap-private.h \ + camel-imap-types.h \ + camel-local-private.h \ + camel-nntp-private.h \ + camel-nntp-types.h # Extra options to supply to gtkdoc-fixref FIXXREF_OPTIONS = diff --git a/docs/reference/camel/camel-docs.sgml b/docs/reference/camel/camel-docs.sgml index f7ed474..3b692ac 100644 --- a/docs/reference/camel/camel-docs.sgml +++ b/docs/reference/camel/camel-docs.sgml @@ -36,6 +36,7 @@ + @@ -43,6 +44,7 @@ + @@ -79,6 +81,7 @@ + @@ -161,6 +164,7 @@ &CamelStreamFs; &CamelStreamMem; &CamelStreamNull; + &CamelStreamVFS; &CamelTcpStream; &CamelTcpStreamRaw; &CamelTcpStreamSSL; @@ -178,6 +182,7 @@ &CamelMIMEFilterFrom; &CamelMIMEFilterHTML; &CamelMIMEFilterIndex; + &CamelMIMEFilterPgp; &CamelMIMEFilterSave; &CamelMIMEFilterToHTML; &CamelMIMEFilterWindows; @@ -239,5 +244,9 @@ &CamelMIMEMessage; &CamelMIMEParser; + + + Index + diff --git a/docs/reference/camel/camel-sections.txt b/docs/reference/camel/camel-sections.txt index d58733a..0f49420 100644 --- a/docs/reference/camel/camel-sections.txt +++ b/docs/reference/camel/camel-sections.txt @@ -1,7 +1,7 @@
camel-address -CamelAddress CamelAddress +CamelAddress camel_address_new camel_address_new_clone camel_address_length @@ -15,16 +15,58 @@ camel_address_remove CAMEL_ADDRESS CAMEL_IS_ADDRESS -camel_address_get_type CAMEL_ADDRESS_CLASS +CamelAddressClass + +camel_address_get_type +
+ +
+camel-block-file +CamelBlockFile +CamelKeyFile +camel_block_t +camel_key_t +CamelBlockRoot +CamelBlock +CamelBlockFile +CAMEL_BLOCK_FILE_SYNC +CAMEL_BLOCK_SIZE +CAMEL_BLOCK_SIZE_BITS +CAMEL_BLOCK_DIRTY +CAMEL_BLOCK_DETACHED +camel_block_file_new +camel_block_file_rename +camel_block_file_delete +camel_block_file_new_block +camel_block_file_free_block +camel_block_file_get_block +camel_block_file_detach_block +camel_block_file_attach_block +camel_block_file_touch_block +camel_block_file_unref_block +camel_block_file_sync_block +camel_block_file_sync +CamelKeyFile +camel_key_file_new +camel_key_file_rename +camel_key_file_delete +camel_key_file_write +camel_key_file_read + +CamelBlockFileClass +CamelKeyFileClass + +camel_block_file_get_type +camel_key_file_get_type
camel-certdb +CamelCertDB CamelCertDB CamelCertTrust CamelCert -CamelCertDB camel_certdb_new camel_certdb_set_default camel_certdb_get_default @@ -55,12 +97,15 @@ camel_cert_set_trust CAMEL_CERTDB CAMEL_IS_CERTDB CAMEL_CERTDB_TYPE -camel_certdb_get_type CAMEL_CERTDB_CLASS +CamelCertDBClass + +camel_certdb_get_type
camel-cipher-context +CamelCipherContext CamelCipherContext CamelCipherValidity CamelCipherCertInfo @@ -68,7 +113,6 @@ CamelCipherHash camel_cipher_validity_sign_t camel_cipher_validity_encrypt_t camel_cipher_validity_mode_t -CamelCipherContext camel_cipher_context_new camel_cipher_context_construct camel_cipher_id_to_hash @@ -95,14 +139,16 @@ camel_cipher_canonical_to_stream CAMEL_CIPHER_CONTEXT CAMEL_IS_CIPHER_CONTEXT CAMEL_CIPHER_CONTEXT_TYPE -camel_cipher_context_get_type CAMEL_CIPHER_CONTEXT_CLASS +CamelCipherContextClass + +camel_cipher_context_get_type
camel-data-cache -CamelDataCache CamelDataCache +CamelDataCache camel_data_cache_new camel_data_cache_set_expire_age camel_data_cache_set_expire_access @@ -115,14 +161,16 @@ camel_data_cache_clear CAMEL_DATA_CACHE CAMEL_IS_DATA_CACHE CAMEL_DATA_CACHE_TYPE -camel_data_cache_get_type CAMEL_DATA_CACHE_CLASS +CamelDataCacheClass + +camel_data_cache_get_type
camel-data-wrapper -CamelDataWrapper CamelDataWrapper +CamelDataWrapper camel_data_wrapper_new camel_data_wrapper_write_to_stream camel_data_wrapper_decode_to_stream @@ -136,52 +184,60 @@ camel_data_wrapper_is_offline CAMEL_DATA_WRAPPER CAMEL_IS_DATA_WRAPPER CAMEL_DATA_WRAPPER_TYPE -camel_data_wrapper_get_type CAMEL_DATA_WRAPPER_CLASS +CamelDataWrapperClass + +camel_data_wrapper_get_type
camel-digest-folder -CamelDigestFolder CamelDigestFolder +CamelDigestFolder camel_digest_folder_new CAMEL_DIGEST_FOLDER CAMEL_IS_DIGEST_FOLDER -camel_digest_folder_get_type CAMEL_DIGEST_FOLDER_CLASS +CamelDigestFolderClass + +camel_digest_folder_get_type
camel-digest-store -CamelDigestStore CamelDigestStore +CamelDigestStore camel_digest_store_new CAMEL_DIGEST_STORE CAMEL_IS_DIGEST_STORE -camel_digest_store_get_type CAMEL_DIGEST_STORE_CLASS +CamelDigestStoreClass + +camel_digest_store_get_type
camel-digest-summary -CamelDigestSummary CamelDigestSummary +CamelDigestSummary camel_digest_summary_new CAMEL_DIGEST_SUMMARY CAMEL_IS_DIGEST_SUMMARY -camel_digest_summary_get_type CAMEL_DIGEST_SUMMARY_CLASS +CamelDigestSummaryClass + +camel_digest_summary_get_type
camel-disco-diary +CamelDiscoDiary CamelDiscoDiary CamelDiscoDiaryAction CamelDiscoDiaryArgType -CamelDiscoDiary camel_disco_diary_new camel_disco_diary_empty camel_disco_diary_log @@ -192,14 +248,16 @@ camel_disco_diary_uidmap_lookup CAMEL_DISCO_DIARY CAMEL_IS_DISCO_DIARY CAMEL_DISCO_DIARY_TYPE -camel_disco_diary_get_type CAMEL_DISCO_DIARY_CLASS +CamelDiscoDiaryClass + +camel_disco_diary_get_type
camel-disco-folder -CamelDiscoFolder CamelDiscoFolder +CamelDiscoFolder camel_disco_folder_expunge_uids camel_disco_folder_cache_message camel_disco_folder_prepare_for_offline @@ -207,14 +265,16 @@ camel_disco_folder_prepare_for_offline CAMEL_DISCO_FOLDER CAMEL_IS_DISCO_FOLDER CAMEL_DISCO_FOLDER_TYPE -camel_disco_folder_get_type CAMEL_DISCO_FOLDER_CLASS +CamelDiscoFolderClass + +camel_disco_folder_get_type
camel-filter-driver -CamelFilterDriver CamelFilterDriver +CamelFilterDriver CamelFilterGetFolderFunc camel_filter_driver_new camel_filter_driver_set_logfile @@ -236,14 +296,93 @@ camel_filter_driver_rule_count CAMEL_FILTER_DRIVER CAMEL_IS_FILTER_DRIVER CAMEL_FILTER_DRIVER_TYPE -camel_filter_driver_get_type CAMEL_FILTER_DRIVER_CLASS +CamelFilterDriverClass + +camel_filter_driver_get_type +
+ +
+camel-folder +CamelFolder +CamelFolder +CamelFolderChangeInfo +CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY +CAMEL_FOLDER_HAS_SEARCH_CAPABILITY +CAMEL_FOLDER_FILTER_RECENT +CAMEL_FOLDER_HAS_BEEN_DELETED +CAMEL_FOLDER_IS_TRASH +CAMEL_FOLDER_IS_JUNK +CAMEL_FOLDER_FILTER_JUNK +camel_folder_construct +camel_folder_refresh_info +camel_folder_sync +camel_folder_get_parent_store +camel_folder_expunge +camel_folder_get_name +camel_folder_get_full_name +camel_folder_get_permanent_flags +camel_folder_get_message_flags +camel_folder_set_message_flags +camel_folder_get_message_user_flag +camel_folder_set_message_user_flag +camel_folder_get_message_user_tag +camel_folder_set_message_user_tag +camel_folder_append_message +camel_folder_has_summary_capability +camel_folder_get_message_count +camel_folder_get_unread_message_count +camel_folder_get_deleted_message_count +camel_folder_get_summary +camel_folder_free_summary +camel_folder_get_message +camel_folder_delete_message +camel_folder_get_uids +camel_folder_free_uids +camel_folder_has_search_capability +camel_folder_search_by_expression +camel_folder_search_by_uids +camel_folder_search_free +camel_folder_get_message_info +camel_folder_free_message_info +camel_folder_ref_message_info +camel_folder_transfer_messages_to +camel_folder_delete +camel_folder_rename +camel_folder_freeze +camel_folder_thaw +camel_folder_is_frozen +camel_folder_free_nop +camel_folder_free_shallow +camel_folder_free_deep +camel_folder_change_info_new +camel_folder_change_info_clear +camel_folder_change_info_free +camel_folder_change_info_changed +camel_folder_change_info_add_source +camel_folder_change_info_add_source_list +camel_folder_change_info_add_update +camel_folder_change_info_add_update_list +camel_folder_change_info_build_diff +camel_folder_change_info_cat +camel_folder_change_info_add_uid +camel_folder_change_info_remove_uid +camel_folder_change_info_change_uid +camel_folder_change_info_recent_uid + +CAMEL_FOLDER +CAMEL_IS_FOLDER +CAMEL_FOLDER_TYPE +CAMEL_FOLDER_CLASS +CamelFolderClass + +camel_folder_get_type
camel-folder-search -CamelFolderSearch CamelFolderSearch +CamelFolderSearch camel_folder_search_new camel_folder_search_construct camel_folder_search_set_folder @@ -256,15 +395,19 @@ camel_folder_search_free_result CAMEL_FOLDER_SEARCH CAMEL_IS_FOLDER_SEARCH CAMEL_FOLDER_SEARCH_TYPE -camel_folder_search_get_type CAMEL_FOLDER_SEARCH_CLASS +CamelFolderSearchClass + +camel_folder_search_get_type
camel-folder-summary +CamelFolderSummary CamelFolderSummary CamelMessageInfo CamelMessageInfoBase +CamelFolderMetaSummary CamelMessageContentInfo CamelMessageFlags CAMEL_MESSAGE_SYSTEM_MASK @@ -273,7 +416,6 @@ CamelTag CamelSummaryMessageID CamelSummaryReferences CamelFolderSummaryFlags -CamelFolderSummary camel_folder_summary_new camel_folder_summary_set_filename camel_folder_summary_set_index @@ -345,108 +487,39 @@ camel_message_info_user_tag camel_message_info_set_flags camel_message_info_set_user_flag camel_message_info_set_user_tag +camel_content_info_dump +camel_message_info_dump CAMEL_FOLDER_SUMMARY CAMEL_IS_FOLDER_SUMMARY CAMEL_FOLDER_SUMMARY_TYPE -camel_folder_summary_get_type CAMEL_FOLDER_SUMMARY_CLASS -
- -
-camel-folder -CamelFolder -CamelFolderChangeInfo -CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY -CAMEL_FOLDER_HAS_SEARCH_CAPABILITY -CAMEL_FOLDER_FILTER_RECENT -CAMEL_FOLDER_HAS_BEEN_DELETED -CAMEL_FOLDER_IS_TRASH -CAMEL_FOLDER_IS_JUNK -CAMEL_FOLDER_FILTER_JUNK -CamelFolder -camel_folder_construct -camel_folder_refresh_info -camel_folder_sync -camel_folder_get_parent_store -camel_folder_expunge -camel_folder_get_name -camel_folder_get_full_name -camel_folder_get_permanent_flags -camel_folder_get_message_flags -camel_folder_set_message_flags -camel_folder_get_message_user_flag -camel_folder_set_message_user_flag -camel_folder_get_message_user_tag -camel_folder_set_message_user_tag -camel_folder_append_message -camel_folder_has_summary_capability -camel_folder_get_message_count -camel_folder_get_unread_message_count -camel_folder_get_deleted_message_count -camel_folder_get_summary -camel_folder_free_summary -camel_folder_get_message -camel_folder_delete_message -camel_folder_get_uids -camel_folder_free_uids -camel_folder_has_search_capability -camel_folder_search_by_expression -camel_folder_search_by_uids -camel_folder_search_free -camel_folder_get_message_info -camel_folder_free_message_info -camel_folder_ref_message_info -camel_folder_transfer_messages_to -camel_folder_delete -camel_folder_rename -camel_folder_freeze -camel_folder_thaw -camel_folder_is_frozen -camel_folder_free_nop -camel_folder_free_shallow -camel_folder_free_deep -camel_folder_change_info_new -camel_folder_change_info_clear -camel_folder_change_info_free -camel_folder_change_info_changed -camel_folder_change_info_add_source -camel_folder_change_info_add_source_list -camel_folder_change_info_add_update -camel_folder_change_info_add_update_list -camel_folder_change_info_build_diff -camel_folder_change_info_cat -camel_folder_change_info_add_uid -camel_folder_change_info_remove_uid -camel_folder_change_info_change_uid -camel_folder_change_info_recent_uid - -CAMEL_FOLDER -CAMEL_IS_FOLDER -CAMEL_FOLDER_TYPE -camel_folder_get_type -CAMEL_FOLDER_CLASS +CamelFolderSummaryClass + +camel_folder_summary_get_type
camel-gpg-context -CamelGpgContext CamelGpgContext +CamelGpgContext camel_gpg_context_new camel_gpg_context_set_always_trust CAMEL_GPG_CONTEXT CAMEL_IS_GPG_CONTEXT CAMEL_GPG_CONTEXT_TYPE -camel_gpg_context_get_type CAMEL_GPG_CONTEXT_CLASS +CamelGpgContextClass + +camel_gpg_context_get_type
camel-html-parser +CamelHTMLParser CamelHTMLParser camel_html_parser_t -CamelHTMLParser camel_html_parser_new camel_html_parser_set_data camel_html_parser_step @@ -457,15 +530,17 @@ camel_html_parser_attr_list CAMEL_HTML_PARSER CAMEL_IS_HTML_PARSER -camel_html_parser_get_type CAMEL_HTML_PARSER_CLASS +CamelHTMLParserClass + +camel_html_parser_get_type
camel-http-stream +CamelHttpStream CamelHttpStream CamelHttpMethod -CamelHttpStream camel_http_stream_new camel_http_stream_set_user_agent camel_http_stream_set_proxy @@ -476,25 +551,27 @@ camel_http_stream_get_content_type CAMEL_HTTP_STREAM CAMEL_IS_HTTP_STREAM CAMEL_HTTP_STREAM_TYPE -camel_http_stream_get_type CAMEL_HTTP_STREAM_CLASS +CamelHttpStreamClass + +camel_http_stream_get_type
camel-index +CamelIndexCursor +CamelIndexName +CamelIndex CamelIndex CamelIndexNorm -CamelIndexCursor +CamelIndexCursor camel_index_cursor_new camel_index_cursor_next camel_index_cursor_reset -CamelIndexName CamelIndexName -camel_index_name_get_type camel_index_name_new camel_index_name_add_word camel_index_name_add_buffer -CamelIndex CAMEL_INDEX_DELETED camel_index_new camel_index_construct @@ -524,12 +601,17 @@ CAMEL_INDEX_CURSOR CAMEL_IS_INDEX_CURSOR camel_index_cursor_get_type CAMEL_INDEX_CURSOR_CLASS +CamelIndexClass +CamelIndexCursorClass +CamelIndexNameClass + +camel_index_name_get_type
camel-internet-address -CamelInternetAddress CamelInternetAddress +CamelInternetAddress camel_internet_address_new camel_internet_address_add camel_internet_address_get @@ -540,15 +622,17 @@ camel_internet_address_format_address CAMEL_INTERNET_ADDRESS CAMEL_IS_INTERNET_ADDRESS -camel_internet_address_get_type CAMEL_INTERNET_ADDRESS_CLASS +CamelInternetAddressClass + +camel_internet_address_get_type
camel-medium +CamelMedium CamelMedium CamelMediumHeader -CamelMedium camel_medium_add_header camel_medium_set_header camel_medium_remove_header @@ -561,30 +645,34 @@ camel_medium_set_content_object CAMEL_MEDIUM CAMEL_IS_MEDIUM CAMEL_MEDIUM_TYPE -camel_medium_get_type CAMEL_MEDIUM_CLASS +CamelMediumClass + +camel_medium_get_type
camel-mime-filter-basic +CamelMimeFilterBasic CamelMimeFilterBasic CamelMimeFilterBasicType -CamelMimeFilterBasic camel_mime_filter_basic_new camel_mime_filter_basic_new_type CAMEL_MIME_FILTER_BASIC CAMEL_IS_MIME_FILTER_BASIC -camel_mime_filter_basic_get_type CAMEL_MIME_FILTER_BASIC_CLASS +CamelMimeFilterBasicClass + +camel_mime_filter_basic_get_type
camel-mime-filter-bestenc +CamelMimeFilterBestenc CamelBestencRequired CamelBestencEncoding CamelMimeFilterBestenc -CamelMimeFilterBestenc camel_mime_filter_bestenc_new camel_mime_filter_bestenc_get_best_encoding camel_mime_filter_bestenc_get_best_charset @@ -592,110 +680,126 @@ camel_mime_filter_bestenc_set_flags CAMEL_MIME_FILTER_BESTENC CAMEL_IS_MIME_FILTER_BESTENC -camel_mime_filter_bestenc_get_type CAMEL_MIME_FILTER_BESTENC_CLASS +CamelMimeFilterBestencClass + +camel_mime_filter_bestenc_get_type
camel-mime-filter-canon -CamelMimeFilterCanon CamelMimeFilterCanon +CamelMimeFilterCanon camel_mime_filter_canon_new CAMEL_MIME_FILTER_CANON CAMEL_IS_MIME_FILTER_CANON CAMEL_MIME_FILTER_CANON_TYPE -camel_mime_filter_canon_get_type CAMEL_MIME_FILTER_CANON_CLASS +CamelMimeFilterCanonClass + +camel_mime_filter_canon_get_type
camel-mime-filter-charset -CamelMimeFilterCharset CamelMimeFilterCharset +CamelMimeFilterCharset camel_mime_filter_charset_new camel_mime_filter_charset_new_convert CAMEL_MIME_FILTER_CHARSET CAMEL_IS_MIME_FILTER_CHARSET -camel_mime_filter_charset_get_type CAMEL_MIME_FILTER_CHARSET_CLASS +CamelMimeFilterCharsetClass + +camel_mime_filter_charset_get_type
camel-mime-filter-crlf +CamelMimeFilterCRLF CamelMimeFilterCRLF CamelMimeFilterCRLFDirection CamelMimeFilterCRLFMode -CamelMimeFilterCRLF camel_mime_filter_crlf_new CAMEL_MIME_FILTER_CRLF CAMEL_IS_MIME_FILTER_CRLF CAMEL_MIME_FILTER_CRLF_TYPE -camel_mime_filter_crlf_get_type CAMEL_MIME_FILTER_CRLF_CLASS +CamelMimeFilterCRLFClass + +camel_mime_filter_crlf_get_type
camel-mime-filter-enriched +CamelMimeFilterEnriched CamelMimeFilterEnriched CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT -CamelMimeFilterEnriched camel_mime_filter_enriched_new camel_enriched_to_html CAMEL_MIME_FILTER_ENRICHED CAMEL_IS_MIME_FILTER_ENRICHED CAMEL_TYPE_MIME_FILTER_ENRICHED -camel_mime_filter_enriched_get_type CAMEL_MIME_FILTER_ENRICHED_CLASS +CamelMimeFilterEnrichedClass + +camel_mime_filter_enriched_get_type
camel-mime-filter-from -CamelMimeFilterFrom CamelMimeFilterFrom +CamelMimeFilterFrom camel_mime_filter_from_new CAMEL_MIME_FILTER_FROM CAMEL_IS_MIME_FILTER_FROM -camel_mime_filter_from_get_type CAMEL_MIME_FILTER_FROM_CLASS +CamelMimeFilterFromClass + +camel_mime_filter_from_get_type
camel-mime-filter-gzip +CamelMimeFilterGZip CamelMimeFilterGZip CamelMimeFilterGZipMode -CamelMimeFilterGZip camel_mime_filter_gzip_new CAMEL_MIME_FILTER_GZIP CAMEL_IS_MIME_FILTER_GZIP CAMEL_TYPE_MIME_FILTER_GZIP -camel_mime_filter_gzip_get_type CAMEL_MIME_FILTER_GZIP_CLASS CAMEL_IS_MIME_FILTER_GZIP_CLASS CAMEL_MIME_FILTER_GZIP_GET_CLASS +CamelMimeFilterGZipClass + +camel_mime_filter_gzip_get_type
camel-mime-filter-html -CamelMimeFilterHTML CamelMimeFilterHTML +CamelMimeFilterHTML camel_mime_filter_html_new CAMEL_MIME_FILTER_HTML CAMEL_IS_MIME_FILTER_HTML -camel_mime_filter_html_get_type CAMEL_MIME_FILTER_HTML_CLASS +CamelMimeFilterHTMLClass + +camel_mime_filter_html_get_type
camel-mime-filter-index -CamelMimeFilterIndex CamelMimeFilterIndex +CamelMimeFilterIndex camel_mime_filter_index_new camel_mime_filter_index_new_index camel_mime_filter_index_set_name @@ -703,39 +807,61 @@ camel_mime_filter_index_set_index CAMEL_MIME_FILTER_INDEX CAMEL_IS_MIME_FILTER_INDEX -camel_mime_filter_index_get_type CAMEL_MIME_FILTER_INDEX_CLASS +CamelMimeFilterIndexClass + +camel_mime_filter_index_get_type
camel-mime-filter-linewrap -CamelMimeFilterLinewrap CamelMimeFilterLinewrap +CamelMimeFilterLinewrap camel_mime_filter_linewrap_new CAMEL_MIME_FILTER_LINEWRAP CAMEL_IS_MIME_FILTER_LINEWRAP CAMEL_MIME_FILTER_LINEWRAP_TYPE -camel_mime_filter_linewrap_get_type CAMEL_MIME_FILTER_LINEWRAP_CLASS +CamelMimeFilterLinewrapClass + +camel_mime_filter_linewrap_get_type +
+ +
+camel-mime-filter-pgp +CamelMimeFilterPgp +CamelMimeFilterPgp +camel_mime_filter_pgp_new + +CAMEL_MIME_FILTER_PGP_TYPE +CAMEL_MIME_FILTER_PGP +CAMEL_MIME_FILTER_PGP_CLASS +CAMEL_IS_MIME_FILTER_PGP +CamelMimeFilterPgpClass + +camel_mime_filter_pgp_get_type
camel-mime-filter-save -CamelMimeFilterSave CamelMimeFilterSave +CamelMimeFilterSave camel_mime_filter_save_new camel_mime_filter_save_new_with_stream CAMEL_MIME_FILTER_SAVE CAMEL_IS_MIME_FILTER_SAVE CAMEL_MIME_FILTER_SAVE_TYPE -camel_mime_filter_save_get_type CAMEL_MIME_FILTER_SAVE_CLASS +CamelMimeFilterSaveClass + +camel_mime_filter_save_get_type
camel-mime-filter-tohtml +CamelMimeFilterToHTML CamelMimeFilterToHTML CAMEL_MIME_FILTER_TOHTML_PRE CAMEL_MIME_FILTER_TOHTML_CONVERT_NL @@ -747,32 +873,36 @@ CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT CAMEL_MIME_FILTER_TOHTML_CITE CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT CAMEL_MIME_FILTER_TOHTML_FORMAT_FLOWED -CamelMimeFilterToHTML camel_mime_filter_tohtml_new camel_text_to_html CAMEL_MIME_FILTER_TOHTML CAMEL_IS_MIME_FILTER_TOHTML -camel_mime_filter_tohtml_get_type CAMEL_MIME_FILTER_TOHTML_CLASS +CamelMimeFilterToHTMLClass + +camel_mime_filter_tohtml_get_type
camel-mime-filter-windows -CamelMimeFilterWindows CamelMimeFilterWindows +CamelMimeFilterWindows camel_mime_filter_windows_new camel_mime_filter_windows_is_windows_charset camel_mime_filter_windows_real_charset CAMEL_MIME_FILTER_WINDOWS CAMEL_IS_MIME_FILTER_WINDOWS -camel_mime_filter_windows_get_type CAMEL_MIME_FILTER_WINDOWS_CLASS +CamelMimeFilterWindowsClass + +camel_mime_filter_windows_get_type
camel-mime-filter-yenc +CamelMimeFilterYenc CamelMimeFilterYenc CamelMimeFilterYencDirection CAMEL_MIME_YDECODE_STATE_INIT @@ -785,7 +915,6 @@ CAMEL_MIME_YDECODE_STATE_DECODE CAMEL_MIME_YDECODE_STATE_END CAMEL_MIME_YENCODE_CRC_INIT CAMEL_MIME_YENCODE_CRC_FINAL -CamelMimeFilterYenc camel_mime_filter_yenc_new camel_mime_filter_yenc_set_state camel_mime_filter_yenc_set_crc @@ -798,16 +927,18 @@ camel_yencode_close CAMEL_MIME_FILTER_YENC CAMEL_IS_MIME_FILTER_YENC CAMEL_TYPE_MIME_FILTER_YENC -camel_mime_filter_yenc_get_type CAMEL_MIME_FILTER_YENC_CLASS CAMEL_IS_MIME_FILTER_YENC_CLASS CAMEL_MIME_FILTER_YENC_GET_CLASS +CamelMimeFilterYencClass + +camel_mime_filter_yenc_get_type
camel-mime-filter -CamelMimeFilter CamelMimeFilter +CamelMimeFilter camel_mime_filter_new camel_mime_filter_filter camel_mime_filter_complete @@ -818,12 +949,15 @@ camel_mime_filter_set_size CAMEL_MIME_FILTER CAMEL_IS_MIME_FILTER CAMEL_MIME_FILTER_TYPE -camel_mime_filter_get_type CAMEL_MIME_FILTER_CLASS +CamelMimeFilterClass + +camel_mime_filter_get_type
camel-mime-message +CamelMimeMessage CamelMimeMessage CAMEL_RECIPIENT_TYPE_TO CAMEL_RECIPIENT_TYPE_CC @@ -832,7 +966,6 @@ CAMEL_RECIPIENT_TYPE_RESENT_TO CAMEL_RECIPIENT_TYPE_RESENT_CC CAMEL_RECIPIENT_TYPE_RESENT_BCC CAMEL_MESSAGE_DATE_CURRENT -CamelMimeMessage camel_mime_message_new camel_mime_message_set_date camel_mime_message_get_date @@ -847,24 +980,29 @@ camel_mime_message_set_from camel_mime_message_get_from camel_mime_message_get_recipients camel_mime_message_set_recipients +camel_mime_message_set_source +camel_mime_message_get_source camel_mime_message_has_8bit_parts camel_mime_message_set_best_encoding camel_mime_message_encode_8bit_parts camel_mime_message_get_part_by_content_id camel_mime_message_build_mbox_from +camel_mime_message_dump CAMEL_MIME_MESSAGE CAMEL_IS_MIME_MESSAGE CAMEL_MIME_MESSAGE_TYPE -camel_mime_message_get_type CAMEL_MIME_MESSAGE_CLASS +CamelMimeMessageClass + +camel_mime_message_get_type
camel-mime-parser +CamelMimeParser CamelMimeParser camel_mime_parser_state_t -CamelMimeParser camel_mime_parser_new camel_mime_parser_errno camel_mime_parser_init_with_fd @@ -885,14 +1023,16 @@ camel_mime_parser_header CAMEL_MIME_PARSER CAMEL_IS_MIME_PARSER -camel_mime_parser_get_type CAMEL_MIME_PARSER_CLASS +CamelMimeParserClass + +camel_mime_parser_get_type
camel-mime-part -CamelMimePart CamelMimePart +CamelMimePart camel_mime_part_new camel_mime_part_set_description camel_mime_part_get_description @@ -918,41 +1058,47 @@ camel_mime_part_set_content CAMEL_MIME_PART CAMEL_IS_MIME_PART CAMEL_MIME_PART_TYPE -camel_mime_part_get_type CAMEL_MIME_PART_CLASS +CamelMimePartClass + +camel_mime_part_get_type
camel-multipart-encrypted -CamelMultipartEncrypted CamelMultipartEncrypted +CamelMultipartEncrypted camel_multipart_encrypted_new CAMEL_MULTIPART_ENCRYPTED CAMEL_IS_MULTIPART_ENCRYPTED CAMEL_MULTIPART_ENCRYPTED_TYPE -camel_multipart_encrypted_get_type CAMEL_MULTIPART_ENCRYPTED_CLASS +CamelMultipartEncryptedClass + +camel_multipart_encrypted_get_type
camel-multipart-signed -CamelMultipartSigned CamelMultipartSigned +CamelMultipartSigned camel_multipart_signed_new camel_multipart_signed_get_content_stream CAMEL_MULTIPART_SIGNED CAMEL_IS_MULTIPART_SIGNED CAMEL_MULTIPART_SIGNED_TYPE -camel_multipart_signed_get_type CAMEL_MULTIPART_SIGNED_CLASS +CamelMultipartSignedClass + +camel_multipart_signed_get_type
camel-multipart -CamelMultipart CamelMultipart +CamelMultipart camel_multipart_new camel_multipart_add_part camel_multipart_add_part_at @@ -969,24 +1115,29 @@ camel_multipart_construct_from_parser CAMEL_MULTIPART CAMEL_IS_MULTIPART CAMEL_MULTIPART_TYPE -camel_multipart_get_type CAMEL_MULTIPART_CLASS +CamelMultipartClass + +camel_multipart_get_type
camel-news-address -CamelNewsAddress CamelNewsAddress +CamelNewsAddress camel_news_address_new CAMEL_NEWS_ADDRESS CAMEL_IS_NEWS_ADDRESS -camel_news_address_get_type CAMEL_NEWS_ADDRESS_CLASS +CamelNewsAddressClass + +camel_news_address_get_type
camel-object +CamelObject CAMEL_OBJECT_TRACK_INSTANCES CamelType CamelObject @@ -1010,7 +1161,6 @@ CamelObjectEventPrepFunc CamelObjectEventHookFunc CAMEL_INVALID_TYPE CamelObjectFlags -CamelObject camel_type_init camel_type_register camel_interface_register @@ -1059,13 +1209,22 @@ camel_object_bag_list camel_object_bag_remove camel_object_bag_destroy CAMEL_MAKE_CLASS +CamelIteratorVTable +CamelIterator +camel_iterator_new +camel_iterator_free +camel_iterator_next +camel_iterator_reset +camel_iterator_length CAMEL_OBJECT CAMEL_IS_OBJECT -camel_object_get_type CAMEL_OBJECT_CLASS CAMEL_IS_OBJECT_CLASS CAMEL_OBJECT_GET_CLASS +CamelObjectClass + +camel_object_get_type
@@ -1078,6 +1237,7 @@ CAMEL_PROVIDER_IS_SOURCE CAMEL_PROVIDER_IS_STORAGE CAMEL_PROVIDER_SUPPORTS_SSL CAMEL_PROVIDER_HAS_LICENSE +CAMEL_PROVIDER_DISABLE_SENT_FOLDER CAMEL_URL_PART_USER CAMEL_URL_PART_AUTH CAMEL_URL_PART_PASSWORD @@ -1132,127 +1292,145 @@ CAMEL_PROVIDER_IS_REMOTE
camel-sasl-anonymous +CamelSaslAnonymous CamelSaslAnonymous CamelSaslAnonTraceType -CamelSaslAnonymous camel_sasl_anonymous_new camel_sasl_anonymous_authtype CAMEL_SASL_ANONYMOUS CAMEL_IS_SASL_ANONYMOUS CAMEL_SASL_ANONYMOUS_TYPE -camel_sasl_anonymous_get_type CAMEL_SASL_ANONYMOUS_CLASS +CamelSaslAnonymousClass + +camel_sasl_anonymous_get_type
camel-sasl-cram-md5 -CamelSaslCramMd5 CamelSaslCramMd5 +CamelSaslCramMd5 camel_sasl_cram_md5_authtype CAMEL_SASL_CRAM_MD5 CAMEL_IS_SASL_CRAM_MD5 CAMEL_SASL_CRAM_MD5_TYPE -camel_sasl_cram_md5_get_type CAMEL_SASL_CRAM_MD5_CLASS +CamelSaslCramMd5Class + +camel_sasl_cram_md5_get_type
camel-sasl-digest-md5 -CamelSaslDigestMd5 CamelSaslDigestMd5 +CamelSaslDigestMd5 camel_sasl_digest_md5_authtype CAMEL_SASL_DIGEST_MD5 CAMEL_IS_SASL_DIGEST_MD5 CAMEL_SASL_DIGEST_MD5_TYPE -camel_sasl_digest_md5_get_type CAMEL_SASL_DIGEST_MD5_CLASS +CamelSaslDigestMd5Class + +camel_sasl_digest_md5_get_type
camel-sasl-gssapi -CamelSaslGssapi CamelSaslGssapi +CamelSaslGssapi camel_sasl_gssapi_authtype CAMEL_SASL_GSSAPI CAMEL_IS_SASL_GSSAPI CAMEL_SASL_GSSAPI_TYPE -camel_sasl_gssapi_get_type CAMEL_SASL_GSSAPI_CLASS +CamelSaslGssapiClass + +camel_sasl_gssapi_get_type
camel-sasl-kerberos4 -CamelSaslKerberos4 CamelSaslKerberos4 +CamelSaslKerberos4 camel_sasl_kerberos4_authtype CAMEL_SASL_KERBEROS4 CAMEL_IS_SASL_KERBEROS4 CAMEL_SASL_KERBEROS4_TYPE -camel_sasl_kerberos4_get_type CAMEL_SASL_KERBEROS4_CLASS +CamelSaslKerberos4Class + +camel_sasl_kerberos4_get_type
camel-sasl-login -CamelSaslLogin CamelSaslLogin +CamelSaslLogin camel_sasl_login_authtype CAMEL_SASL_LOGIN CAMEL_IS_SASL_LOGIN CAMEL_SASL_LOGIN_TYPE -camel_sasl_login_get_type CAMEL_SASL_LOGIN_CLASS +CamelSaslLoginClass + +camel_sasl_login_get_type
camel-sasl-ntlm -CamelSaslNTLM CamelSaslNTLM +CamelSaslNTLM camel_sasl_ntlm_authtype CAMEL_SASL_NTLM CAMEL_IS_SASL_NTLM CAMEL_SASL_NTLM_TYPE -camel_sasl_ntlm_get_type CAMEL_SASL_NTLM_CLASS +CamelSaslNTLMClass + +camel_sasl_ntlm_get_type
camel-sasl-plain -CamelSaslPlain CamelSaslPlain +CamelSaslPlain camel_sasl_plain_authtype CAMEL_SASL_PLAIN CAMEL_IS_SASL_PLAIN CAMEL_SASL_PLAIN_TYPE -camel_sasl_plain_get_type CAMEL_SASL_PLAIN_CLASS +CamelSaslPlainClass + +camel_sasl_plain_get_type
camel-sasl-popb4smtp -CamelSaslPOPB4SMTP CamelSaslPOPB4SMTP +CamelSaslPOPB4SMTP camel_sasl_popb4smtp_authtype CAMEL_SASL_POPB4SMTP CAMEL_IS_SASL_POPB4SMTP CAMEL_SASL_POPB4SMTP_TYPE -camel_sasl_popb4smtp_get_type CAMEL_SASL_POPB4SMTP_CLASS +CamelSaslPOPB4SMTPClass + +camel_sasl_popb4smtp_get_type
camel-sasl -CamelSasl CamelSasl +CamelSasl camel_sasl_challenge camel_sasl_challenge_base64 camel_sasl_authenticated @@ -1263,16 +1441,18 @@ camel_sasl_authtype CAMEL_SASL CAMEL_IS_SASL CAMEL_SASL_TYPE -camel_sasl_get_type CAMEL_SASL_CLASS +CamelSaslClass + +camel_sasl_get_type
camel-seekable-stream +CamelSeekableStream CamelSeekableStream CamelStreamSeekPolicy CAMEL_STREAM_UNBOUND -CamelSeekableStream camel_seekable_stream_seek camel_seekable_stream_tell camel_seekable_stream_set_bounds @@ -1280,25 +1460,30 @@ camel_seekable_stream_set_bounds CAMEL_SEEKABLE_STREAM CAMEL_IS_SEEKABLE_STREAM CAMEL_SEEKABLE_STREAM_TYPE -camel_seekable_stream_get_type CAMEL_SEEKABLE_STREAM_CLASS +CamelSeekableStreamClass + +camel_seekable_stream_get_type
camel-seekable-substream -CamelSeekableSubstream CamelSeekableSubstream +CamelSeekableSubstream camel_seekable_substream_new CAMEL_SEEKABLE_SUBSTREAM CAMEL_IS_SEEKABLE_SUBSTREAM CAMEL_SEEKABLE_SUBSTREAM_TYPE -camel_seekable_substream_get_type CAMEL_SEEKABLE_SUBSTREAM_CLASS +CamelSeekableSubstreamClass + +camel_seekable_substream_get_type
camel-service +CamelService CamelService CAMEL_SERVICE_USERNAME CAMEL_SERVICE_AUTH @@ -1306,7 +1491,6 @@ CAMEL_SERVICE_HOSTNAME CAMEL_SERVICE_PORT CAMEL_SERVICE_PATH CamelServiceConnectionStatus -CamelService CamelServiceAuthType camel_service_construct camel_service_connect @@ -1322,18 +1506,20 @@ camel_service_query_auth_types CAMEL_SERVICE CAMEL_IS_SERVICE CAMEL_SERVICE_TYPE -camel_service_get_type CAMEL_SERVICE_CLASS +CamelServiceClass + +camel_service_get_type
camel-session +CamelSession CamelSession CamelTimeoutCallback CamelSessionAlertType CamelSessionThreadOps CamelSessionThreadMsg -CamelSession camel_session_construct camel_session_get_service camel_session_get_service_connected @@ -1352,20 +1538,24 @@ camel_session_thread_msg_new camel_session_thread_msg_free camel_session_thread_queue camel_session_thread_wait +camel_session_get_network_state +camel_session_set_network_state CAMEL_SESSION CAMEL_IS_SESSION CAMEL_SESSION_TYPE -camel_session_get_type CAMEL_SESSION_CLASS +CamelSessionClass + +camel_session_get_type
camel-smime-context +CamelSMIMEContext CamelSMIMEContext camel_smime_sign_t camel_smime_describe_t -CamelSMIMEContext camel_smime_context_new camel_smime_context_set_encrypt_key camel_smime_context_set_sign_mode @@ -1374,18 +1564,20 @@ camel_smime_context_describe_part CAMEL_SMIME_CONTEXT CAMEL_IS_SMIME_CONTEXT CAMEL_SMIME_CONTEXT_TYPE -camel_smime_context_get_type CAMEL_SMIME_CONTEXT_CLASS +CamelSMIMEContextClass + +camel_smime_context_get_type
camel-store-summary +CamelStoreSummary CamelStoreInfo CamelStoreInfoFlags CamelStoreSummary CAMEL_STORE_INFO_FOLDER_UNKNOWN CamelStoreSummaryFlags -CamelStoreSummary camel_store_summary_new camel_store_summary_set_filename camel_store_summary_set_uri_base @@ -1416,12 +1608,15 @@ camel_store_info_name CAMEL_STORE_SUMMARY CAMEL_IS_STORE_SUMMARY -camel_store_summary_get_type CAMEL_STORE_SUMMARY_CLASS +CamelStoreSummaryClass + +camel_store_summary_get_type
camel-store +CamelStore CamelStore CamelFolderInfo CAMEL_FOLDER_NOSELECT @@ -1441,11 +1636,15 @@ CAMEL_FOLDER_TYPE_INBOX CAMEL_FOLDER_TYPE_OUTBOX CAMEL_FOLDER_TYPE_TRASH CAMEL_FOLDER_TYPE_JUNK +CAMEL_FOLDER_TYPE_SENT +CAMEL_STORE_READ +CAMEL_STORE_WRITE CamelRenameInfo CAMEL_STORE_SUBSCRIPTIONS CAMEL_STORE_VTRASH CAMEL_STORE_FILTER_INBOX CAMEL_STORE_VJUNK +CAMEL_STORE_PROXY CAMEL_STORE_FOLDER_CREATE CAMEL_STORE_FOLDER_EXCL CAMEL_STORE_FOLDER_BODY_INDEX @@ -1455,7 +1654,6 @@ CAMEL_STORE_FOLDER_INFO_FAST CAMEL_STORE_FOLDER_INFO_RECURSIVE CAMEL_STORE_FOLDER_INFO_SUBSCRIBED CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL -CamelStore camel_store_get_folder camel_store_get_inbox camel_store_get_trash @@ -1478,7 +1676,6 @@ camel_store_unsubscribe_folder camel_store_noop camel_store_folder_uri_equal CamelISubscribe -camel_isubscribe_get_type camel_isubscribe_subscribed camel_isubscribe_subscribe camel_isubscribe_unsubscribe @@ -1486,15 +1683,42 @@ camel_isubscribe_unsubscribe CAMEL_STORE CAMEL_IS_STORE CAMEL_STORE_TYPE -camel_store_get_type CAMEL_STORE_CLASS +CamelStoreClass + +camel_isubscribe_get_type +camel_store_get_type +
+ +
+camel-stream +CamelStream +CamelStream +camel_stream_read +camel_stream_write +camel_stream_flush +camel_stream_close +camel_stream_eos +camel_stream_reset +camel_stream_write_string +camel_stream_printf +camel_stream_vprintf +camel_stream_write_to_stream + +CAMEL_STREAM +CAMEL_IS_STREAM +CAMEL_STREAM_TYPE +CAMEL_STREAM_CLASS +CamelStreamClass + +camel_stream_get_type
camel-stream-buffer +CamelStreamBuffer CamelStreamBuffer CamelStreamBufferMode -CamelStreamBuffer camel_stream_buffer_new camel_stream_buffer_new_with_vbuf camel_stream_buffer_gets @@ -1503,28 +1727,32 @@ camel_stream_buffer_read_line CAMEL_STREAM_BUFFER CAMEL_IS_STREAM_BUFFER CAMEL_STREAM_BUFFER_TYPE -camel_stream_buffer_get_type CAMEL_STREAM_BUFFER_CLASS +CamelStreamBufferClass + +camel_stream_buffer_get_type
camel-stream-filter -CamelStreamFilter CamelStreamFilter +CamelStreamFilter camel_stream_filter_new_with_stream camel_stream_filter_add camel_stream_filter_remove CAMEL_STREAM_FILTER CAMEL_IS_STREAM_FILTER -camel_stream_filter_get_type CAMEL_STREAM_FILTER_CLASS +CamelStreamFilterClass + +camel_stream_filter_get_type
camel-stream-fs -CamelStreamFs CamelStreamFs +CamelStreamFs camel_stream_fs_new_with_name camel_stream_fs_new_with_name_and_bounds camel_stream_fs_new_with_fd @@ -1533,14 +1761,16 @@ camel_stream_fs_new_with_fd_and_bounds CAMEL_STREAM_FS CAMEL_IS_STREAM_FS CAMEL_STREAM_FS_TYPE -camel_stream_fs_get_type CAMEL_STREAM_FS_CLASS +CamelStreamFsClass + +camel_stream_fs_get_type
camel-stream-mem -CamelStreamMem CamelStreamMem +CamelStreamMem camel_stream_mem_new camel_stream_mem_new_with_byte_array camel_stream_mem_new_with_buffer @@ -1551,78 +1781,78 @@ camel_stream_mem_set_buffer CAMEL_STREAM_MEM CAMEL_IS_STREAM_MEM CAMEL_STREAM_MEM_TYPE -camel_stream_mem_get_type CAMEL_STREAM_MEM_CLASS +CamelStreamMemClass + +camel_stream_mem_get_type
camel-stream-null -CamelStreamNull CamelStreamNull +CamelStreamNull camel_stream_null_new CAMEL_STREAM_NULL CAMEL_IS_STREAM_NULL -camel_stream_null_get_type CAMEL_STREAM_NULL_CLASS +CamelStreamNullClass + +camel_stream_null_get_type
camel-stream-process -CamelStreamProcess CamelStreamProcess +CamelStreamProcess camel_stream_process_new camel_stream_process_connect CAMEL_STREAM_PROCESS CAMEL_IS_STREAM_PROCESS -camel_stream_process_get_type CAMEL_STREAM_PROCESS_CLASS +CamelStreamProcessClass + +camel_stream_process_get_type
-camel-stream -CamelStream -CamelStream -camel_stream_read -camel_stream_write -camel_stream_flush -camel_stream_close -camel_stream_eos -camel_stream_reset -camel_stream_write_string -camel_stream_printf -camel_stream_vprintf -camel_stream_write_to_stream +camel-stream-vfs +CamelStreamVFS +CamelStreamVFS +camel_stream_vfs_new_with_uri -CamelStream -CAMEL_STREAM -CAMEL_IS_STREAM -CAMEL_STREAM_TYPE -camel_stream_get_type -CAMEL_STREAM_CLASS +CAMEL_STREAM_VFS_TYPE +CAMEL_STREAM_VFS +CAMEL_STREAM_VFS_CLASS +CAMEL_IS_STREAM_VFS +CamelStreamVFSClass + +camel_stream_vfs_get_type
camel-tcp-stream-raw -CamelTcpStreamRaw CamelTcpStreamRaw +CamelTcpStreamRaw camel_tcp_stream_raw_new CAMEL_TCP_STREAM_RAW CAMEL_IS_TCP_STREAM_RAW CAMEL_TCP_STREAM_RAW_TYPE -camel_tcp_stream_raw_get_type CAMEL_TCP_STREAM_RAW_CLASS +CamelTcpStreamRawClass + +camel_tcp_stream_raw_get_type
camel-tcp-stream-ssl +CamelTcpStreamSSL CamelTcpStreamSSL CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 CAMEL_TCP_STREAM_SSL_ENABLE_SSL3 CAMEL_TCP_STREAM_SSL_ENABLE_TLS -CamelTcpStreamSSL camel_tcp_stream_ssl_new camel_tcp_stream_ssl_new_raw camel_tcp_stream_ssl_enable_ssl @@ -1630,17 +1860,19 @@ camel_tcp_stream_ssl_enable_ssl CAMEL_TCP_STREAM_SSL CAMEL_IS_TCP_STREAM_SSL CAMEL_TCP_STREAM_SSL_TYPE -camel_tcp_stream_ssl_get_type CAMEL_TCP_STREAM_SSL_CLASS +CamelTcpStreamSSLClass + +camel_tcp_stream_ssl_get_type
camel-tcp-stream +CamelTcpStream CamelTcpStream CamelSockOpt CamelLinger CamelSockOptData -CamelTcpStream camel_tcp_stream_connect camel_tcp_stream_getsockopt camel_tcp_stream_setsockopt @@ -1648,21 +1880,23 @@ camel_tcp_stream_setsockopt CAMEL_TCP_STREAM CAMEL_IS_TCP_STREAM CAMEL_TCP_STREAM_TYPE -camel_tcp_stream_get_type CAMEL_TCP_STREAM_CLASS +CamelTcpStreamClass + +camel_tcp_stream_get_type
camel-text-index -CamelTextIndexFunc +CamelTextIndex CamelTextIndexCursor CamelTextIndexKeyCursor -camel_text_index_key_cursor_get_type CamelTextIndexName -camel_text_index_name_get_type -CamelTextIndex +CamelTextIndexFunc CamelTextIndex -camel_text_index_get_type +CamelTextIndexCursor +CamelTextIndexKeyCursor +CamelTextIndexName camel_text_index_new camel_text_index_check camel_text_index_rename @@ -1673,27 +1907,37 @@ camel_text_index_validate CAMEL_TEXT_INDEX CAMEL_IS_TEXT_INDEX -camel_text_index_cursor_get_type CAMEL_TEXT_INDEX_CLASS +CamelTextIndexClass +CamelTextIndexCursorClass +CamelTextIndexKeyCursorClass +CamelTextIndexNameClass + +camel_text_index_get_type +camel_text_index_cursor_get_type +camel_text_index_key_cursor_get_type +camel_text_index_name_get_type
camel-transport -CamelTransport CamelTransport +CamelTransport camel_transport_send_to CAMEL_TRANSPORT CAMEL_IS_TRANSPORT CAMEL_TRANSPORT_TYPE -camel_transport_get_type CAMEL_TRANSPORT_CLASS +CamelTransportClass + +camel_transport_get_type
camel-vee-folder -CamelVeeFolder CamelVeeFolder +CamelVeeFolder CAMEL_UNMATCHED_NAME camel_vee_folder_new camel_vee_folder_construct @@ -1707,57 +1951,65 @@ camel_vee_folder_hash_folder CAMEL_VEE_FOLDER CAMEL_IS_VEE_FOLDER -camel_vee_folder_get_type CAMEL_VEE_FOLDER_CLASS +CamelVeeFolderClass + +camel_vee_folder_get_type
camel-vee-store +CamelVeeStore CamelVeeStore CAMEL_STORE_VEE_FOLDER_AUTO -CamelVeeStore camel_vee_store_new CAMEL_VEE_STORE CAMEL_IS_VEE_STORE -camel_vee_store_get_type CAMEL_VEE_STORE_CLASS +CamelVeeStoreClass + +camel_vee_store_get_type
camel-vee-summary +CamelVeeSummary CamelVeeSummary CamelVeeMessageInfo -CamelVeeSummary camel_vee_summary_new camel_vee_summary_add CAMEL_VEE_SUMMARY CAMEL_IS_VEE_SUMMARY -camel_vee_summary_get_type CAMEL_VEE_SUMMARY_CLASS +CamelVeeSummaryClass + +camel_vee_summary_get_type
camel-vtrash-folder +CamelVTrashFolder CAMEL_VTRASH_NAME CAMEL_VJUNK_NAME CamelVTrashFolder camel_vtrash_folder_t -CamelVTrashFolder camel_vtrash_folder_new CAMEL_VTRASH_FOLDER CAMEL_IS_VTRASH_FOLDER -camel_vtrash_folder_get_type CAMEL_VTRASH_FOLDER_CLASS +CamelVTrashFolderClass + +camel_vtrash_folder_get_type
camel-disco-store +CamelDiscoStore CamelDiscoStore CamelDiscoStoreStatus -CamelDiscoStore camel_disco_store_status camel_disco_store_set_status camel_disco_store_can_work_offline @@ -1766,15 +2018,17 @@ camel_disco_store_check_online CAMEL_DISCO_STORE CAMEL_IS_DISCO_STORE CAMEL_DISCO_STORE_TYPE -camel_disco_store_get_type CAMEL_DISCO_STORE_CLASS +CamelDiscoStoreClass + +camel_disco_store_get_type
camel-offline-journal +CamelOfflineJournal CamelOfflineJournal CamelOfflineJournalEntry -CamelOfflineJournal camel_offline_journal_construct camel_offline_journal_set_filename camel_offline_journal_write @@ -1783,58 +2037,66 @@ camel_offline_journal_replay CAMEL_OFFLINE_JOURNAL CAMEL_IS_OFFLINE_JOURNAL CAMEL_TYPE_OFFLINE_JOURNAL -camel_offline_journal_get_type CAMEL_OFFLINE_JOURNAL_CLASS CAMEL_IS_OFFLINE_JOURNAL_CLASS CAMEL_OFFLINE_JOURNAL_GET_CLASS +CamelOfflineJournalClass + +camel_offline_journal_get_type
camel-offline-folder -CamelOfflineFolder CamelOfflineFolder +CamelOfflineFolder camel_offline_folder_downsync CAMEL_OFFLINE_FOLDER CAMEL_IS_OFFLINE_FOLDER CAMEL_OFFLINE_FOLDER_TYPE -camel_offline_folder_get_type CAMEL_OFFLINE_FOLDER_CLASS +CamelOfflineFolderClass + +camel_offline_folder_get_type
camel-offline-store -CamelOfflineStore CamelOfflineStore +CamelOfflineStore camel_offline_store_set_network_state CAMEL_OFFLINE_STORE CAMEL_IS_OFFLINE_STORE CAMEL_TYPE_OFFLINE_STORE -camel_offline_store_get_type CAMEL_OFFLINE_STORE_CLASS CAMEL_IS_OFFLINE_STORE_CLASS CAMEL_OFFLINE_STORE_GET_CLASS +CamelOfflineStoreClass + +camel_offline_store_get_type
camel-nntp-address -CamelNNTPAddress CamelNNTPAddress +CamelNNTPAddress camel_nntp_address_new camel_nntp_address_add camel_nntp_address_get CAMEL_NNTP_ADDRESS CAMEL_IS_NNTP_ADDRESS -camel_nntp_address_get_type CAMEL_NNTP_ADDRESS_CLASS +CamelNNTPAddressClass + +camel_nntp_address_get_type
camel-imap-folder -CamelImapFolder CamelImapFolder +CamelImapFolder camel_imap_folder_new camel_imap_folder_selected camel_imap_folder_changed @@ -1843,14 +2105,17 @@ camel_imap_folder_fetch_data CAMEL_IMAP_FOLDER CAMEL_IS_IMAP_FOLDER CAMEL_IMAP_FOLDER_TYPE -camel_imap_folder_get_type CAMEL_IMAP_FOLDER_CLASS +CamelImapFolderClass + +CamelImapFolderPrivate +camel_imap_folder_get_type
camel-imap-message-cache -CamelImapMessageCache CamelImapMessageCache +CamelImapMessageCache camel_imap_message_cache_new camel_imap_message_cache_set_path camel_imap_message_cache_max_uid @@ -1865,29 +2130,33 @@ camel_imap_message_cache_copy CAMEL_IMAP_MESSAGE_CACHE CAMEL_IS_IMAP_MESSAGE_CACHE CAMEL_IMAP_MESSAGE_CACHE_TYPE -camel_imap_message_cache_get_type CAMEL_IMAP_MESSAGE_CACHE_CLASS +CamelImapMessageCacheClass + +camel_imap_message_cache_get_type
camel-imap-search -CamelImapSearch CamelImapSearch +CamelImapSearch camel_imap_search_new CAMEL_IMAP_SEARCH CAMEL_IS_IMAP_SEARCH CAMEL_IMAP_SEARCH_TYPE -camel_imap_search_get_type CAMEL_IMAP_SEARCH_CLASS +CamelImapSearchClass + +camel_imap_search_get_type
camel-imap-store-summary +CamelImapStoreSummary CamelImapStoreInfo CamelImapStoreNamespace CamelImapStoreSummary -CamelImapStoreSummary camel_imap_store_summary_new camel_imap_store_summary_namespace_new camel_imap_store_summary_namespace_set @@ -1902,12 +2171,15 @@ camel_imap_store_info_full_name CAMEL_IMAP_STORE_SUMMARY CAMEL_IS_IMAP_STORE_SUMMARY -camel_imap_store_summary_get_type CAMEL_IMAP_STORE_SUMMARY_CLASS +CamelImapStoreSummaryClass + +camel_imap_store_summary_get_type
camel-imap-store +CamelImapStore CamelImapMsg CamelImapStore camel_imap_msg_new @@ -1932,74 +2204,87 @@ IMAP_CAPABILITY_useful_lsub IMAP_CAPABILITY_utf8_search IMAP_CAPABILITY_XGWEXTENSIONS IMAP_CAPABILITY_XGWMOVE +IMAP_CAPABILITY_LOGINDISABLED IMAP_PARAM_OVERRIDE_NAMESPACE IMAP_PARAM_CHECK_ALL IMAP_PARAM_FILTER_INBOX IMAP_PARAM_FILTER_JUNK IMAP_PARAM_FILTER_JUNK_INBOX -CamelImapStore +IMAP_PARAM_SUBSCRIPTIONS +IMAP_FETCH_ALL_HEADERS +IMAP_FETCH_MAILING_LIST_HEADERS +IMAP_FETCH_MINIMAL_HEADERS camel_imap_store_connected camel_imap_store_readline CAMEL_IMAP_STORE CAMEL_IS_IMAP_STORE CAMEL_IMAP_STORE_TYPE -camel_imap_store_get_type CAMEL_IMAP_STORE_CLASS +CamelImapStoreClass + +camel_imap_store_get_type
camel-imap-summary +CamelImapSummary CAMEL_IMAP_SERVER_FLAGS CAMEL_IMAP_MESSAGE_RECENT CamelImapMessageContentInfo CamelImapMessageInfo CamelImapSummary -CamelImapSummary camel_imap_summary_new camel_imap_summary_add_offline camel_imap_summary_add_offline_uncached CAMEL_IMAP_SUMMARY CAMEL_IS_IMAP_SUMMARY -camel_imap_summary_get_type CAMEL_IMAP_SUMMARY_CLASS +CamelImapSummaryClass + +camel_imap_summary_get_type
camel-imap-wrapper +CamelImapWrapper CamelImapWrapper CamelImapWrapperPrivate -CamelImapWrapper camel_imap_wrapper_new CAMEL_IMAP_WRAPPER CAMEL_IS_IMAP_WRAPPER CAMEL_IMAP_WRAPPER_TYPE -camel_imap_wrapper_get_type CAMEL_IMAP_WRAPPER_CLASS +CamelImapWrapperClass + +camel_imap_wrapper_get_type
camel-groupwise-folder -CamelGroupwiseFolder CamelGroupwiseFolder +CamelGroupwiseFolder camel_gw_folder_new gw_update_summary +groupwise_refresh_folder CAMEL_GROUPWISE_FOLDER CAMEL_IS_GROUPWISE_FOLDER CAMEL_GROUPWISE_FOLDER_TYPE -camel_groupwise_folder_get_type CAMEL_GROUPWISE_FOLDER_CLASS +CamelGroupwiseFolderClass + +camel_groupwise_folder_get_type
camel-groupwise-store-summary +CamelGroupwiseStoreSummary CamelGroupwiseStoreInfo CamelGroupwiseStoreNamespace CamelGroupwiseStoreSummary -CamelGroupwiseStoreSummary camel_groupwise_store_summary_new camel_groupwise_store_summary_full_name camel_groupwise_store_summary_add_from_full @@ -2013,62 +2298,76 @@ camel_groupwise_store_info_full_name CAMEL_GW_STORE_SUMMARY CAMEL_IS_GW_STORE_SUMMARY -camel_groupwise_store_summary_get_type CAMEL_GW_STORE_SUMMARY_CLASS +CamelGroupwiseStoreSummaryClass + +camel_groupwise_store_summary_get_type
camel-groupwise-store +CamelGroupwiseStore +GW_PARAM_FILTER_INBOX CamelGroupwiseStore CamelGroupwiseStorePrivate -CamelGroupwiseStore groupwise_get_name camel_groupwise_store_container_id_lookup camel_groupwise_store_folder_lookup cnc_lookup gw_get_path storage_path_lookup +groupwise_base_url_lookup +create_junk_folder +camel_groupwise_store_connected +gw_store_reload_folder CAMEL_GROUPWISE_STORE CAMEL_IS_GROUPWISE_STORE CAMEL_GROUPWISE_STORE_TYPE -camel_groupwise_store_get_type CAMEL_GROUPWISE_STORE_CLASS +CamelGroupwiseStoreClass + +camel_groupwise_store_get_type
camel-groupwise-summary +CamelGroupwiseSummary CamelGroupwiseSummary CamelGroupwiseMessageInfo CamelGroupwiseMessageContentInfo -CamelGroupwiseSummary camel_groupwise_summary_new camel_gw_summary_add_offline camel_gw_summary_add_offline_uncached +groupwise_summary_clear CAMEL_GROUPWISE_SUMMARY CAMEL_IS_GROUPWISE_SUMMARY -camel_groupwise_summary_get_type CAMEL_GROUPWISE_SUMMARY_CLASS +CamelGroupwiseSummaryClass + +camel_groupwise_summary_get_type
camel-groupwise-transport -CamelGroupwiseTransport CamelGroupwiseTransport +CamelGroupwiseTransport CAMEL_GROUPWISE_TRANSPORT CAMEL_IS_GROUPWISE_TRANSPORT CAMEL_GROUPWISE_TRANSPORT_TYPE -camel_groupwise_transport_get_type CAMEL_GROUPWISE_TRANSPORT_CLASS +CamelGroupwiseTransportClass + +camel_groupwise_transport_get_type
camel-groupwise-journal +CamelGroupwiseJournal CamelGroupwiseJournal CamelGroupwiseJournalEntry -CamelGroupwiseJournal camel_groupwise_journal_new camel_groupwise_journal_append camel_groupwise_journal_transfer @@ -2076,14 +2375,17 @@ camel_groupwise_journal_transfer CAMEL_GROUPWISE_JOURNAL CAMEL_IS_GROUPWISE_JOURNAL CAMEL_TYPE_GROUPWISE_JOURNAL -camel_groupwise_journal_get_type CAMEL_GROUPWISE_JOURNAL_CLASS CAMEL_IS_GROUPWISE_JOURNAL_CLASS CAMEL_GROUPWISE_JOURNAL_GET_CLASS +CamelGroupwiseJournalClass + +camel_groupwise_journal_get_type
camel-imap4-engine +CamelIMAP4Engine CamelIMAP4Engine camel_imap4_engine_t camel_imap4_level_t @@ -2092,7 +2394,6 @@ CamelIMAP4RespCode CamelIMAP4Namespace CamelIMAP4NamespaceList CamelIMAP4ReconnectFunc -CamelIMAP4Engine camel_imap4_engine_new camel_imap4_engine_take_stream camel_imap4_engine_capability @@ -2102,46 +2403,52 @@ camel_imap4_engine_select_folder CAMEL_IMAP4_ENGINE CAMEL_IS_IMAP4_ENGINE CAMEL_TYPE_IMAP4_ENGINE -camel_imap4_engine_get_type CAMEL_IMAP4_ENGINE_CLASS CAMEL_IS_IMAP4_ENGINE_CLASS CAMEL_IMAP4_ENGINE_GET_CLASS +CamelIMAP4EngineClass + +camel_imap4_engine_get_type
camel-imap4-folder -CamelIMAP4Folder CamelIMAP4Folder +CamelIMAP4Folder camel_imap4_folder_new camel_imap4_folder_utf7_name CAMEL_IMAP4_FOLDER CAMEL_IS_IMAP4_FOLDER CAMEL_TYPE_IMAP4_FOLDER -camel_imap4_folder_get_type CAMEL_IMAP4_FOLDER_CLASS CAMEL_IS_IMAP4_FOLDER_CLASS CAMEL_IMAP4_FOLDER_GET_CLASS +CamelIMAP4FolderClass + +camel_imap4_folder_get_type
camel-imap4-search -CamelIMAP4Search CamelIMAP4Search +CamelIMAP4Search camel_imap4_search_new CAMEL_IMAP4_SEARCH CAMEL_IS_IMAP4_SEARCH CAMEL_IMAP4_SEARCH_TYPE -camel_imap4_search_get_type CAMEL_IMAP4_SEARCH_CLASS +CamelIMAP4SearchClass + +camel_imap4_search_get_type
camel-imap4-store-summary +CamelIMAP4StoreSummary CamelIMAP4StoreInfo CamelIMAP4StoreSummary -CamelIMAP4StoreSummary camel_imap4_store_summary_new camel_imap4_store_summary_set_capabilities camel_imap4_store_summary_set_namespaces @@ -2150,31 +2457,35 @@ camel_imap4_store_summary_unnote_info CAMEL_IMAP4_STORE_SUMMARY CAMEL_IS_IMAP4_STORE_SUMMARY -camel_imap4_store_summary_get_type CAMEL_IMAP4_STORE_SUMMARY_CLASS +CamelIMAP4StoreSummaryClass + +camel_imap4_store_summary_get_type
camel-imap4-store -CamelIMAP4Store CamelIMAP4Store +CamelIMAP4Store CAMEL_IMAP4_STORE CAMEL_IS_IMAP4_STORE CAMEL_TYPE_IMAP4_STORE -camel_imap4_store_get_type CAMEL_IMAP4_STORE_CLASS CAMEL_IS_IMAP4_STORE_CLASS CAMEL_IMAP4_STORE_GET_CLASS +CamelIMAP4StoreClass + +camel_imap4_store_get_type
camel-imap4-stream +CamelIMAP4Stream IMAP4_READ_PRELEN IMAP4_READ_BUFLEN camel_imap4_token_t CamelIMAP4Stream -CamelIMAP4Stream camel_imap4_stream_new camel_imap4_stream_next_token camel_imap4_stream_unget_token @@ -2184,17 +2495,19 @@ camel_imap4_stream_literal CAMEL_IMAP4_STREAM CAMEL_IS_IMAP4_STREAM CAMEL_TYPE_IMAP4_STREAM -camel_imap4_stream_get_type CAMEL_IMAP4_STREAM_CLASS +CamelIMAP4StreamClass + +camel_imap4_stream_get_type
camel-imap4-summary +CamelIMAP4Summary CamelIMAP4Summary CamelIMAP4MessageInfo CamelIMAP4MessageContentInfo CAMEL_IMAP4_MESSAGE_RECENT -CamelIMAP4Summary camel_imap4_summary_new camel_imap4_summary_set_exists camel_imap4_summary_set_recent @@ -2207,17 +2520,19 @@ camel_imap4_summary_flush_updates CAMEL_IMAP4_SUMMARY CAMEL_IS_IMAP4_SUMMARY CAMEL_TYPE_IMAP4_SUMMARY -camel_imap4_summary_get_type CAMEL_IMAP4_SUMMARY_CLASS CAMEL_IS_IMAP4_SUMMARY_CLASS CAMEL_IMAP4_SUMMARY_GET_CLASS +CamelIMAP4SummaryClass + +camel_imap4_summary_get_type
camel-imap4-journal +CamelIMAP4Journal CamelIMAP4Journal CamelIMAP4JournalEntry -CamelIMAP4Journal camel_imap4_journal_new camel_imap4_journal_readd_failed camel_imap4_journal_append @@ -2225,20 +2540,22 @@ camel_imap4_journal_append CAMEL_IMAP4_JOURNAL CAMEL_IS_IMAP4_JOURNAL CAMEL_TYPE_IMAP4_JOURNAL -camel_imap4_journal_get_type CAMEL_IMAP4_JOURNAL_CLASS CAMEL_IS_IMAP4_JOURNAL_CLASS CAMEL_IMAP4_JOURNAL_GET_CLASS +CamelIMAP4JournalClass + +camel_imap4_journal_get_type
camel-imapp-driver +CamelIMAPPDriver CamelIMAPPDriver CamelIMAPPFetch CamelIMAPPDriverFunc CamelIMAPPLoginFunc CamelIMAPPFetchFunc -CamelIMAPPDriver camel_imapp_driver_new camel_imapp_driver_set_sasl_factory camel_imapp_driver_set_login_query @@ -2250,12 +2567,15 @@ camel_imapp_driver_sync CAMEL_IMAPP_DRIVER CAMEL_IS_IMAP_DRIVER CAMEL_IMAPP_DRIVER_TYPE -camel_imapp_driver_get_type CAMEL_IMAPP_DRIVER_CLASS +CamelIMAPPDriverClass + +camel_imapp_driver_get_type
camel-imapp-engine +CamelIMAPPEngine CamelIMAPPEngine CamelIMAPPCommandPart CamelIMAPPCommand @@ -2264,7 +2584,6 @@ CamelIMAPPEngineFunc CamelIMAPPCommandFunc CamelIMAPPSelectResponse camel_imapp_engine_state_t -CamelIMAPPEngine camel_imapp_engine_new camel_imapp_engine_add_handler camel_imapp_engine_iterate @@ -2283,41 +2602,47 @@ camel_imapp_engine_select_free CAMEL_IMAPP_ENGINE CAMEL_IS_IMAP_ENGINE CAMEL_IMAPP_ENGINE_TYPE -camel_imapp_engine_get_type CAMEL_IMAPP_ENGINE_CLASS +CamelIMAPPEngineClass + +camel_imapp_engine_get_type
camel-imapp-fetch-stream -CamelIMAPPFetchStream CamelIMAPPFetchStream +CamelIMAPPFetchStream camel_imapp_fetch_stream_new CAMEL_IMAPP_FETCH_STREAM CAMEL_IS_IMAP_FETCH_STREAM -camel_imapp_fetch_stream_get_type CAMEL_IMAPP_FETCH_STREAM_CLASS +CamelIMAPPFetchStreamClass + +camel_imapp_fetch_stream_get_type
camel-imapp-folder -CamelIMAPPFolder CamelIMAPPFolder +CamelIMAPPFolder camel_imapp_folder_new CAMEL_IMAPP_FOLDER CAMEL_IS_IMAP_FOLDER CAMEL_IMAPP_FOLDER_TYPE -camel_imapp_folder_get_type CAMEL_IMAPP_FOLDER_CLASS +CamelIMAPPFolderClass + +camel_imapp_folder_get_type
camel-imapp-store-summary +CamelIMAPPStoreSummary CamelIMAPPStoreSummary CamelIMAPPStoreInfo CamelIMAPPStoreNamespace -CamelIMAPPStoreSummary camel_imapp_store_summary_new camel_imapp_store_summary_namespace_new camel_imapp_store_summary_namespace_set @@ -2332,28 +2657,32 @@ camel_imapp_store_info_full_name CAMEL_IMAPP_STORE_SUMMARY CAMEL_IS_IMAP_STORE_SUMMARY -camel_imapp_store_summary_get_type CAMEL_IMAPP_STORE_SUMMARY_CLASS +CamelIMAPPStoreSummaryClass + +camel_imapp_store_summary_get_type
camel-imapp-store +CamelIMAPPStore CamelIMAPPStore pending_fetch -CamelIMAPPStore CAMEL_IMAPP_STORE CAMEL_IS_IMAP_STORE CAMEL_IMAPP_STORE_TYPE -camel_imapp_store_get_type CAMEL_IMAPP_STORE_CLASS +CamelIMAPPStoreClass + +camel_imapp_store_get_type
camel-imapp-stream +CamelIMAPPStream CamelIMAPPStream camel_imapp_token_t -CamelIMAPPStream camel_imapp_stream_new camel_imapp_stream_token camel_imapp_stream_ungettoken @@ -2369,29 +2698,33 @@ camel_imapp_stream_number CAMEL_IMAPP_STREAM CAMEL_IS_IMAP_STREAM -camel_imapp_stream_get_type CAMEL_IMAPP_STREAM_CLASS +CamelIMAPPStreamClass + +camel_imapp_stream_get_type
camel-imapp-summary +CamelIMAPPSummary CAMEL_IMAPP_SERVER_FLAGS CAMEL_IMAPP_MESSAGE_RECENT CamelIMAPPSummary CamelIMAPPMessageInfo -CamelIMAPPSummary camel_imapp_summary_new CAMEL_IMAPP_SUMMARY CAMEL_IS_IMAPP_SUMMARY -camel_imapp_summary_get_type CAMEL_IMAPP_SUMMARY_CLASS +CamelIMAPPSummaryClass + +camel_imapp_summary_get_type
camel-local-folder -CamelLocalFolder CamelLocalFolder +CamelLocalFolder camel_local_folder_construct camel_local_folder_lock camel_local_folder_unlock @@ -2399,14 +2732,17 @@ camel_local_folder_unlock CAMEL_LOCAL_FOLDER CAMEL_IS_LOCAL_FOLDER CAMEL_LOCAL_FOLDER_TYPE -camel_local_folder_get_type CAMEL_LOCAL_FOLDER_CLASS +CamelLocalFolderClass + +CamelLocalFolderPrivate +camel_local_folder_get_type
camel-local-store -CamelLocalStore CamelLocalStore +CamelLocalStore camel_local_store_get_toplevel_dir camel_local_store_get_full_path camel_local_store_get_meta_path @@ -2414,15 +2750,17 @@ camel_local_store_get_meta_path CAMEL_LOCAL_STORE CAMEL_IS_LOCAL_STORE CAMEL_LOCAL_STORE_TYPE -camel_local_store_get_type CAMEL_LOCAL_STORE_CLASS +CamelLocalStoreClass + +camel_local_store_get_type
camel-local-summary +CamelLocalSummary CamelLocalSummary CamelLocalMessageInfo -CamelLocalSummary camel_local_summary_construct camel_local_summary_load camel_local_summary_check @@ -2435,41 +2773,47 @@ camel_local_summary_write_headers CAMEL_LOCAL_SUMMARY CAMEL_IS_LOCAL_SUMMARY -camel_local_summary_get_type CAMEL_LOCAL_SUMMARY_CLASS +CamelLocalSummaryClass + +camel_local_summary_get_type
camel-maildir-folder -CamelMaildirFolder CamelMaildirFolder +CamelMaildirFolder camel_maildir_folder_new CAMEL_MAILDIR_FOLDER CAMEL_IS_MAILDIR_FOLDER CAMEL_MAILDIR_FOLDER_TYPE -camel_maildir_folder_get_type CAMEL_MAILDIR_FOLDER_CLASS +CamelMaildirFolderClass + +camel_maildir_folder_get_type
camel-maildir-store -CamelMaildirStore CamelMaildirStore +CamelMaildirStore CAMEL_MAILDIR_STORE CAMEL_IS_MAILDIR_STORE CAMEL_MAILDIR_STORE_TYPE -camel_maildir_store_get_type CAMEL_MAILDIR_STORE_CLASS +CamelMaildirStoreClass + +camel_maildir_store_get_type
camel-maildir-summary +CamelMaildirSummary CamelMaildirSummary CamelMaildirMessageContentInfo CamelMaildirMessageInfo -CamelMaildirSummary camel_maildir_summary_new camel_maildir_summary_info_to_name camel_maildir_summary_name_to_info @@ -2478,119 +2822,137 @@ camel_maildir_info_set_filename CAMEL_MAILDIR_SUMMARY CAMEL_IS_MAILDIR_SUMMARY -camel_maildir_summary_get_type CAMEL_MAILDIR_SUMMARY_CLASS +CamelMaildirSummaryClass + +camel_maildir_summary_get_type
camel-mbox-folder -CamelMboxFolder CamelMboxFolder +CamelMboxFolder camel_mbox_folder_new CAMEL_MBOX_FOLDER CAMEL_IS_MBOX_FOLDER CAMEL_MBOX_FOLDER_TYPE -camel_mbox_folder_get_type CAMEL_MBOX_FOLDER_CLASS +CamelMboxFolderClass + +camel_mbox_folder_get_type
camel-mbox-store -CamelMboxStore CamelMboxStore +CamelMboxStore CAMEL_MBOX_STORE CAMEL_IS_MBOX_STORE CAMEL_MBOX_STORE_TYPE -camel_mbox_store_get_type CAMEL_MBOX_STORE_CLASS +CamelMboxStoreClass + +camel_mbox_store_get_type
camel-mbox-summary +CamelMboxSummary STATUS_PINE CamelMboxSummary CamelMboxMessageContentInfo CamelMboxMessageInfo -CamelMboxSummary camel_mbox_summary_new camel_mbox_summary_xstatus camel_mbox_summary_sync_mbox CAMEL_MBOX_SUMMARY CAMEL_IS_MBOX_SUMMARY -camel_mbox_summary_get_type CAMEL_MBOX_SUMMARY_CLASS +CamelMboxSummaryClass + +camel_mbox_summary_get_type
camel-mh-folder -CamelMhFolder CamelMhFolder +CamelMhFolder camel_mh_folder_new CAMEL_MH_FOLDER CAMEL_IS_MH_FOLDER CAMEL_MH_FOLDER_TYPE -camel_mh_folder_get_type CAMEL_MH_FOLDER_CLASS +CamelMhFolderClass + +camel_mh_folder_get_type
camel-mh-store -CamelMhStore CamelMhStore +CamelMhStore CAMEL_MH_STORE CAMEL_IS_MH_STORE CAMEL_MH_STORE_TYPE -camel_mh_store_get_type CAMEL_MH_STORE_CLASS +CamelMhStoreClass + +camel_mh_store_get_type
camel-mh-summary -CamelMhSummary CamelMhSummary +CamelMhSummary camel_mh_summary_new CAMEL_MH_SUMMARY CAMEL_IS_MH_SUMMARY -camel_mh_summary_get_type CAMEL_MH_SUMMARY_CLASS +CamelMhSummaryClass + +camel_mh_summary_get_type
camel-spool-folder -CamelSpoolFolder CamelSpoolFolder +CamelSpoolFolder camel_spool_folder_new CAMEL_SPOOL_FOLDER CAMEL_IS_SPOOL_FOLDER CAMEL_SPOOL_FOLDER_TYPE -camel_spool_folder_get_type CAMEL_SPOOL_FOLDER_CLASS +CamelSpoolFolderClass + +camel_spool_folder_get_type
camel-spool-store +CamelSpoolStore CamelSpoolStore camel_spool_store_t -CamelSpoolStore CAMEL_SPOOL_STORE CAMEL_IS_SPOOL_STORE CAMEL_SPOOL_STORE_TYPE -camel_spool_store_get_type CAMEL_SPOOL_STORE_CLASS +CamelSpoolStoreClass + +camel_spool_store_get_type
camel-spool-summary -CamelSpoolSummary CamelSpoolSummary +CamelSpoolSummary camel_spool_summary_construct camel_spool_summary_new camel_spool_summary_load @@ -2603,30 +2965,35 @@ camel_spool_summary_write_headers CAMEL_SPOOL_SUMMARY CAMEL_IS_SPOOL_SUMMARY -camel_spool_summary_get_type CAMEL_SPOOL_SUMMARY_CLASS +CamelSpoolSummaryClass + +camel_spool_summary_get_type
camel-nntp-folder -CamelNNTPFolder CamelNNTPFolder +CamelNNTPFolder camel_nntp_folder_new camel_nntp_folder_selected CAMEL_NNTP_FOLDER CAMEL_IS_NNTP_FOLDER CAMEL_NNTP_FOLDER_TYPE -camel_nntp_folder_get_type CAMEL_NNTP_FOLDER_CLASS +CamelNNTPFolderClass + +CamelNNTPFolderPrivate +camel_nntp_folder_get_type
camel-nntp-store-summary +CamelNNTPStoreSummary CamelNNTPStoreInfo CamelNNTPStoreSummary NNTP_DATE_SIZE -CamelNNTPStoreSummary camel_nntp_store_summary_new camel_nntp_store_info_full_name camel_nntp_store_summary_full_to_path @@ -2638,12 +3005,15 @@ camel_nntp_store_summary_full_from_path CAMEL_NNTP_STORE_SUMMARY CAMEL_IS_NNTP_STORE_SUMMARY -camel_nntp_store_summary_get_type CAMEL_NNTP_STORE_SUMMARY_CLASS +CamelNNTPStoreSummaryClass + +camel_nntp_store_summary_get_type
camel-nntp-store +CamelNNTPStore CamelNNTPStore CAMEL_NNTP_EXT_SEARCH CAMEL_NNTP_EXT_SETGET @@ -2655,7 +3025,6 @@ CAMEL_NNTP_EXT_LISTSUBSCR CAMEL_NNTP_EXT_LISTPNAMES xover_t xover_header -CamelNNTPStore camel_nntp_raw_commandv camel_nntp_raw_command camel_nntp_raw_command_auth @@ -2664,15 +3033,18 @@ camel_nntp_command CAMEL_NNTP_STORE CAMEL_IS_NNTP_STORE CAMEL_NNTP_STORE_TYPE -camel_nntp_store_get_type CAMEL_NNTP_STORE_CLASS +CamelNNTPStoreClass + +CamelNNTPStorePrivate +camel_nntp_store_get_type
camel-nntp-stream +CamelNNTPStream CamelNNTPStream camel_nntp_stream_mode_t -CamelNNTPStream camel_nntp_stream_new camel_nntp_stream_set_mode camel_nntp_stream_line @@ -2681,31 +3053,35 @@ camel_nntp_stream_getd CAMEL_NNTP_STREAM CAMEL_IS_NNTP_STREAM -camel_nntp_stream_get_type CAMEL_NNTP_STREAM_CLASS +CamelNNTPStreamClass + +camel_nntp_stream_get_type
camel-nntp-summary -CamelNNTPSummary CamelNNTPSummary +CamelNNTPSummary camel_nntp_summary_new camel_nntp_summary_check CAMEL_NNTP_SUMMARY CAMEL_IS_LOCAL_SUMMARY -camel_nntp_summary_get_type CAMEL_NNTP_SUMMARY_CLASS +CamelNNTPSummaryClass + +camel_nntp_summary_get_type
camel-pop3-engine +CamelPOP3Engine CamelPOP3Engine CamelPOP3Command camel_pop3_engine_t camel_pop3_command_t CamelPOP3CommandFunc -CamelPOP3Engine camel_pop3_engine_new camel_pop3_engine_reget_capabilities camel_pop3_engine_command_free @@ -2714,28 +3090,33 @@ camel_pop3_engine_command_new CAMEL_POP3_ENGINE CAMEL_IS_POP3_ENGINE -camel_pop3_engine_get_type CAMEL_POP3_ENGINE_CLASS +CamelPOP3EngineClass + +camel_pop3_engine_get_type
camel-pop3-folder +CamelPOP3Folder CamelPOP3Folder CamelPOP3FolderInfo -CamelPOP3Folder camel_pop3_folder_new +camel_pop3_delete_old CAMEL_POP3_FOLDER CAMEL_IS_POP3_FOLDER CAMEL_POP3_FOLDER_TYPE -camel_pop3_folder_get_type CAMEL_POP3_FOLDER_CLASS +CamelPOP3FolderClass + +camel_pop3_folder_get_type
camel-pop3-store -CamelPOP3Store CamelPOP3Store +CamelPOP3Store camel_pop3_store_expunge camel_pop3_command camel_pop3_command_get_additional_data @@ -2743,15 +3124,17 @@ camel_pop3_command_get_additional_data CAMEL_POP3_STORE CAMEL_IS_POP3_STORE CAMEL_POP3_STORE_TYPE -camel_pop3_store_get_type CAMEL_POP3_STORE_CLASS +CamelPOP3StoreClass + +camel_pop3_store_get_type
camel-pop3-stream +CamelPOP3Stream CamelPOP3Stream camel_pop3_stream_mode_t -CamelPOP3Stream camel_pop3_stream_new camel_pop3_stream_set_mode camel_pop3_stream_line @@ -2760,50 +3143,58 @@ camel_pop3_stream_getd CAMEL_POP3_STREAM CAMEL_IS_POP3_STREAM -camel_pop3_stream_get_type CAMEL_POP3_STREAM_CLASS +CamelPOP3StreamClass + +camel_pop3_stream_get_type
camel-sendmail-transport -CamelSendmailTransport CamelSendmailTransport +CamelSendmailTransport CAMEL_SENDMAIL_TRANSPORT CAMEL_IS_SENDMAIL_TRANSPORT CAMEL_SENDMAIL_TRANSPORT_TYPE -camel_sendmail_transport_get_type CAMEL_SENDMAIL_TRANSPORT_CLASS +CamelSendmailTransportClass + +camel_sendmail_transport_get_type
camel-smtp-transport +CamelSmtpTransport CamelSmtpTransport CAMEL_SMTP_TRANSPORT_IS_ESMTP CAMEL_SMTP_TRANSPORT_8BITMIME CAMEL_SMTP_TRANSPORT_ENHANCEDSTATUSCODES CAMEL_SMTP_TRANSPORT_STARTTLS CAMEL_SMTP_TRANSPORT_AUTH_EQUAL -CamelSmtpTransport CAMEL_SMTP_TRANSPORT CAMEL_IS_SMTP_TRANSPORT CAMEL_SMTP_TRANSPORT_TYPE -camel_smtp_transport_get_type CAMEL_SMTP_TRANSPORT_CLASS +CamelSmtpTransportClass + +camel_smtp_transport_get_type
session -CamelTestSession CamelTestSession +CamelTestSession camel_test_session_new CAMEL_TEST_SESSION CAMEL_TEST_IS_SESSION CAMEL_TEST_SESSION_TYPE -camel_test_session_get_type CAMEL_TEST_SESSION_CLASS +CamelTestSessionClass + +camel_test_session_get_type
@@ -2827,41 +3218,6 @@ CamelProperty
-camel-block-file -camel_block_t -camel_key_t -CamelBlockRoot -CamelBlock -CamelBlockFile -CAMEL_BLOCK_FILE_SYNC -CAMEL_BLOCK_SIZE -CAMEL_BLOCK_SIZE_BITS -CAMEL_BLOCK_DIRTY -CAMEL_BLOCK_DETACHED -CamelBlockFile -camel_block_file_get_type -camel_block_file_new -camel_block_file_rename -camel_block_file_delete -camel_block_file_new_block -camel_block_file_free_block -camel_block_file_get_block -camel_block_file_detach_block -camel_block_file_attach_block -camel_block_file_touch_block -camel_block_file_unref_block -camel_block_file_sync_block -camel_block_file_sync -CamelKeyFile -camel_key_file_get_type -camel_key_file_new -camel_key_file_rename -camel_key_file_delete -camel_key_file_write -camel_key_file_read -
- -
camel-charset-map CamelCharset camel_charset_init @@ -2901,6 +3257,7 @@ camel_exception_is_set
camel-file-utils +O_BINARY camel_file_util_encode_fixed_int32 camel_file_util_decode_fixed_int32 camel_file_util_encode_uint32 @@ -2913,9 +3270,13 @@ camel_file_util_encode_size_t camel_file_util_decode_size_t camel_file_util_encode_string camel_file_util_decode_string +camel_file_util_encode_fixed_string +camel_file_util_decode_fixed_string camel_file_util_safe_filename camel_read camel_write +camel_read_socket +camel_write_socket camel_file_util_savename
@@ -3030,6 +3391,11 @@ camel_unlock_folder
+camel-mime-part-utils +camel_mime_part_construct_content_from_parser +
+ +
camel-mime-utils CAMEL_FOLD_SIZE CAMEL_FOLD_MAX_SIZE @@ -3086,13 +3452,14 @@ camel_operation_cancel_fd
camel-partition-table +CamelPartitionTable +CamelKeyTable camel_hash_t CamelPartitionKey CamelPartitionKeyBlock CamelPartitionMap CamelPartitionMapBlock -CamelPartitionTable -camel_partition_table_get_type +CamelPartitionTable camel_partition_table_new camel_partition_table_sync camel_partition_table_add @@ -3102,8 +3469,7 @@ CamelKeyBlock CamelKeyRootBlock CamelKeyKey CAMEL_KEY_TABLE_MAX_KEY -CamelKeyTable -camel_key_table_get_type +CamelKeyTable camel_key_table_new camel_key_table_sync camel_key_table_add @@ -3111,6 +3477,12 @@ camel_key_table_set_data camel_key_table_set_flags camel_key_table_lookup camel_key_table_next + +CamelPartitionTableClass +CamelKeyTableClass + +camel_partition_table_get_type +camel_key_table_get_type
@@ -3120,21 +3492,6 @@ camel_process_wait
-camel-search-private -camel_search_flags_t -camel_search_match_t -camel_search_t -camel_search_build_match_regex -camel_search_message_body_contains -camel_search_header_match -camel_search_camel_header_soundex -camel_ustrstrcase -camel_search_word_t -camel_search_word -camel_search_words -
- -
camel-string-utils camel_strcase_equal camel_strcase_hash @@ -3143,63 +3500,12 @@ camel_strstrcase camel_strdown camel_tolower camel_toupper +camel_pstring_add camel_pstring_strdup camel_pstring_free
-camel-types -CamelAddress -CamelDigestFolder -CamelDigestStore -CamelDiscoDiary -CamelDiscoFolder -CamelDiscoStore -CamelDataWrapper -CamelException -CamelFilterDriver -CamelFolder -CamelFolderSearch -CamelFolderSummary -CamelInternetAddress -CamelMedium -CamelMessageContentInfo -CamelMimeFilter -CamelMimeFilterBasic -CamelMimeFilterBestenc -CamelMimeFilterCharset -CamelMimeFilterChomp -CamelMimeFilterIndex -CamelMimeFilterLinewrap -CamelMimeFilterSave -CamelMimeFilterCRLF -CamelMimeMessage -CamelMimeParser -CamelMimePart -CamelMultipart -CamelNewsAddress -CamelSeekableStream -CamelSeekableSubstream -CamelService -CamelSession -CamelSimpleDataWrapper -CamelStore -CamelStream -CamelStreamNull -CamelStreamBuffer -CamelStreamDataWrapper -CamelStreamFilter -CamelStreamFs -CamelStreamMem -CamelTcpStream -CamelTcpStreamRaw -CamelTcpStreamSSL -CamelTcpStreamOpenSSL -CamelHttpStream -CamelTransport -
- -
camel-uid-cache CamelUIDCache camel_uid_cache_new @@ -3241,6 +3547,7 @@ camel_url_to_string camel_url_free camel_url_encode camel_url_decode +camel_url_decode_path camel_url_set_protocol camel_url_set_user camel_url_set_authmech @@ -3315,26 +3622,6 @@ camel_imap_command_response
-camel-imap-private -CamelImapFolderPrivate -CAMEL_IMAP_FOLDER_LOCK -CAMEL_IMAP_FOLDER_UNLOCK -CamelImapWrapperPrivate -CAMEL_IMAP_WRAPPER_LOCK -CAMEL_IMAP_WRAPPER_UNLOCK -
- -
-camel-imap-types -CamelImapFolder -CamelImapMessageCache -CamelImapResponse -CamelImapSearch -CamelImapStore -CamelImapSummary -
- -
camel-imap-utils imap_next_word namespace @@ -3361,15 +3648,10 @@ imap_path_find_folders
-camel-groupwise-private -CAMEL_GROUPWISE_FOLDER_LOCK -CAMEL_GROUPWISE_FOLDER_UNLOCK -
- -
camel-groupwise-utils X_SEND_OPTIONS X_SEND_OPT_PRIORITY +X_SEND_OPT_SECURITY X_REPLY_CONVENIENT X_REPLY_WITHIN X_EXPIRE_AFTER @@ -3389,7 +3671,8 @@ e_path_find_folders e_path_rmdir camel_groupwise_util_item_from_message do_flags_diff -add_recipients +gw_concat +strip_lt_gt
@@ -3475,13 +3758,6 @@ imapp_uidset_add
-camel-local-private -CamelLocalFolderPrivate -CAMEL_LOCAL_FOLDER_LOCK -CAMEL_LOCAL_FOLDER_UNLOCK -
- -
camel-nntp-auth camel_nntp_auth_authenticate
@@ -3514,16 +3790,6 @@ camel_nntp_newsrc_read_for_server
-camel-nntp-private -CamelNNTPStorePrivate -CAMEL_NNTP_STORE_LOCK -CAMEL_NNTP_STORE_UNLOCK -CamelNNTPFolderPrivate -CAMEL_NNTP_FOLDER_LOCK -CAMEL_NNTP_FOLDER_UNLOCK -
- -
camel-nntp-resp-codes CAMEL_NNTP_OK CAMEL_NNTP_ERR @@ -3549,15 +3815,6 @@ NNTP_PROTOCOL_ERROR
-camel-nntp-types -CamelNNTPGroupList -CamelNNTPGroupListEntry -CamelNNTPOverField -CamelNNTPStore -CamelNNTPStoreClass -
- -
camel-nntp-utils camel_nntp_get_headers
diff --git a/docs/reference/camel/camel.hierarchy b/docs/reference/camel/camel.hierarchy index 645f757..e69de29 100644 --- a/docs/reference/camel/camel.hierarchy +++ b/docs/reference/camel/camel.hierarchy @@ -1,67 +0,0 @@ -CamelException -CamelObject - CamelAddress - CamelInternetAddress - CamelDataWrapper - CamelMedium - CamelMimePart - CamelMimeMessage - CamelMultipart - CamelMultipartEncrypted - CamelMultipartSigned - CamelCipherContext - CamelGpgContext - CamelSMIMEContext - CamelFolder - CamelOfflineFolder - CamelVeeFolder - CamelVTrashFolder - CamelFolderSummary - CamelVeeSummary - CamelMimeFilter - CamelMimeFilterBasic - CamelMimeFilterBestenc - CamelMimeFilterCanon - CamelMimeFilterCharset - CamelMimeFilterCRLF - CamelMimeFilterEnriched - CamelMimeFilterFrom - CamelMimeFilterHTML - CamelMimeFilterIndex - CamelMimeFilterSave - CamelMimeFilterToHTML - CamelMimeFilterWindows - CamelMimeFilterYenc - CamelMimeParser - CamelOfflineJournal - CamelSasl - CamelSaslAnonymous - CamelSaslCramMd5 - CamelSaslDigestMd5 - CamelSaslGssapi - CamelSaslKerberos4 - CamelSaslLogin - CamelSaslNTLM - CamelSaslPlain - CamelSaslPOPB4SMTP - CamelService - CamelStore - CamelOfflineStore - CamelVeeStore - CamelTransport - CamelSession - CamelStoreSummary - CamelStream - CamelHTTPStream - CamelSeekableStream - CamelSeekableSubstream - CamelStreamFs - CamelStreamMem - CamelStreamBuffer - CamelStreamFilter - CamelStreamNull - CamelStreamProcess - CamelTcpStream - CamelTcpStreamRaw - CamelTcpStreamSSL -CamelProvider diff --git a/docs/reference/camel/tmpl/address-data.sgml b/docs/reference/camel/tmpl/address-data.sgml index 30e9310..b34ef75 100644 --- a/docs/reference/camel/tmpl/address-data.sgml +++ b/docs/reference/camel/tmpl/address-data.sgml @@ -14,3 +14,6 @@ address-data + + + diff --git a/docs/reference/camel/tmpl/addresses.sgml b/docs/reference/camel/tmpl/addresses.sgml index 5d24eb0..98f3342 100644 --- a/docs/reference/camel/tmpl/addresses.sgml +++ b/docs/reference/camel/tmpl/addresses.sgml @@ -14,6 +14,9 @@ addresses + + + diff --git a/docs/reference/camel/tmpl/camel-address.sgml b/docs/reference/camel/tmpl/camel-address.sgml index e329e8b..be2f32a 100644 --- a/docs/reference/camel/tmpl/camel-address.sgml +++ b/docs/reference/camel/tmpl/camel-address.sgml @@ -14,11 +14,17 @@ CamelAddress + + + +@parent: +@addresses: +@priv: diff --git a/docs/reference/camel/tmpl/camel-arg.sgml b/docs/reference/camel/tmpl/camel-arg.sgml index 9994e8d..a1ad38c 100644 --- a/docs/reference/camel/tmpl/camel-arg.sgml +++ b/docs/reference/camel/tmpl/camel-arg.sgml @@ -14,6 +14,9 @@ camel-arg + + + diff --git a/docs/reference/camel/tmpl/camel-block-file.sgml b/docs/reference/camel/tmpl/camel-block-file.sgml index 0853865..454f9d4 100644 --- a/docs/reference/camel/tmpl/camel-block-file.sgml +++ b/docs/reference/camel/tmpl/camel-block-file.sgml @@ -14,6 +14,9 @@ CamelKeyFile + + + @@ -104,14 +107,6 @@ CamelKeyFile - - - - - -@Returns: - - @@ -227,13 +222,17 @@ CamelKeyFile @Returns: - + -@Returns: - +@parent: +@priv: +@fp: +@path: +@flags: +@last: diff --git a/docs/reference/camel/tmpl/camel-certdb.sgml b/docs/reference/camel/tmpl/camel-certdb.sgml index 80edbdf..d2d3e71 100644 --- a/docs/reference/camel/tmpl/camel-certdb.sgml +++ b/docs/reference/camel/tmpl/camel-certdb.sgml @@ -14,6 +14,9 @@ CamelCertDB + + + diff --git a/docs/reference/camel/tmpl/camel-charset-map.sgml b/docs/reference/camel/tmpl/camel-charset-map.sgml index fb9f302..6886b22 100644 --- a/docs/reference/camel/tmpl/camel-charset-map.sgml +++ b/docs/reference/camel/tmpl/camel-charset-map.sgml @@ -14,6 +14,9 @@ camel-charset-map + + + diff --git a/docs/reference/camel/tmpl/camel-cipher-context.sgml b/docs/reference/camel/tmpl/camel-cipher-context.sgml index 7d3741e..aeee1f5 100644 --- a/docs/reference/camel/tmpl/camel-cipher-context.sgml +++ b/docs/reference/camel/tmpl/camel-cipher-context.sgml @@ -14,11 +14,20 @@ CamelCipherContext + + + +@parent_object: +@priv: +@session: +@sign_protocol: +@encrypt_protocol: +@key_protocol: diff --git a/docs/reference/camel/tmpl/camel-data-cache.sgml b/docs/reference/camel/tmpl/camel-data-cache.sgml index b709439..a14f891 100644 --- a/docs/reference/camel/tmpl/camel-data-cache.sgml +++ b/docs/reference/camel/tmpl/camel-data-cache.sgml @@ -14,6 +14,9 @@ CamelDataCache + + + diff --git a/docs/reference/camel/tmpl/camel-data-wrapper.sgml b/docs/reference/camel/tmpl/camel-data-wrapper.sgml index cb563c4..6a941a7 100644 --- a/docs/reference/camel/tmpl/camel-data-wrapper.sgml +++ b/docs/reference/camel/tmpl/camel-data-wrapper.sgml @@ -14,11 +14,20 @@ CamelDataWrapper + + + +@parent_object: +@priv: +@encoding: +@mime_type: +@stream: +@offline: diff --git a/docs/reference/camel/tmpl/camel-debug.sgml b/docs/reference/camel/tmpl/camel-debug.sgml index 475ec72..7293014 100644 --- a/docs/reference/camel/tmpl/camel-debug.sgml +++ b/docs/reference/camel/tmpl/camel-debug.sgml @@ -14,6 +14,9 @@ camel-debug + + + diff --git a/docs/reference/camel/tmpl/camel-digest-folder.sgml b/docs/reference/camel/tmpl/camel-digest-folder.sgml index 3ed140d..f57d24b 100644 --- a/docs/reference/camel/tmpl/camel-digest-folder.sgml +++ b/docs/reference/camel/tmpl/camel-digest-folder.sgml @@ -14,6 +14,9 @@ CamelDigestFolder + + + diff --git a/docs/reference/camel/tmpl/camel-digest-store.sgml b/docs/reference/camel/tmpl/camel-digest-store.sgml index 51d4cac..31b235b 100644 --- a/docs/reference/camel/tmpl/camel-digest-store.sgml +++ b/docs/reference/camel/tmpl/camel-digest-store.sgml @@ -14,6 +14,9 @@ CamelDigestStore + + + diff --git a/docs/reference/camel/tmpl/camel-digest-summary.sgml b/docs/reference/camel/tmpl/camel-digest-summary.sgml index b096bc9..3bbd09e 100644 --- a/docs/reference/camel/tmpl/camel-digest-summary.sgml +++ b/docs/reference/camel/tmpl/camel-digest-summary.sgml @@ -14,6 +14,9 @@ CamelDigestSummary + + + diff --git a/docs/reference/camel/tmpl/camel-disco-diary.sgml b/docs/reference/camel/tmpl/camel-disco-diary.sgml index 85f3185..3e32b0d 100644 --- a/docs/reference/camel/tmpl/camel-disco-diary.sgml +++ b/docs/reference/camel/tmpl/camel-disco-diary.sgml @@ -14,6 +14,9 @@ CamelDiscoDiary + + + diff --git a/docs/reference/camel/tmpl/camel-disco-folder.sgml b/docs/reference/camel/tmpl/camel-disco-folder.sgml index f22d564..c0cff22 100644 --- a/docs/reference/camel/tmpl/camel-disco-folder.sgml +++ b/docs/reference/camel/tmpl/camel-disco-folder.sgml @@ -14,6 +14,9 @@ CamelDiscoFolder + + + diff --git a/docs/reference/camel/tmpl/camel-disco-store.sgml b/docs/reference/camel/tmpl/camel-disco-store.sgml index f2f4d8a..9cf340b 100644 --- a/docs/reference/camel/tmpl/camel-disco-store.sgml +++ b/docs/reference/camel/tmpl/camel-disco-store.sgml @@ -14,6 +14,9 @@ CamelDiscoStore + + + diff --git a/docs/reference/camel/tmpl/camel-exception.sgml b/docs/reference/camel/tmpl/camel-exception.sgml index 6399d3e..c7b3685 100644 --- a/docs/reference/camel/tmpl/camel-exception.sgml +++ b/docs/reference/camel/tmpl/camel-exception.sgml @@ -14,6 +14,9 @@ camel-exception + + + @@ -25,6 +28,8 @@ camel-exception +@id: +@desc: diff --git a/docs/reference/camel/tmpl/camel-file-utils.sgml b/docs/reference/camel/tmpl/camel-file-utils.sgml index 60194ee..bf7a2b5 100644 --- a/docs/reference/camel/tmpl/camel-file-utils.sgml +++ b/docs/reference/camel/tmpl/camel-file-utils.sgml @@ -14,6 +14,16 @@ camel-file-utils + + + + + + + + + + @@ -134,6 +144,28 @@ camel-file-utils @Returns: + + + + + +@out: +@str: +@len: +@Returns: + + + + + + + +@in: +@str: +@len: +@Returns: + + @@ -165,6 +197,28 @@ camel-file-utils @Returns: + + + + + +@fd: +@buf: +@n: +@Returns: + + + + + + + +@fd: +@buf: +@n: +@Returns: + + diff --git a/docs/reference/camel/tmpl/camel-filter-driver.sgml b/docs/reference/camel/tmpl/camel-filter-driver.sgml index fe73e4e..e23b0d7 100644 --- a/docs/reference/camel/tmpl/camel-filter-driver.sgml +++ b/docs/reference/camel/tmpl/camel-filter-driver.sgml @@ -14,6 +14,9 @@ CamelFilterDriver + + + diff --git a/docs/reference/camel/tmpl/camel-filter-search.sgml b/docs/reference/camel/tmpl/camel-filter-search.sgml index 08208c5..6228efe 100644 --- a/docs/reference/camel/tmpl/camel-filter-search.sgml +++ b/docs/reference/camel/tmpl/camel-filter-search.sgml @@ -14,6 +14,9 @@ camel-filter-search + + + diff --git a/docs/reference/camel/tmpl/camel-folder-search.sgml b/docs/reference/camel/tmpl/camel-folder-search.sgml index ec1cf69..ff33a1f 100644 --- a/docs/reference/camel/tmpl/camel-folder-search.sgml +++ b/docs/reference/camel/tmpl/camel-folder-search.sgml @@ -14,6 +14,9 @@ CamelFolderSearch + + + diff --git a/docs/reference/camel/tmpl/camel-folder-summary.sgml b/docs/reference/camel/tmpl/camel-folder-summary.sgml index 5861f11..743b987 100644 --- a/docs/reference/camel/tmpl/camel-folder-summary.sgml +++ b/docs/reference/camel/tmpl/camel-folder-summary.sgml @@ -14,11 +14,34 @@ CamelFolderSummary + + + +@parent: +@priv: +@version: +@flags: +@nextuid: +@time: +@saved_count: +@unread_count: +@deleted_count: +@junk_count: +@message_info_size: +@content_info_size: +@message_info_chunks: +@content_info_chunks: +@summary_path: +@build_content: +@messages: +@messages_uid: +@folder: +@meta_summary: @@ -52,6 +75,17 @@ CamelFolderSummary @user_tags: @content: + + + + + +@major: +@minor: +@uid_len: +@msg_expunged: +@path: + @@ -80,6 +114,8 @@ CamelFolderSummary @CAMEL_MESSAGE_ANSWERED_ALL: @CAMEL_MESSAGE_JUNK: @CAMEL_MESSAGE_SECURE: +@CAMEL_MESSAGE_USER_NOT_DELETABLE: +@CAMEL_MESSAGE_HIDDEN: @CAMEL_MESSAGE_FOLDER_FLAGGED: @CAMEL_MESSAGE_JUNK_LEARN: @CAMEL_MESSAGE_USER: @@ -780,3 +816,20 @@ CamelFolderSummary @Returns: + + + + + +@ci: +@depth: + + + + + + + +@mi: + + diff --git a/docs/reference/camel/tmpl/camel-folder-thread.sgml b/docs/reference/camel/tmpl/camel-folder-thread.sgml index 0c1b7ff..849dbb7 100644 --- a/docs/reference/camel/tmpl/camel-folder-thread.sgml +++ b/docs/reference/camel/tmpl/camel-folder-thread.sgml @@ -14,6 +14,9 @@ camel-folder-thread + + + diff --git a/docs/reference/camel/tmpl/camel-folder.sgml b/docs/reference/camel/tmpl/camel-folder.sgml index 9c6a2b0..feda389 100644 --- a/docs/reference/camel/tmpl/camel-folder.sgml +++ b/docs/reference/camel/tmpl/camel-folder.sgml @@ -14,11 +14,23 @@ CamelFolder + + + +@parent_object: +@priv: +@name: +@full_name: +@description: +@parent_store: +@summary: +@folder_flags: +@permanent_flags: diff --git a/docs/reference/camel/tmpl/camel-gpg-context.sgml b/docs/reference/camel/tmpl/camel-gpg-context.sgml index 4a7285d..29e1745 100644 --- a/docs/reference/camel/tmpl/camel-gpg-context.sgml +++ b/docs/reference/camel/tmpl/camel-gpg-context.sgml @@ -14,11 +14,16 @@ CamelGpgContext + + + +@parent_object: +@always_trust: diff --git a/docs/reference/camel/tmpl/camel-groupwise-folder.sgml b/docs/reference/camel/tmpl/camel-groupwise-folder.sgml index 3479fb7..515c51f 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-folder.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-folder.sgml @@ -14,6 +14,9 @@ CamelGroupwiseFolder + + + @@ -50,3 +53,12 @@ CamelGroupwiseFolder @ex: + + + + + +@folder: +@ex: + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-journal.sgml b/docs/reference/camel/tmpl/camel-groupwise-journal.sgml index 2ac21c2..60e7c1a 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-journal.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-journal.sgml @@ -14,6 +14,9 @@ CamelGroupwiseJournal + + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-store-summary.sgml b/docs/reference/camel/tmpl/camel-groupwise-store-summary.sgml index 4deb0ba..c657634 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-store-summary.sgml @@ -14,6 +14,9 @@ CamelGroupwiseStoreSummary + + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-store.sgml b/docs/reference/camel/tmpl/camel-groupwise-store.sgml index 61ff11a..c529ede 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-store.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-store.sgml @@ -14,6 +14,16 @@ CamelGroupwiseStore + + + + + + + + + + @@ -24,6 +34,8 @@ CamelGroupwiseStore @root_container: @priv: @current_folder: +@refresh_stamp: +@list_loaded: @@ -70,17 +82,16 @@ CamelGroupwiseStore @Returns: - + -@gw_store: -@folder_name: +@priv: @Returns: - + @@ -89,3 +100,33 @@ CamelGroupwiseStore @Returns: + + + + + +@store: +@Returns: + + + + + + + +@store: +@ex: +@Returns: + + + + + + + +@store: +@folder: +@flags: +@ex: + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-summary.sgml b/docs/reference/camel/tmpl/camel-groupwise-summary.sgml index ea62c7c..7c82f3c 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-summary.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-summary.sgml @@ -14,6 +14,9 @@ CamelGroupwiseSummary + + + @@ -70,3 +73,12 @@ CamelGroupwiseSummary @info: + + + + + +@summary: +@uncache: + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-transport.sgml b/docs/reference/camel/tmpl/camel-groupwise-transport.sgml index 78f66b1..b3c0827 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-transport.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-transport.sgml @@ -14,6 +14,9 @@ CamelGroupwiseTransport + + + diff --git a/docs/reference/camel/tmpl/camel-groupwise-utils.sgml b/docs/reference/camel/tmpl/camel-groupwise-utils.sgml index 785df55..1ab7917 100644 --- a/docs/reference/camel/tmpl/camel-groupwise-utils.sgml +++ b/docs/reference/camel/tmpl/camel-groupwise-utils.sgml @@ -14,6 +14,9 @@ camel-groupwise-utils + + + @@ -28,6 +31,13 @@ camel-groupwise-utils + + + + + + + @@ -167,9 +177,9 @@ camel-groupwise-utils +@cnc: @message: @from: -@recipients: @Returns: @@ -183,14 +193,23 @@ camel-groupwise-utils @_new: - + -@recipient_list: -@recipients: -@recipient_type: +@prefix: +@suffix: @Returns: + + + + + +@string: +@s_offset: +@e_offset: + + diff --git a/docs/reference/camel/tmpl/camel-html-parser.sgml b/docs/reference/camel/tmpl/camel-html-parser.sgml index 5552876..8cc957f 100644 --- a/docs/reference/camel/tmpl/camel-html-parser.sgml +++ b/docs/reference/camel/tmpl/camel-html-parser.sgml @@ -14,6 +14,9 @@ CamelHTMLParser + + + diff --git a/docs/reference/camel/tmpl/camel-http-stream.sgml b/docs/reference/camel/tmpl/camel-http-stream.sgml index 47a7949..1ef6d79 100644 --- a/docs/reference/camel/tmpl/camel-http-stream.sgml +++ b/docs/reference/camel/tmpl/camel-http-stream.sgml @@ -14,6 +14,9 @@ CamelHttpStream + + + diff --git a/docs/reference/camel/tmpl/camel-i18n.sgml b/docs/reference/camel/tmpl/camel-i18n.sgml index 389cd85..e3087a8 100644 --- a/docs/reference/camel/tmpl/camel-i18n.sgml +++ b/docs/reference/camel/tmpl/camel-i18n.sgml @@ -14,6 +14,9 @@ camel-i18n + + + diff --git a/docs/reference/camel/tmpl/camel-iconv.sgml b/docs/reference/camel/tmpl/camel-iconv.sgml index 249aab3..2c3cb46 100644 --- a/docs/reference/camel/tmpl/camel-iconv.sgml +++ b/docs/reference/camel/tmpl/camel-iconv.sgml @@ -14,6 +14,9 @@ camel-iconv + + + diff --git a/docs/reference/camel/tmpl/camel-imap-command.sgml b/docs/reference/camel/tmpl/camel-imap-command.sgml index 6b25bbd..8464887 100644 --- a/docs/reference/camel/tmpl/camel-imap-command.sgml +++ b/docs/reference/camel/tmpl/camel-imap-command.sgml @@ -14,6 +14,9 @@ camel-imap-command + + + diff --git a/docs/reference/camel/tmpl/camel-imap-folder.sgml b/docs/reference/camel/tmpl/camel-imap-folder.sgml index a449240..6a9dba2 100644 --- a/docs/reference/camel/tmpl/camel-imap-folder.sgml +++ b/docs/reference/camel/tmpl/camel-imap-folder.sgml @@ -14,6 +14,9 @@ CamelImapFolder + + + diff --git a/docs/reference/camel/tmpl/camel-imap-message-cache.sgml b/docs/reference/camel/tmpl/camel-imap-message-cache.sgml index da93b97..44486f7 100644 --- a/docs/reference/camel/tmpl/camel-imap-message-cache.sgml +++ b/docs/reference/camel/tmpl/camel-imap-message-cache.sgml @@ -14,6 +14,9 @@ CamelImapMessageCache + + + diff --git a/docs/reference/camel/tmpl/camel-imap-search.sgml b/docs/reference/camel/tmpl/camel-imap-search.sgml index 1692942..9aff076 100644 --- a/docs/reference/camel/tmpl/camel-imap-search.sgml +++ b/docs/reference/camel/tmpl/camel-imap-search.sgml @@ -14,6 +14,9 @@ CamelImapSearch + + + diff --git a/docs/reference/camel/tmpl/camel-imap-store-summary.sgml b/docs/reference/camel/tmpl/camel-imap-store-summary.sgml index 6da7448..3d55b76 100644 --- a/docs/reference/camel/tmpl/camel-imap-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imap-store-summary.sgml @@ -14,6 +14,9 @@ CamelImapStoreSummary + + + diff --git a/docs/reference/camel/tmpl/camel-imap-store.sgml b/docs/reference/camel/tmpl/camel-imap-store.sgml index e79f7c2..2c74a90 100644 --- a/docs/reference/camel/tmpl/camel-imap-store.sgml +++ b/docs/reference/camel/tmpl/camel-imap-store.sgml @@ -14,6 +14,9 @@ CamelImapStore + + + @@ -34,19 +37,23 @@ CamelImapStore @summary: @connected: @preauthed: +@braindamaged: +@renaming: +@nocustomappend: @tag_prefix: @command: @current_folder: @server_level: @capabilities: @parameters: -@braindamaged: @namespace: @dir_sep: @base_url: @storage_path: @authtypes: -@renaming: +@refresh_stamp: +@headers: +@custom_headers: @@ -210,6 +217,13 @@ CamelImapStore + + + + + + + @@ -245,6 +259,34 @@ CamelImapStore + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/reference/camel/tmpl/camel-imap-summary.sgml b/docs/reference/camel/tmpl/camel-imap-summary.sgml index 05e497d..3da4780 100644 --- a/docs/reference/camel/tmpl/camel-imap-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imap-summary.sgml @@ -14,14 +14,10 @@ CamelImapSummary - - - - - + - + diff --git a/docs/reference/camel/tmpl/camel-imap-utils.sgml b/docs/reference/camel/tmpl/camel-imap-utils.sgml index 9876712..108acb8 100644 --- a/docs/reference/camel/tmpl/camel-imap-utils.sgml +++ b/docs/reference/camel/tmpl/camel-imap-utils.sgml @@ -14,6 +14,9 @@ camel-imap-utils + + + diff --git a/docs/reference/camel/tmpl/camel-imap-wrapper.sgml b/docs/reference/camel/tmpl/camel-imap-wrapper.sgml index 92f08c0..ddf3a15 100644 --- a/docs/reference/camel/tmpl/camel-imap-wrapper.sgml +++ b/docs/reference/camel/tmpl/camel-imap-wrapper.sgml @@ -14,11 +14,20 @@ CamelImapWrapper - + + + + +@parent_object: +@priv: +@folder: +@uid: +@part_spec: +@part: diff --git a/docs/reference/camel/tmpl/camel-imap4-command.sgml b/docs/reference/camel/tmpl/camel-imap4-command.sgml index 996171a..6466f93 100644 --- a/docs/reference/camel/tmpl/camel-imap4-command.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-command.sgml @@ -14,6 +14,9 @@ camel-imap4-command + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-engine.sgml b/docs/reference/camel/tmpl/camel-imap4-engine.sgml index 977b105..3f4c570 100644 --- a/docs/reference/camel/tmpl/camel-imap4-engine.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-engine.sgml @@ -14,6 +14,9 @@ CamelIMAP4Engine + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-folder.sgml b/docs/reference/camel/tmpl/camel-imap4-folder.sgml index 790928d..f9ba14d 100644 --- a/docs/reference/camel/tmpl/camel-imap4-folder.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-folder.sgml @@ -14,6 +14,9 @@ CamelIMAP4Folder + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-journal.sgml b/docs/reference/camel/tmpl/camel-imap4-journal.sgml index f5c9640..e4f3662 100644 --- a/docs/reference/camel/tmpl/camel-imap4-journal.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-journal.sgml @@ -14,6 +14,9 @@ CamelIMAP4Journal + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-search.sgml b/docs/reference/camel/tmpl/camel-imap4-search.sgml index 0125b0b..c2399ae 100644 --- a/docs/reference/camel/tmpl/camel-imap4-search.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-search.sgml @@ -14,6 +14,9 @@ CamelIMAP4Search + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-specials.sgml b/docs/reference/camel/tmpl/camel-imap4-specials.sgml index a6a9106..69cb5fa 100644 --- a/docs/reference/camel/tmpl/camel-imap4-specials.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-specials.sgml @@ -14,6 +14,9 @@ camel-imap4-specials + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml b/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml index e3072af..a9f2e29 100644 --- a/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-store-summary.sgml @@ -14,6 +14,9 @@ CamelIMAP4StoreSummary + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-store.sgml b/docs/reference/camel/tmpl/camel-imap4-store.sgml index 6975797..c6b2b3f 100644 --- a/docs/reference/camel/tmpl/camel-imap4-store.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-store.sgml @@ -14,6 +14,9 @@ CamelIMAP4Store + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-stream.sgml b/docs/reference/camel/tmpl/camel-imap4-stream.sgml index c4a861b..118fb0c 100644 --- a/docs/reference/camel/tmpl/camel-imap4-stream.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-stream.sgml @@ -14,6 +14,9 @@ CamelIMAP4Stream + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-summary.sgml b/docs/reference/camel/tmpl/camel-imap4-summary.sgml index 65139a6..74870aa 100644 --- a/docs/reference/camel/tmpl/camel-imap4-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-summary.sgml @@ -14,6 +14,9 @@ CamelIMAP4Summary + + + diff --git a/docs/reference/camel/tmpl/camel-imap4-utils.sgml b/docs/reference/camel/tmpl/camel-imap4-utils.sgml index 18182ef..7ab2f25 100644 --- a/docs/reference/camel/tmpl/camel-imap4-utils.sgml +++ b/docs/reference/camel/tmpl/camel-imap4-utils.sgml @@ -14,6 +14,9 @@ camel-imap4-utils + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-driver.sgml b/docs/reference/camel/tmpl/camel-imapp-driver.sgml index f54b303..b22400e 100644 --- a/docs/reference/camel/tmpl/camel-imapp-driver.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-driver.sgml @@ -14,6 +14,9 @@ CamelIMAPPDriver + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-engine.sgml b/docs/reference/camel/tmpl/camel-imapp-engine.sgml index e520eaa..f1162de 100644 --- a/docs/reference/camel/tmpl/camel-imapp-engine.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-engine.sgml @@ -14,6 +14,9 @@ CamelIMAPPEngine + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-exception.sgml b/docs/reference/camel/tmpl/camel-imapp-exception.sgml index 43484e9..1290f83 100644 --- a/docs/reference/camel/tmpl/camel-imapp-exception.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-exception.sgml @@ -14,6 +14,9 @@ camel-imapp-exception + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-fetch-stream.sgml b/docs/reference/camel/tmpl/camel-imapp-fetch-stream.sgml index 5fbc076..18de23e 100644 --- a/docs/reference/camel/tmpl/camel-imapp-fetch-stream.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-fetch-stream.sgml @@ -14,6 +14,9 @@ CamelIMAPPFetchStream + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-folder.sgml b/docs/reference/camel/tmpl/camel-imapp-folder.sgml index c4feb4c..4c92353 100644 --- a/docs/reference/camel/tmpl/camel-imapp-folder.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-folder.sgml @@ -14,6 +14,9 @@ CamelIMAPPFolder + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-store-summary.sgml b/docs/reference/camel/tmpl/camel-imapp-store-summary.sgml index b2b5f91..ad05ef1 100644 --- a/docs/reference/camel/tmpl/camel-imapp-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-store-summary.sgml @@ -14,6 +14,9 @@ CamelIMAPPStoreSummary + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-store.sgml b/docs/reference/camel/tmpl/camel-imapp-store.sgml index 3e29198..b0b1713 100644 --- a/docs/reference/camel/tmpl/camel-imapp-store.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-store.sgml @@ -14,6 +14,9 @@ CamelIMAPPStore + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-stream.sgml b/docs/reference/camel/tmpl/camel-imapp-stream.sgml index f43263f..85f11d3 100644 --- a/docs/reference/camel/tmpl/camel-imapp-stream.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-stream.sgml @@ -14,6 +14,9 @@ CamelIMAPPStream + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-summary.sgml b/docs/reference/camel/tmpl/camel-imapp-summary.sgml index 4617de3..13a4cfc 100644 --- a/docs/reference/camel/tmpl/camel-imapp-summary.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-summary.sgml @@ -14,6 +14,9 @@ CamelIMAPPSummary + + + diff --git a/docs/reference/camel/tmpl/camel-imapp-utils.sgml b/docs/reference/camel/tmpl/camel-imapp-utils.sgml index 2205fe1..fbab279 100644 --- a/docs/reference/camel/tmpl/camel-imapp-utils.sgml +++ b/docs/reference/camel/tmpl/camel-imapp-utils.sgml @@ -14,6 +14,9 @@ camel-imapp-utils + + + diff --git a/docs/reference/camel/tmpl/camel-index.sgml b/docs/reference/camel/tmpl/camel-index.sgml index 56fa99e..a3488fe 100644 --- a/docs/reference/camel/tmpl/camel-index.sgml +++ b/docs/reference/camel/tmpl/camel-index.sgml @@ -14,6 +14,9 @@ CamelIndex + + + @@ -39,6 +42,15 @@ CamelIndex @Returns: + + + + + +@parent: +@priv: +@index: + @@ -78,14 +90,6 @@ CamelIndex @buffer: @words: - - - - - -@Returns: - - diff --git a/docs/reference/camel/tmpl/camel-internet-address.sgml b/docs/reference/camel/tmpl/camel-internet-address.sgml index ba12cd5..2aead75 100644 --- a/docs/reference/camel/tmpl/camel-internet-address.sgml +++ b/docs/reference/camel/tmpl/camel-internet-address.sgml @@ -14,11 +14,16 @@ CamelInternetAddress + + + +@parent: +@priv: diff --git a/docs/reference/camel/tmpl/camel-junk-plugin.sgml b/docs/reference/camel/tmpl/camel-junk-plugin.sgml index cfdfe29..31f310c 100644 --- a/docs/reference/camel/tmpl/camel-junk-plugin.sgml +++ b/docs/reference/camel/tmpl/camel-junk-plugin.sgml @@ -14,6 +14,9 @@ camel-junk-plugin + + + diff --git a/docs/reference/camel/tmpl/camel-list-utils.sgml b/docs/reference/camel/tmpl/camel-list-utils.sgml index de0dc07..25a5ece 100644 --- a/docs/reference/camel/tmpl/camel-list-utils.sgml +++ b/docs/reference/camel/tmpl/camel-list-utils.sgml @@ -14,6 +14,9 @@ camel-list-utils + + + diff --git a/docs/reference/camel/tmpl/camel-local-folder.sgml b/docs/reference/camel/tmpl/camel-local-folder.sgml index 66cef9b..4a3660c 100644 --- a/docs/reference/camel/tmpl/camel-local-folder.sgml +++ b/docs/reference/camel/tmpl/camel-local-folder.sgml @@ -14,6 +14,9 @@ CamelLocalFolder + + + diff --git a/docs/reference/camel/tmpl/camel-local-store.sgml b/docs/reference/camel/tmpl/camel-local-store.sgml index 335ca2e..0d4704e 100644 --- a/docs/reference/camel/tmpl/camel-local-store.sgml +++ b/docs/reference/camel/tmpl/camel-local-store.sgml @@ -14,6 +14,9 @@ CamelLocalStore + + + diff --git a/docs/reference/camel/tmpl/camel-local-summary.sgml b/docs/reference/camel/tmpl/camel-local-summary.sgml index 6c3618a..1e75c55 100644 --- a/docs/reference/camel/tmpl/camel-local-summary.sgml +++ b/docs/reference/camel/tmpl/camel-local-summary.sgml @@ -14,6 +14,9 @@ CamelLocalSummary + + + diff --git a/docs/reference/camel/tmpl/camel-lock-client.sgml b/docs/reference/camel/tmpl/camel-lock-client.sgml index e07d624..a073844 100644 --- a/docs/reference/camel/tmpl/camel-lock-client.sgml +++ b/docs/reference/camel/tmpl/camel-lock-client.sgml @@ -14,6 +14,9 @@ camel-lock-client + + + diff --git a/docs/reference/camel/tmpl/camel-lock-helper.sgml b/docs/reference/camel/tmpl/camel-lock-helper.sgml index 05363b7..f4788d6 100644 --- a/docs/reference/camel/tmpl/camel-lock-helper.sgml +++ b/docs/reference/camel/tmpl/camel-lock-helper.sgml @@ -14,6 +14,9 @@ camel-lock-helper + + + diff --git a/docs/reference/camel/tmpl/camel-lock.sgml b/docs/reference/camel/tmpl/camel-lock.sgml index bed70ec..3176915 100644 --- a/docs/reference/camel/tmpl/camel-lock.sgml +++ b/docs/reference/camel/tmpl/camel-lock.sgml @@ -14,6 +14,9 @@ camel-lock + + + diff --git a/docs/reference/camel/tmpl/camel-maildir-folder.sgml b/docs/reference/camel/tmpl/camel-maildir-folder.sgml index 6ecaeda..80331d3 100644 --- a/docs/reference/camel/tmpl/camel-maildir-folder.sgml +++ b/docs/reference/camel/tmpl/camel-maildir-folder.sgml @@ -14,6 +14,9 @@ CamelMaildirFolder + + + diff --git a/docs/reference/camel/tmpl/camel-maildir-store.sgml b/docs/reference/camel/tmpl/camel-maildir-store.sgml index 04381c6..352b56c 100644 --- a/docs/reference/camel/tmpl/camel-maildir-store.sgml +++ b/docs/reference/camel/tmpl/camel-maildir-store.sgml @@ -14,6 +14,9 @@ CamelMaildirStore + + + diff --git a/docs/reference/camel/tmpl/camel-maildir-summary.sgml b/docs/reference/camel/tmpl/camel-maildir-summary.sgml index 83685d5..b3ac418 100644 --- a/docs/reference/camel/tmpl/camel-maildir-summary.sgml +++ b/docs/reference/camel/tmpl/camel-maildir-summary.sgml @@ -14,6 +14,9 @@ CamelMaildirSummary + + + diff --git a/docs/reference/camel/tmpl/camel-mbox-folder.sgml b/docs/reference/camel/tmpl/camel-mbox-folder.sgml index 61eb6a5..286ee8f 100644 --- a/docs/reference/camel/tmpl/camel-mbox-folder.sgml +++ b/docs/reference/camel/tmpl/camel-mbox-folder.sgml @@ -14,6 +14,9 @@ CamelMboxFolder + + + diff --git a/docs/reference/camel/tmpl/camel-mbox-store.sgml b/docs/reference/camel/tmpl/camel-mbox-store.sgml index 7f6d916..6ab4c16 100644 --- a/docs/reference/camel/tmpl/camel-mbox-store.sgml +++ b/docs/reference/camel/tmpl/camel-mbox-store.sgml @@ -14,6 +14,9 @@ CamelMboxStore + + + diff --git a/docs/reference/camel/tmpl/camel-mbox-summary.sgml b/docs/reference/camel/tmpl/camel-mbox-summary.sgml index c9cbc34..42b2e59 100644 --- a/docs/reference/camel/tmpl/camel-mbox-summary.sgml +++ b/docs/reference/camel/tmpl/camel-mbox-summary.sgml @@ -14,6 +14,9 @@ CamelMboxSummary + + + diff --git a/docs/reference/camel/tmpl/camel-medium.sgml b/docs/reference/camel/tmpl/camel-medium.sgml index 89a08b9..d6cfd68 100644 --- a/docs/reference/camel/tmpl/camel-medium.sgml +++ b/docs/reference/camel/tmpl/camel-medium.sgml @@ -14,11 +14,16 @@ CamelMedium + + + +@parent_object: +@content: diff --git a/docs/reference/camel/tmpl/camel-mh-folder.sgml b/docs/reference/camel/tmpl/camel-mh-folder.sgml index f34df7f..81c9811 100644 --- a/docs/reference/camel/tmpl/camel-mh-folder.sgml +++ b/docs/reference/camel/tmpl/camel-mh-folder.sgml @@ -14,6 +14,9 @@ CamelMhFolder + + + diff --git a/docs/reference/camel/tmpl/camel-mh-store.sgml b/docs/reference/camel/tmpl/camel-mh-store.sgml index e07f6fd..02254ac 100644 --- a/docs/reference/camel/tmpl/camel-mh-store.sgml +++ b/docs/reference/camel/tmpl/camel-mh-store.sgml @@ -14,6 +14,9 @@ CamelMhStore + + + diff --git a/docs/reference/camel/tmpl/camel-mh-summary.sgml b/docs/reference/camel/tmpl/camel-mh-summary.sgml index 0de71ef..78be726 100644 --- a/docs/reference/camel/tmpl/camel-mh-summary.sgml +++ b/docs/reference/camel/tmpl/camel-mh-summary.sgml @@ -14,6 +14,9 @@ CamelMhSummary + + + diff --git a/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml b/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml index 834eae0..afd570e 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-basic.sgml @@ -14,11 +14,20 @@ CamelMimeFilterBasic + + + +@parent: +@priv: +@type: +@uubuf: +@state: +@save: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml b/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml index 8c7d513..b697a26 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-bestenc.sgml @@ -14,6 +14,9 @@ CamelMimeFilterBestenc + + + @@ -39,6 +42,20 @@ CamelMimeFilterBestenc +@parent: +@flags: +@count0: +@count8: +@total: +@lastc: +@crlfnoorder: +@startofline: +@fromcount: +@fromsave: +@hadfrom: +@countline: +@maxline: +@charset: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml b/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml index 7dd591c..858221a 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-canon.sgml @@ -14,11 +14,16 @@ CamelMimeFilterCanon + + + +@parent: +@flags: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml b/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml index 327739b..a549d1b 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-charset.sgml @@ -14,11 +14,19 @@ CamelMimeFilterCharset + + + +@parent: +@priv: +@ic: +@from: +@to: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml b/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml index 786bda7..41fe585 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-crlf.sgml @@ -14,11 +14,20 @@ CamelMimeFilterCRLF + + + +@parent: +@direction: +@mode: +@saw_cr: +@saw_lf: +@saw_dot: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml b/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml index e23fea3..466e06b 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-enriched.sgml @@ -14,11 +14,17 @@ CamelMimeFilterEnriched + + + +@parent_object: +@flags: +@nofill: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-from.sgml b/docs/reference/camel/tmpl/camel-mime-filter-from.sgml index 249589a..092e78b 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-from.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-from.sgml @@ -14,11 +14,16 @@ CamelMimeFilterFrom + + + +@parent: +@midline: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml b/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml index 93cf8f3..b78a657 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-gzip.sgml @@ -14,6 +14,9 @@ CamelMimeFilterGZip + + + diff --git a/docs/reference/camel/tmpl/camel-mime-filter-html.sgml b/docs/reference/camel/tmpl/camel-mime-filter-html.sgml index f636348..f4ce6d9 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-html.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-html.sgml @@ -14,11 +14,16 @@ CamelMimeFilterHTML + + + +@parent: +@priv: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-index.sgml b/docs/reference/camel/tmpl/camel-mime-filter-index.sgml index 284f4e8..b02b07e 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-index.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-index.sgml @@ -14,11 +14,18 @@ CamelMimeFilterIndex + + + +@parent: +@priv: +@index: +@name: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml b/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml index ddf973a..2cb6f40 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-linewrap.sgml @@ -14,6 +14,9 @@ CamelMimeFilterLinewrap + + + diff --git a/docs/reference/camel/tmpl/camel-mime-filter-save.sgml b/docs/reference/camel/tmpl/camel-mime-filter-save.sgml index 12992b5..328f89c 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-save.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-save.sgml @@ -14,11 +14,16 @@ CamelMimeFilterSave + + + +@parent: +@stream: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml b/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml index 7a273b4..3b18e1a 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-tohtml.sgml @@ -14,11 +14,20 @@ CamelMimeFilterToHTML + + + +@parent: +@scanner: +@flags: +@colour: +@column: +@pre_open: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml b/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml index 18b68f3..8472ac1 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-windows.sgml @@ -14,11 +14,17 @@ CamelMimeFilterWindows + + + +@parent: +@is_windows: +@claimed_charset: diff --git a/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml b/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml index 3fe4543..03a0abc 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter-yenc.sgml @@ -14,11 +14,20 @@ CamelMimeFilterYenc + + + +@parent_object: +@direction: +@part: +@state: +@pcrc: +@crc: diff --git a/docs/reference/camel/tmpl/camel-mime-filter.sgml b/docs/reference/camel/tmpl/camel-mime-filter.sgml index ff946b7..13572c9 100644 --- a/docs/reference/camel/tmpl/camel-mime-filter.sgml +++ b/docs/reference/camel/tmpl/camel-mime-filter.sgml @@ -14,11 +14,24 @@ CamelMimeFilter + + + +@parent: +@priv: +@outreal: +@outbuf: +@outptr: +@outsize: +@outpre: +@backbuf: +@backsize: +@backlen: diff --git a/docs/reference/camel/tmpl/camel-mime-message.sgml b/docs/reference/camel/tmpl/camel-mime-message.sgml index 72247d3..f09be3c 100644 --- a/docs/reference/camel/tmpl/camel-mime-message.sgml +++ b/docs/reference/camel/tmpl/camel-mime-message.sgml @@ -14,11 +14,24 @@ CamelMimeMessage + + + +@parent_object: +@date: +@date_offset: +@date_received: +@date_received_offset: +@subject: +@message_id: +@reply_to: +@from: +@recipients: @@ -199,6 +212,24 @@ CamelMimeMessage @recipients: + + + + + +@message: +@identity: + + + + + + + +@message: +@Returns: + + @@ -245,3 +276,12 @@ CamelMimeMessage @Returns: + + + + + +@msg: +@body: + + diff --git a/docs/reference/camel/tmpl/camel-mime-parser.sgml b/docs/reference/camel/tmpl/camel-mime-parser.sgml index 3291a16..fb120dc 100644 --- a/docs/reference/camel/tmpl/camel-mime-parser.sgml +++ b/docs/reference/camel/tmpl/camel-mime-parser.sgml @@ -14,11 +14,16 @@ CamelMimeParser + + + +@parent: +@priv: diff --git a/docs/reference/camel/tmpl/camel-mime-part.sgml b/docs/reference/camel/tmpl/camel-mime-part.sgml index c8d6a7c..bcb1fff 100644 --- a/docs/reference/camel/tmpl/camel-mime-part.sgml +++ b/docs/reference/camel/tmpl/camel-mime-part.sgml @@ -14,11 +14,23 @@ CamelMimePart + + + +@parent_object: +@headers: +@description: +@disposition: +@content_id: +@content_MD5: +@content_location: +@content_languages: +@encoding: diff --git a/docs/reference/camel/tmpl/camel-mime-utils.sgml b/docs/reference/camel/tmpl/camel-mime-utils.sgml index fa91826..fd3c619 100644 --- a/docs/reference/camel/tmpl/camel-mime-utils.sgml +++ b/docs/reference/camel/tmpl/camel-mime-utils.sgml @@ -14,6 +14,9 @@ camel-mime-utils + + + diff --git a/docs/reference/camel/tmpl/camel-movemail.sgml b/docs/reference/camel/tmpl/camel-movemail.sgml index 92342ea..f47ffc0 100644 --- a/docs/reference/camel/tmpl/camel-movemail.sgml +++ b/docs/reference/camel/tmpl/camel-movemail.sgml @@ -14,6 +14,9 @@ camel-movemail + + + diff --git a/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml b/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml index a54b34a..7dc230a 100644 --- a/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml +++ b/docs/reference/camel/tmpl/camel-multipart-encrypted.sgml @@ -14,11 +14,19 @@ CamelMultipartEncrypted + + + +@parent_object: +@version: +@content: +@decrypted: +@protocol: diff --git a/docs/reference/camel/tmpl/camel-multipart-signed.sgml b/docs/reference/camel/tmpl/camel-multipart-signed.sgml index 7af9dd2..242f9b3 100644 --- a/docs/reference/camel/tmpl/camel-multipart-signed.sgml +++ b/docs/reference/camel/tmpl/camel-multipart-signed.sgml @@ -14,11 +14,24 @@ CamelMultipartSigned + + + +@parent_object: +@content: +@signature: +@contentraw: +@protocol: +@micalg: +@start1: +@end1: +@start2: +@end2: diff --git a/docs/reference/camel/tmpl/camel-multipart.sgml b/docs/reference/camel/tmpl/camel-multipart.sgml index 69eea06..90a1010 100644 --- a/docs/reference/camel/tmpl/camel-multipart.sgml +++ b/docs/reference/camel/tmpl/camel-multipart.sgml @@ -14,11 +14,18 @@ CamelMultipart + + + +@parent_object: +@parts: +@preface: +@postface: diff --git a/docs/reference/camel/tmpl/camel-net-utils.sgml b/docs/reference/camel/tmpl/camel-net-utils.sgml index aac3f0c..54f80f2 100644 --- a/docs/reference/camel/tmpl/camel-net-utils.sgml +++ b/docs/reference/camel/tmpl/camel-net-utils.sgml @@ -14,6 +14,9 @@ camel-net-utils + + + diff --git a/docs/reference/camel/tmpl/camel-news-address.sgml b/docs/reference/camel/tmpl/camel-news-address.sgml index ff39b68..1d3e754 100644 --- a/docs/reference/camel/tmpl/camel-news-address.sgml +++ b/docs/reference/camel/tmpl/camel-news-address.sgml @@ -14,6 +14,9 @@ CamelNewsAddress + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-address.sgml b/docs/reference/camel/tmpl/camel-nntp-address.sgml index 89f9bf0..766537e 100644 --- a/docs/reference/camel/tmpl/camel-nntp-address.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-address.sgml @@ -14,6 +14,9 @@ CamelNNTPAddress + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-auth.sgml b/docs/reference/camel/tmpl/camel-nntp-auth.sgml index f7e75d7..b18d7b0 100644 --- a/docs/reference/camel/tmpl/camel-nntp-auth.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-auth.sgml @@ -14,6 +14,9 @@ camel-nntp-auth + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-folder.sgml b/docs/reference/camel/tmpl/camel-nntp-folder.sgml index 7232231..61fb2ed 100644 --- a/docs/reference/camel/tmpl/camel-nntp-folder.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-folder.sgml @@ -14,6 +14,9 @@ CamelNNTPFolder + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-grouplist.sgml b/docs/reference/camel/tmpl/camel-nntp-grouplist.sgml index c484a52..1a351b0 100644 --- a/docs/reference/camel/tmpl/camel-nntp-grouplist.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-grouplist.sgml @@ -14,6 +14,9 @@ camel-nntp-grouplist + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-newsrc.sgml b/docs/reference/camel/tmpl/camel-nntp-newsrc.sgml index 233987b..1be095c 100644 --- a/docs/reference/camel/tmpl/camel-nntp-newsrc.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-newsrc.sgml @@ -14,6 +14,9 @@ camel-nntp-newsrc + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-resp-codes.sgml b/docs/reference/camel/tmpl/camel-nntp-resp-codes.sgml index ae4949e..9b6b71f 100644 --- a/docs/reference/camel/tmpl/camel-nntp-resp-codes.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-resp-codes.sgml @@ -14,6 +14,9 @@ camel-nntp-resp-codes + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-store-summary.sgml b/docs/reference/camel/tmpl/camel-nntp-store-summary.sgml index 8935afe..e16866a 100644 --- a/docs/reference/camel/tmpl/camel-nntp-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-store-summary.sgml @@ -14,6 +14,9 @@ CamelNNTPStoreSummary + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-store.sgml b/docs/reference/camel/tmpl/camel-nntp-store.sgml index d076ea9..54ee864 100644 --- a/docs/reference/camel/tmpl/camel-nntp-store.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-store.sgml @@ -14,6 +14,9 @@ CamelNNTPStore + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-stream.sgml b/docs/reference/camel/tmpl/camel-nntp-stream.sgml index b2f3166..840db5b 100644 --- a/docs/reference/camel/tmpl/camel-nntp-stream.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-stream.sgml @@ -14,6 +14,9 @@ CamelNNTPStream + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-summary.sgml b/docs/reference/camel/tmpl/camel-nntp-summary.sgml index fa63eca..53e1332 100644 --- a/docs/reference/camel/tmpl/camel-nntp-summary.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-summary.sgml @@ -14,6 +14,9 @@ CamelNNTPSummary + + + diff --git a/docs/reference/camel/tmpl/camel-nntp-utils.sgml b/docs/reference/camel/tmpl/camel-nntp-utils.sgml index 1fbe710..dbac1c0 100644 --- a/docs/reference/camel/tmpl/camel-nntp-utils.sgml +++ b/docs/reference/camel/tmpl/camel-nntp-utils.sgml @@ -14,6 +14,9 @@ camel-nntp-utils + + + diff --git a/docs/reference/camel/tmpl/camel-object.sgml b/docs/reference/camel/tmpl/camel-object.sgml index 525e342..c3bd60c 100644 --- a/docs/reference/camel/tmpl/camel-object.sgml +++ b/docs/reference/camel/tmpl/camel-object.sgml @@ -14,6 +14,9 @@ CamelObject + + + @@ -32,6 +35,11 @@ CamelObject +@klass: +@magic: +@hooks: +@ref_count: +@flags: @@ -667,3 +675,65 @@ CamelObject @pname: + + + + + +@free: +@next: +@reset: +@length: + + + + + + +@klass: + + + + + + +@klass: +@size: +@Returns: + + + + + + + +@it: + + + + + + + +@it: +@ex: +@Returns: + + + + + + + +@it: + + + + + + + +@it: +@Returns: + + diff --git a/docs/reference/camel/tmpl/camel-offline-folder.sgml b/docs/reference/camel/tmpl/camel-offline-folder.sgml index 5778d04..b74955e 100644 --- a/docs/reference/camel/tmpl/camel-offline-folder.sgml +++ b/docs/reference/camel/tmpl/camel-offline-folder.sgml @@ -14,11 +14,16 @@ CamelOfflineFolder + + + +@parent_object: +@sync_offline: diff --git a/docs/reference/camel/tmpl/camel-offline-journal.sgml b/docs/reference/camel/tmpl/camel-offline-journal.sgml index c346986..19d2e61 100644 --- a/docs/reference/camel/tmpl/camel-offline-journal.sgml +++ b/docs/reference/camel/tmpl/camel-offline-journal.sgml @@ -14,11 +14,18 @@ CamelOfflineJournal + + + +@parent_object: +@folder: +@filename: +@queue: diff --git a/docs/reference/camel/tmpl/camel-offline-store.sgml b/docs/reference/camel/tmpl/camel-offline-store.sgml index e168a37..eb66b5f 100644 --- a/docs/reference/camel/tmpl/camel-offline-store.sgml +++ b/docs/reference/camel/tmpl/camel-offline-store.sgml @@ -14,11 +14,16 @@ CamelOfflineStore + + + +@parent_object: +@state: diff --git a/docs/reference/camel/tmpl/camel-operation.sgml b/docs/reference/camel/tmpl/camel-operation.sgml index 27e7fb9..250c238 100644 --- a/docs/reference/camel/tmpl/camel-operation.sgml +++ b/docs/reference/camel/tmpl/camel-operation.sgml @@ -14,6 +14,9 @@ camel-operation + + + diff --git a/docs/reference/camel/tmpl/camel-partition-table.sgml b/docs/reference/camel/tmpl/camel-partition-table.sgml index 3b2316e..b9eaafc 100644 --- a/docs/reference/camel/tmpl/camel-partition-table.sgml +++ b/docs/reference/camel/tmpl/camel-partition-table.sgml @@ -14,6 +14,9 @@ CamelKeyTable + + + @@ -48,13 +51,18 @@ CamelKeyTable - + -@Returns: - +@parent: +@priv: +@blocks: +@rootid: +@is_key: +@is_key_data: +@partition: @@ -136,13 +144,17 @@ CamelKeyTable - + -@Returns: - +@parent: +@priv: +@blocks: +@rootid: +@root: +@root_block: diff --git a/docs/reference/camel/tmpl/camel-pop3-engine.sgml b/docs/reference/camel/tmpl/camel-pop3-engine.sgml index 919dcae..f6e8a00 100644 --- a/docs/reference/camel/tmpl/camel-pop3-engine.sgml +++ b/docs/reference/camel/tmpl/camel-pop3-engine.sgml @@ -14,6 +14,9 @@ CamelPOP3Engine + + + diff --git a/docs/reference/camel/tmpl/camel-pop3-folder.sgml b/docs/reference/camel/tmpl/camel-pop3-folder.sgml index d8436fe..df381a8 100644 --- a/docs/reference/camel/tmpl/camel-pop3-folder.sgml +++ b/docs/reference/camel/tmpl/camel-pop3-folder.sgml @@ -14,6 +14,9 @@ CamelPOP3Folder + + + @@ -48,3 +51,14 @@ CamelPOP3Folder @Returns: + + + + + +@folder: +@days_to_delete: +@ex: +@Returns: + + diff --git a/docs/reference/camel/tmpl/camel-pop3-store.sgml b/docs/reference/camel/tmpl/camel-pop3-store.sgml index 8a133cd..be61008 100644 --- a/docs/reference/camel/tmpl/camel-pop3-store.sgml +++ b/docs/reference/camel/tmpl/camel-pop3-store.sgml @@ -14,6 +14,9 @@ CamelPOP3Store + + + @@ -22,6 +25,7 @@ CamelPOP3Store @parent_object: @engine: @cache: +@delete_after: diff --git a/docs/reference/camel/tmpl/camel-pop3-stream.sgml b/docs/reference/camel/tmpl/camel-pop3-stream.sgml index f4417d8..538caa4 100644 --- a/docs/reference/camel/tmpl/camel-pop3-stream.sgml +++ b/docs/reference/camel/tmpl/camel-pop3-stream.sgml @@ -14,6 +14,9 @@ CamelPOP3Stream + + + diff --git a/docs/reference/camel/tmpl/camel-process.sgml b/docs/reference/camel/tmpl/camel-process.sgml index e2f321f..b67d4ec 100644 --- a/docs/reference/camel/tmpl/camel-process.sgml +++ b/docs/reference/camel/tmpl/camel-process.sgml @@ -14,6 +14,9 @@ camel-process + + + diff --git a/docs/reference/camel/tmpl/camel-provider.sgml b/docs/reference/camel/tmpl/camel-provider.sgml index 08fda34..e17cdda 100644 --- a/docs/reference/camel/tmpl/camel-provider.sgml +++ b/docs/reference/camel/tmpl/camel-provider.sgml @@ -14,11 +14,31 @@ camel-provider + + + +@protocol: +@name: +@description: +@domain: +@flags: +@url_flags: +@extra_conf: +@auto_detect: +@object_types: +@authtypes: +@service_cache: +@url_hash: +@url_equal: +@translation_domain: +@license: +@license_file: +@priv: @@ -71,6 +91,13 @@ camel-provider + + + + + + + @@ -364,6 +391,23 @@ camel-provider +@protocol: +@name: +@description: +@domain: +@flags: +@url_flags: +@extra_conf: +@auto_detect: +@object_types: +@authtypes: +@service_cache: +@url_hash: +@url_equal: +@translation_domain: +@license: +@license_file: +@priv: diff --git a/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml b/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml index 87bdd77..edee1ba 100644 --- a/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-anonymous.sgml @@ -14,11 +14,17 @@ CamelSaslAnonymous + + + +@parent_object: +@trace_info: +@type: diff --git a/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml b/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml index b1ae27e..31c338d 100644 --- a/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-cram-md5.sgml @@ -14,11 +14,15 @@ CamelSaslCramMd5 + + + +@parent_object: diff --git a/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml b/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml index 85838da..7506ebb 100644 --- a/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-digest-md5.sgml @@ -14,11 +14,16 @@ CamelSaslDigestMd5 + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml b/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml index a32c77f..0dafc3e 100644 --- a/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-gssapi.sgml @@ -14,11 +14,16 @@ CamelSaslGssapi + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-sasl-kerberos4.sgml b/docs/reference/camel/tmpl/camel-sasl-kerberos4.sgml index e640126..a219dd2 100644 --- a/docs/reference/camel/tmpl/camel-sasl-kerberos4.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-kerberos4.sgml @@ -14,11 +14,16 @@ CamelSaslKerberos4 + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-sasl-login.sgml b/docs/reference/camel/tmpl/camel-sasl-login.sgml index 6d29232..a111667 100644 --- a/docs/reference/camel/tmpl/camel-sasl-login.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-login.sgml @@ -14,11 +14,16 @@ CamelSaslLogin + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml b/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml index 0d41b58..848a31d 100644 --- a/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-ntlm.sgml @@ -14,11 +14,15 @@ CamelSaslNTLM + + + +@parent_object: diff --git a/docs/reference/camel/tmpl/camel-sasl-plain.sgml b/docs/reference/camel/tmpl/camel-sasl-plain.sgml index 2cba56f..b498726 100644 --- a/docs/reference/camel/tmpl/camel-sasl-plain.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-plain.sgml @@ -14,11 +14,15 @@ CamelSaslPlain + + + +@parent_object: diff --git a/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml b/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml index 862babf..d2e8d14 100644 --- a/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml +++ b/docs/reference/camel/tmpl/camel-sasl-popb4smtp.sgml @@ -14,11 +14,15 @@ CamelSaslPOPB4SMTP + + + +@parent_object: diff --git a/docs/reference/camel/tmpl/camel-sasl.sgml b/docs/reference/camel/tmpl/camel-sasl.sgml index 2be166e..4b88f41 100644 --- a/docs/reference/camel/tmpl/camel-sasl.sgml +++ b/docs/reference/camel/tmpl/camel-sasl.sgml @@ -14,11 +14,19 @@ CamelSasl + + + +@parent_object: +@service_name: +@mech: +@service: +@authenticated: diff --git a/docs/reference/camel/tmpl/camel-seekable-stream.sgml b/docs/reference/camel/tmpl/camel-seekable-stream.sgml index 886cb04..7cee441 100644 --- a/docs/reference/camel/tmpl/camel-seekable-stream.sgml +++ b/docs/reference/camel/tmpl/camel-seekable-stream.sgml @@ -14,11 +14,18 @@ CamelSeekableStream + + + +@parent_object: +@position: +@bound_start: +@bound_end: diff --git a/docs/reference/camel/tmpl/camel-seekable-substream.sgml b/docs/reference/camel/tmpl/camel-seekable-substream.sgml index e8e491d..5fb25a1 100644 --- a/docs/reference/camel/tmpl/camel-seekable-substream.sgml +++ b/docs/reference/camel/tmpl/camel-seekable-substream.sgml @@ -14,11 +14,16 @@ CamelSeekableSubstream + + + +@parent_object: +@parent_stream: diff --git a/docs/reference/camel/tmpl/camel-sendmail-transport.sgml b/docs/reference/camel/tmpl/camel-sendmail-transport.sgml index 2b354f1..045783e 100644 --- a/docs/reference/camel/tmpl/camel-sendmail-transport.sgml +++ b/docs/reference/camel/tmpl/camel-sendmail-transport.sgml @@ -14,6 +14,9 @@ CamelSendmailTransport + + + diff --git a/docs/reference/camel/tmpl/camel-service.sgml b/docs/reference/camel/tmpl/camel-service.sgml index 5a1ca81..9b34608 100644 --- a/docs/reference/camel/tmpl/camel-service.sgml +++ b/docs/reference/camel/tmpl/camel-service.sgml @@ -14,11 +14,21 @@ CamelService + + + +@parent_object: +@priv: +@session: +@provider: +@status: +@connect_op: +@url: diff --git a/docs/reference/camel/tmpl/camel-session.sgml b/docs/reference/camel/tmpl/camel-session.sgml index bb3f80c..2d975de 100644 --- a/docs/reference/camel/tmpl/camel-session.sgml +++ b/docs/reference/camel/tmpl/camel-session.sgml @@ -14,11 +14,21 @@ CamelSession + + + +@parent_object: +@priv: +@storage_path: +@junk_plugin: +@online: +@check_junk: +@network_state: @@ -249,3 +259,21 @@ CamelSession @id: + + + + + +@session: +@Returns: + + + + + + + +@session: +@network_state: + + diff --git a/docs/reference/camel/tmpl/camel-smime-context.sgml b/docs/reference/camel/tmpl/camel-smime-context.sgml index 5021ed3..d5996c5 100644 --- a/docs/reference/camel/tmpl/camel-smime-context.sgml +++ b/docs/reference/camel/tmpl/camel-smime-context.sgml @@ -14,11 +14,16 @@ CamelSMIMEContext + + + +@cipher: +@priv: diff --git a/docs/reference/camel/tmpl/camel-smtp-transport.sgml b/docs/reference/camel/tmpl/camel-smtp-transport.sgml index e9baf51..1494d85 100644 --- a/docs/reference/camel/tmpl/camel-smtp-transport.sgml +++ b/docs/reference/camel/tmpl/camel-smtp-transport.sgml @@ -14,6 +14,9 @@ CamelSmtpTransport + + + diff --git a/docs/reference/camel/tmpl/camel-spool-folder.sgml b/docs/reference/camel/tmpl/camel-spool-folder.sgml index fe358a1..06fef6b 100644 --- a/docs/reference/camel/tmpl/camel-spool-folder.sgml +++ b/docs/reference/camel/tmpl/camel-spool-folder.sgml @@ -14,6 +14,9 @@ CamelSpoolFolder + + + diff --git a/docs/reference/camel/tmpl/camel-spool-store.sgml b/docs/reference/camel/tmpl/camel-spool-store.sgml index 3194e8d..2cd5cb7 100644 --- a/docs/reference/camel/tmpl/camel-spool-store.sgml +++ b/docs/reference/camel/tmpl/camel-spool-store.sgml @@ -14,6 +14,9 @@ CamelSpoolStore + + + diff --git a/docs/reference/camel/tmpl/camel-spool-summary.sgml b/docs/reference/camel/tmpl/camel-spool-summary.sgml index e4d7dcd..013566d 100644 --- a/docs/reference/camel/tmpl/camel-spool-summary.sgml +++ b/docs/reference/camel/tmpl/camel-spool-summary.sgml @@ -14,6 +14,9 @@ CamelSpoolSummary + + + diff --git a/docs/reference/camel/tmpl/camel-store-summary.sgml b/docs/reference/camel/tmpl/camel-store-summary.sgml index d1f466c..0b47bc5 100644 --- a/docs/reference/camel/tmpl/camel-store-summary.sgml +++ b/docs/reference/camel/tmpl/camel-store-summary.sgml @@ -14,6 +14,9 @@ CamelStoreSummary + + + @@ -49,6 +52,18 @@ CamelStoreSummary +@parent: +@priv: +@version: +@flags: +@count: +@time: +@uri_base: +@store_info_size: +@store_info_chunks: +@summary_path: +@folders: +@folders_path: diff --git a/docs/reference/camel/tmpl/camel-store.sgml b/docs/reference/camel/tmpl/camel-store.sgml index 0477cc5..f8b281b 100644 --- a/docs/reference/camel/tmpl/camel-store.sgml +++ b/docs/reference/camel/tmpl/camel-store.sgml @@ -14,11 +14,19 @@ CamelStore + + + +@parent_object: +@priv: +@folders: +@flags: +@mode: @@ -154,6 +162,27 @@ CamelStore + + + + + + + + + + + + + + + + + + + + + @@ -190,6 +219,13 @@ CamelStore + + + + + + + @@ -475,14 +511,6 @@ CamelStore @subscribe: @unsubscribe: - - - - - -@Returns: - - diff --git a/docs/reference/camel/tmpl/camel-stream-buffer.sgml b/docs/reference/camel/tmpl/camel-stream-buffer.sgml index 4394c5d..b4b17c0 100644 --- a/docs/reference/camel/tmpl/camel-stream-buffer.sgml +++ b/docs/reference/camel/tmpl/camel-stream-buffer.sgml @@ -14,11 +14,24 @@ CamelStreamBuffer + + + +@parent_object: +@stream: +@buf: +@ptr: +@end: +@size: +@linebuf: +@linesize: +@mode: +@flags: diff --git a/docs/reference/camel/tmpl/camel-stream-filter.sgml b/docs/reference/camel/tmpl/camel-stream-filter.sgml index af57557..1b804c6 100644 --- a/docs/reference/camel/tmpl/camel-stream-filter.sgml +++ b/docs/reference/camel/tmpl/camel-stream-filter.sgml @@ -14,11 +14,17 @@ CamelStreamFilter + + + +@parent: +@source: +@priv: diff --git a/docs/reference/camel/tmpl/camel-stream-fs.sgml b/docs/reference/camel/tmpl/camel-stream-fs.sgml index 5e9b411..50b07a0 100644 --- a/docs/reference/camel/tmpl/camel-stream-fs.sgml +++ b/docs/reference/camel/tmpl/camel-stream-fs.sgml @@ -14,11 +14,16 @@ CamelStreamFs + + + +@parent_object: +@fd: diff --git a/docs/reference/camel/tmpl/camel-stream-mem.sgml b/docs/reference/camel/tmpl/camel-stream-mem.sgml index 7f187ed..a919438 100644 --- a/docs/reference/camel/tmpl/camel-stream-mem.sgml +++ b/docs/reference/camel/tmpl/camel-stream-mem.sgml @@ -14,11 +14,18 @@ CamelStreamMem + + + +@parent_object: +@owner: +@secure: +@buffer: diff --git a/docs/reference/camel/tmpl/camel-stream-null.sgml b/docs/reference/camel/tmpl/camel-stream-null.sgml index 803fafa..2c5a847 100644 --- a/docs/reference/camel/tmpl/camel-stream-null.sgml +++ b/docs/reference/camel/tmpl/camel-stream-null.sgml @@ -14,11 +14,16 @@ CamelStreamNull + + + +@parent: +@written: diff --git a/docs/reference/camel/tmpl/camel-stream-process.sgml b/docs/reference/camel/tmpl/camel-stream-process.sgml index 2b408d2..f8b5172 100644 --- a/docs/reference/camel/tmpl/camel-stream-process.sgml +++ b/docs/reference/camel/tmpl/camel-stream-process.sgml @@ -14,11 +14,17 @@ CamelStreamProcess + + + +@parent: +@sockfd: +@childpid: diff --git a/docs/reference/camel/tmpl/camel-stream.sgml b/docs/reference/camel/tmpl/camel-stream.sgml index a2c9d96..62b03ee 100644 --- a/docs/reference/camel/tmpl/camel-stream.sgml +++ b/docs/reference/camel/tmpl/camel-stream.sgml @@ -14,11 +14,16 @@ CamelStream + + + +@parent_object: +@eos: diff --git a/docs/reference/camel/tmpl/camel-string-utils.sgml b/docs/reference/camel/tmpl/camel-string-utils.sgml index 7ed24dc..85118ff 100644 --- a/docs/reference/camel/tmpl/camel-string-utils.sgml +++ b/docs/reference/camel/tmpl/camel-string-utils.sgml @@ -14,6 +14,9 @@ camel-string-utils + + + @@ -78,6 +81,16 @@ camel-string-utils @Returns: + + + + + +@str: +@own: +@Returns: + + diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml index d0bc90c..2d42e2e 100644 --- a/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml +++ b/docs/reference/camel/tmpl/camel-tcp-stream-raw.sgml @@ -14,11 +14,16 @@ CamelTcpStreamRaw + + + +@parent_object: +@sockfd: diff --git a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml index 3b4737f..28e00ef 100644 --- a/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml +++ b/docs/reference/camel/tmpl/camel-tcp-stream-ssl.sgml @@ -14,11 +14,16 @@ CamelTcpStreamSSL + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-tcp-stream.sgml b/docs/reference/camel/tmpl/camel-tcp-stream.sgml index fde0549..3db7e88 100644 --- a/docs/reference/camel/tmpl/camel-tcp-stream.sgml +++ b/docs/reference/camel/tmpl/camel-tcp-stream.sgml @@ -14,11 +14,15 @@ CamelTcpStream + + + +@parent_object: diff --git a/docs/reference/camel/tmpl/camel-test-provider.sgml b/docs/reference/camel/tmpl/camel-test-provider.sgml index d919c2b..1d973cc 100644 --- a/docs/reference/camel/tmpl/camel-test-provider.sgml +++ b/docs/reference/camel/tmpl/camel-test-provider.sgml @@ -14,6 +14,9 @@ camel-test-provider + + + diff --git a/docs/reference/camel/tmpl/camel-test.sgml b/docs/reference/camel/tmpl/camel-test.sgml index f39e035..9352f3c 100644 --- a/docs/reference/camel/tmpl/camel-test.sgml +++ b/docs/reference/camel/tmpl/camel-test.sgml @@ -14,6 +14,9 @@ camel-test + + + diff --git a/docs/reference/camel/tmpl/camel-text-index.sgml b/docs/reference/camel/tmpl/camel-text-index.sgml index 1e48177..faa0037 100644 --- a/docs/reference/camel/tmpl/camel-text-index.sgml +++ b/docs/reference/camel/tmpl/camel-text-index.sgml @@ -14,6 +14,9 @@ CamelTextIndex + + + @@ -24,23 +27,23 @@ CamelTextIndex @buffer: - + -@Returns: - +@parent: +@priv: - + -@Returns: - +@parent: +@priv: - + @@ -48,13 +51,13 @@ CamelTextIndex @parent: @priv: - + -@Returns: - +@parent: +@priv: diff --git a/docs/reference/camel/tmpl/camel-transport.sgml b/docs/reference/camel/tmpl/camel-transport.sgml index c6438b3..7e2370d 100644 --- a/docs/reference/camel/tmpl/camel-transport.sgml +++ b/docs/reference/camel/tmpl/camel-transport.sgml @@ -14,11 +14,16 @@ CamelTransport + + + +@parent_object: +@priv: diff --git a/docs/reference/camel/tmpl/camel-uid-cache.sgml b/docs/reference/camel/tmpl/camel-uid-cache.sgml index fae1139..ba92762 100644 --- a/docs/reference/camel/tmpl/camel-uid-cache.sgml +++ b/docs/reference/camel/tmpl/camel-uid-cache.sgml @@ -14,6 +14,9 @@ camel-uid-cache + + + diff --git a/docs/reference/camel/tmpl/camel-unused.sgml b/docs/reference/camel/tmpl/camel-unused.sgml index e69de29..c4e0479 100644 --- a/docs/reference/camel/tmpl/camel-unused.sgml +++ b/docs/reference/camel/tmpl/camel-unused.sgml @@ -0,0 +1,526 @@ + + + + + + + + + + + + + + + + + +camel-groupwise-private + + + + + + + + + + + + + + + + + + + +camel-imap-private + + + + + + + + + + + + + + + + + + + +camel-imap-types + + + + + + + + + + + + + + + + + + + +camel-local-private + + + + + + + + + + + + + + + + + + + +camel-nntp-private + + + + + + + + + + + + + + + + + + + +camel-nntp-types + + + + + + + + + + + + + + + + + + + +camel-search-private + + + + + + + + + + + + + + + + + + + +camel-types + + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@f: +@l: + + + + + + +@cache_lock: + + + + + + + + + + + + +@search_lock: + + + + + + + + + + + + +@search_lock: +@cache_lock: + + + + + + + + + + + + +@parent_class: + + + + + + +@dummy: + + + + + + + + + + + + + + + + + + + + + + + + +@recipient_list: +@recipients: +@recipient_type: +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@pattern: +@type: +@argc: +@argv: +@ex: +@Returns: + + + + + + +@header: +@match: +@Returns: + + + + + + +@CAMEL_SEARCH_MATCH_START: +@CAMEL_SEARCH_MATCH_END: +@CAMEL_SEARCH_MATCH_REGEX: +@CAMEL_SEARCH_MATCH_ICASE: +@CAMEL_SEARCH_MATCH_NEWLINE: + + + + + + +@value: +@match: +@how: +@type: +@default_charset: +@Returns: + + + + + + +@CAMEL_SEARCH_MATCH_EXACT: +@CAMEL_SEARCH_MATCH_CONTAINS: +@CAMEL_SEARCH_MATCH_STARTS: +@CAMEL_SEARCH_MATCH_ENDS: +@CAMEL_SEARCH_MATCH_SOUNDEX: + + + + + + +@object: +@pattern: +@Returns: + + + + + + +@CAMEL_SEARCH_TYPE_ASIS: +@CAMEL_SEARCH_TYPE_ENCODED: +@CAMEL_SEARCH_TYPE_ADDRESS: +@CAMEL_SEARCH_TYPE_ADDRESS_ENCODED: +@CAMEL_SEARCH_TYPE_MLIST: + + + + + + +@type: +@word: + + + + + + +@CAMEL_SEARCH_WORD_SIMPLE: +@CAMEL_SEARCH_WORD_COMPLEX: +@CAMEL_SEARCH_WORD_8BIT: + + + + + + +@len: +@type: +@words: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@Returns: + + + + + + +@haystack: +@needle: +@Returns: + + + + + + +@gw_store: +@folder_name: +@Returns: + diff --git a/docs/reference/camel/tmpl/camel-url-scanner.sgml b/docs/reference/camel/tmpl/camel-url-scanner.sgml index aab41ba..3a1d7b9 100644 --- a/docs/reference/camel/tmpl/camel-url-scanner.sgml +++ b/docs/reference/camel/tmpl/camel-url-scanner.sgml @@ -14,6 +14,9 @@ camel-url-scanner + + + diff --git a/docs/reference/camel/tmpl/camel-url.sgml b/docs/reference/camel/tmpl/camel-url.sgml index 254851c..042b0e2 100644 --- a/docs/reference/camel/tmpl/camel-url.sgml +++ b/docs/reference/camel/tmpl/camel-url.sgml @@ -14,6 +14,9 @@ camel-url + + + @@ -114,6 +117,15 @@ camel-url @part: + + + + + +@path: +@Returns: + + diff --git a/docs/reference/camel/tmpl/camel-utf8.sgml b/docs/reference/camel/tmpl/camel-utf8.sgml index 3a544e5..084f920 100644 --- a/docs/reference/camel/tmpl/camel-utf8.sgml +++ b/docs/reference/camel/tmpl/camel-utf8.sgml @@ -14,6 +14,9 @@ camel-utf8 + + + diff --git a/docs/reference/camel/tmpl/camel-vee-folder.sgml b/docs/reference/camel/tmpl/camel-vee-folder.sgml index 36cced3..4e9122e 100644 --- a/docs/reference/camel/tmpl/camel-vee-folder.sgml +++ b/docs/reference/camel/tmpl/camel-vee-folder.sgml @@ -14,11 +14,21 @@ CamelVeeFolder + + + +@parent: +@priv: +@expression: +@flags: +@changes: +@search: +@parent_vee_store: diff --git a/docs/reference/camel/tmpl/camel-vee-store.sgml b/docs/reference/camel/tmpl/camel-vee-store.sgml index fa9832c..d90c585 100644 --- a/docs/reference/camel/tmpl/camel-vee-store.sgml +++ b/docs/reference/camel/tmpl/camel-vee-store.sgml @@ -14,11 +14,17 @@ CamelVeeStore + + + +@parent: +@folder_unmatched: +@unmatched_uids: diff --git a/docs/reference/camel/tmpl/camel-vee-summary.sgml b/docs/reference/camel/tmpl/camel-vee-summary.sgml index 3397348..a9240f6 100644 --- a/docs/reference/camel/tmpl/camel-vee-summary.sgml +++ b/docs/reference/camel/tmpl/camel-vee-summary.sgml @@ -14,11 +14,15 @@ CamelVeeSummary + + + +@summary: diff --git a/docs/reference/camel/tmpl/camel-vtrash-folder.sgml b/docs/reference/camel/tmpl/camel-vtrash-folder.sgml index 318a38d..1336a9e 100644 --- a/docs/reference/camel/tmpl/camel-vtrash-folder.sgml +++ b/docs/reference/camel/tmpl/camel-vtrash-folder.sgml @@ -14,6 +14,9 @@ CamelVTrashFolder + + + @@ -33,6 +36,8 @@ CamelVTrashFolder +@parent: +@bit: diff --git a/docs/reference/camel/tmpl/camel.sgml b/docs/reference/camel/tmpl/camel.sgml index 65553f0..6c63f0b 100644 --- a/docs/reference/camel/tmpl/camel.sgml +++ b/docs/reference/camel/tmpl/camel.sgml @@ -14,6 +14,9 @@ camel + + + diff --git a/docs/reference/camel/tmpl/folders.sgml b/docs/reference/camel/tmpl/folders.sgml index 2207cd0..a92b817 100644 --- a/docs/reference/camel/tmpl/folders.sgml +++ b/docs/reference/camel/tmpl/folders.sgml @@ -14,6 +14,9 @@ folders + + + diff --git a/docs/reference/camel/tmpl/messages.sgml b/docs/reference/camel/tmpl/messages.sgml index a859034..5701d9f 100644 --- a/docs/reference/camel/tmpl/messages.sgml +++ b/docs/reference/camel/tmpl/messages.sgml @@ -14,6 +14,9 @@ messages + + + diff --git a/docs/reference/camel/tmpl/session.sgml b/docs/reference/camel/tmpl/session.sgml index 49cdbd7..01737fa 100644 --- a/docs/reference/camel/tmpl/session.sgml +++ b/docs/reference/camel/tmpl/session.sgml @@ -14,6 +14,9 @@ CamelTestSession + + + diff --git a/docs/reference/camel/tmpl/streams.sgml b/docs/reference/camel/tmpl/streams.sgml index f70be5a..25d4279 100644 --- a/docs/reference/camel/tmpl/streams.sgml +++ b/docs/reference/camel/tmpl/streams.sgml @@ -14,6 +14,9 @@ streams + + + diff --git a/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml b/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml index 0b204bd..560f238 100644 --- a/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml +++ b/docs/reference/libedataserverui/tmpl/libedataserverui-unused.sgml @@ -1,9 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + +ESourceComboBox + + + + + + + + + + + + + + @@ -46,3 +82,43 @@ + + + + + +@source_combo_box: +@Returns: + + + + + + +@source_combo_box: +@Returns: + + + + + + +@source_list: +@Returns: + + + + + + +@source_combo_box: +@source: + + + + + + +@source_combo_box: +@source_list: + -- 2.7.4