** Camel Reference Manual improvements: Tag more symbols as deprecated.

2008-07-25  Matthew Barnes  <mbarnes@redhat.com>

	** Camel Reference Manual improvements:
	Tag more symbols as deprecated.  The documentation already
	describes them as such.

	* camel/camel-debug.h (camel_verbose_debug):
	* camel/camel-store.h (CAMEL_STORE_FOLDER_INFO_FAST):
	* camel/camel-store.h (camel_folder_info_build):

svn path=/trunk/; revision=9186

diff --git a/camel/ChangeLog b/camel/ChangeLog
index cce608f..8af9de1 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,6 +1,16 @@
 2008-07-25  Matthew Barnes  <mbarnes@redhat.com>
 
        ** Camel Reference Manual improvements:
+       Tag more symbols as deprecated.  The documentation already
+       describes them as such.
+
+       * camel-debug.h (camel_verbose_debug):
+       * camel-store.h (CAMEL_STORE_FOLDER_INFO_FAST):
+       * camel-store.h (camel_folder_info_build):
+
+2008-07-25  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Camel Reference Manual improvements:
        Add more sections to the Table of Contents.
        Tag deprecated API with CAMEL_DISABLE_DEPRECATED.
 

diff --git a/camel/camel-debug.h b/camel/camel-debug.h
index d36aa46..12382fa 100644 (file)
--- a/camel/camel-debug.h
+++ b/camel/camel-debug.h
@@ -36,8 +36,9 @@ gboolean camel_debug(const char *mode);
 gboolean camel_debug_start(const char *mode);
 void camel_debug_end(void);
 
-/* This interface is deprecated */
+#ifndef CAMEL_DISABLE_DEPRECATED
 extern int camel_verbose_debug;
+#endif
 
 G_END_DECLS
 

diff --git a/camel/camel-folder.h b/camel/camel-folder.h
index c00b48a..afa9ca2 100644 (file)
--- a/camel/camel-folder.h
+++ b/camel/camel-folder.h
@@ -268,7 +268,7 @@ void                   camel_folder_set_message_user_tag  (CamelFolder *folder,
                                                       const char *uid,
                                                       const char *name,
                                                       const char *value);
-#endif
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 
 

diff --git a/camel/camel-store.h b/camel/camel-store.h
index 816c920..df0b012 100644 (file)
--- a/camel/camel-store.h
+++ b/camel/camel-store.h
@@ -136,7 +136,9 @@ struct _CamelStore {
 
 #define CAMEL_STORE_FOLDER_CREATE_EXCL (CAMEL_STORE_FOLDER_CREATE | CAMEL_STORE_FOLDER_EXCL)
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 #define CAMEL_STORE_FOLDER_INFO_FAST       (1 << 0)
+#endif /* CAMEL_DISABLE_DEPRECATED */
 #define CAMEL_STORE_FOLDER_INFO_RECURSIVE  (1 << 1)
 #define CAMEL_STORE_FOLDER_INFO_SUBSCRIBED (1 << 2)
 #define CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL (1 << 3)  /* don't include vTrash/vJunk folders */
@@ -237,10 +239,12 @@ void             camel_store_free_folder_info_nop  (CamelStore *store,
 
 CamelFolderInfo *camel_folder_info_new             (void);
 void             camel_folder_info_free            (CamelFolderInfo *fi);
+#ifndef CAMEL_DISABLE_DEPRECATED
 CamelFolderInfo *camel_folder_info_build           (GPtrArray *folders,
                                                    const char *namespace,
                                                    char separator,
                                                    gboolean short_names);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 CamelFolderInfo *camel_folder_info_clone          (CamelFolderInfo *fi);
 
 gboolean         camel_store_supports_subscriptions   (CamelStore *store);