diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2007-04-28 01:42:04 +0000 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-04-28 01:42:04 +0000 |
| commit | b48d00c40cd4fd62381f3b971339435b0691656c (patch) | |
| tree | b42112a8cb9e61282c59a985b527ad519f6c3696 /camel/camel-data-wrapper.h | |
| parent | 31126a714314224e77a655a7a7b0cfece435d95e (diff) | |
| download | evolution-data-server-b48d00c40cd4fd62381f3b971339435b0691656c.tar.gz | |
** Fixes bug #418852
2007-04-27 Matthew Barnes <mbarnes@redhat.com>
** 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
Diffstat (limited to 'camel/camel-data-wrapper.h')
| -rw-r--r-- | camel/camel-data-wrapper.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/camel/camel-data-wrapper.h b/camel/camel-data-wrapper.h index dd9b6d650..b2f98e087 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 <glib.h> #include <sys/types.h> #include <camel/camel-object.h> @@ -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 */ |