evolution-data-server r9761 - trunk/camel

[mbarnes svn gnome org]

Author: mbarnes
Date: Mon Nov 17 21:32:12 2008
New Revision: 9761
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9761&view=rev

Log:
2008-11-17  Matthew Barnes  <mbarnes redhat com>

	** Fixes bug #531090

	* camel-object.h:
	* camel-store.h:
	Deprecate the CamelInterface and CamelIterator APIs since they're
	unused.  If and when we move Camel to GObject, I don't want to have
	to provide backward-compatibility support for these things.



Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-object.h
   trunk/camel/camel-store.h

Modified: trunk/camel/camel-object.h
==============================================================================
--- trunk/camel/camel-object.h	(original)
+++ trunk/camel/camel-object.h	Mon Nov 17 21:32:12 2008
@@ -67,11 +67,15 @@
 typedef struct _CamelObjectClass CamelObjectClass;
 typedef struct _CamelObject CamelObject;
 typedef unsigned int CamelObjectHookID;
+#ifndef CAMEL_DISABLE_DEPRECATED
 typedef struct _CamelObjectMeta CamelObjectMeta;
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 extern CamelType camel_interface_type;
 #define CAMEL_INTERFACE_TYPE (camel_interface_type)
 typedef struct _CamelInterface CamelInterface;
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);
 typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);
@@ -183,10 +187,12 @@
 	int (*state_write)(struct _CamelObject *, FILE *fp);
 };
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 /* an interface is just a class with no instance data */
 struct _CamelInterface {
 	struct _CamelObjectClass type;
 };
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 /* The type system .... it's pretty simple..... */
 void camel_type_init (void);
@@ -198,10 +204,12 @@
 			      CamelObjectInitFunc instance_init,
 			      CamelObjectFinalizeFunc instance_finalize);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 CamelType camel_interface_register(CamelType parent, const char *name,
 				   size_t classfuncs_size,
 				   CamelObjectClassInitFunc class_init,
 				   CamelObjectClassFinalizeFunc class_finalize);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 /* deprecated interface */
 #define camel_type_get_global_classfuncs(x) ((CamelObjectClass *)(x))
@@ -210,7 +218,9 @@
 const char *camel_type_to_name (CamelType type);
 CamelType camel_name_to_type (const char *name);
 void camel_object_class_add_event (CamelObjectClass *klass, const char *name, CamelObjectEventPrepFunc prep);
+#ifndef CAMEL_DISABLE_DEPRECATED
 void camel_object_class_add_interface(CamelObjectClass *klass, CamelType itype);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 void camel_object_class_dump_tree (CamelType root);
 
@@ -221,13 +231,14 @@
 CamelObjectClass *camel_object_class_cast (CamelObjectClass *klass, CamelType ctype);
 gboolean camel_object_class_is (CamelObjectClass *klass, CamelType ctype);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 CamelObjectClass *camel_interface_cast(CamelObjectClass *klass, CamelType ctype);
 gboolean camel_interface_is(CamelObjectClass *k, CamelType ctype);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 CamelType camel_object_get_type (void);
 
 CamelObject *camel_object_new (CamelType type);
-CamelObject *camel_object_new_name (const char *name);
 
 void camel_object_ref(void *);
 void camel_object_unref(void *);
@@ -243,8 +254,10 @@
 void camel_object_unhook_event(void *obj, const char *name, CamelObjectEventHookFunc hook, void *data);
 void camel_object_trigger_event(void *obj, const char *name, void *event_data);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 /* interfaces */
 void *camel_object_get_interface(void *vo, CamelType itype);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 /* get/set methods */
 int camel_object_set(void *obj, struct _CamelException *ex, ...);
@@ -304,6 +317,7 @@
 	return type##_type;							\
 }
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 /* Utility functions, not object specific, but too small to separate */
 typedef struct _CamelIteratorVTable CamelIteratorVTable;
 typedef struct _CamelIterator CamelIterator;
@@ -330,6 +344,7 @@
 const void *camel_iterator_next(void *it, CamelException *ex);
 void camel_iterator_reset(void *it);
 int camel_iterator_length(void *it);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 G_END_DECLS
 

Modified: trunk/camel/camel-store.h
==============================================================================
--- trunk/camel/camel-store.h	(original)
+++ trunk/camel/camel-store.h	Mon Nov 17 21:32:12 2008
@@ -274,6 +274,7 @@
 						       CamelFolderInfo *info,
 						       CamelException *ex);
 
+#ifndef CAMEL_DISABLE_DEPRECATED
 typedef struct _CamelISubscribe CamelISubscribe;
 struct _CamelISubscribe {
 	CamelInterface iface;
@@ -287,6 +288,7 @@
 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);
+#endif /* CAMEL_DISABLE_DEPRECATED */
 
 G_END_DECLS