evolution-data-server r9186 - trunk/camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Fri Jul 25 01:52:13 2008
New Revision: 9186
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9186&view=rev

Log:
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):



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-debug.h
   trunk/camel/camel-folder.h
   trunk/camel/camel-store.h

Modified: trunk/camel/camel-debug.h
==============================================================================
--- trunk/camel/camel-debug.h	(original)
+++ trunk/camel/camel-debug.h	Fri Jul 25 01:52:13 2008
@@ -36,8 +36,9 @@
 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
 

Modified: trunk/camel/camel-folder.h
==============================================================================
--- trunk/camel/camel-folder.h	(original)
+++ trunk/camel/camel-folder.h	Fri Jul 25 01:52:13 2008
@@ -268,7 +268,7 @@
 						       const char *uid,
 						       const char *name,
 						       const char *value);
-#endif
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 
 

Modified: trunk/camel/camel-store.h
==============================================================================
--- trunk/camel/camel-store.h	(original)
+++ trunk/camel/camel-store.h	Fri Jul 25 01:52:13 2008
@@ -136,7 +136,9 @@
 
 #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 @@
 
 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);