Deprecate EList, EIterator, EListIterator.

diff --git a/docs/reference/libedataserver/libedataserver-docs.sgml b/docs/reference/libedataserver/libedataserver-docs.sgml
index 59e89e6..a46c27d 100644 (file)
--- a/docs/reference/libedataserver/libedataserver-docs.sgml
+++ b/docs/reference/libedataserver/libedataserver-docs.sgml
@@ -32,9 +32,6 @@
     <xi:include href="xml/e-credentials.xml"/>
     <xi:include href="xml/e-debug-log.xml"/>
     <xi:include href="xml/e-flag.xml"/>
-    <xi:include href="xml/e-iterator.xml"/>
-    <xi:include href="xml/e-list.xml"/>
-    <xi:include href="xml/e-list-iterator.xml"/>
     <xi:include href="xml/e-memory.xml"/>
     <xi:include href="xml/e-operation-pool.xml"/>
     <xi:include href="xml/e-proxy.xml"/>
@@ -48,6 +45,13 @@
     <xi:include href="xml/eds-version.xml"/>
   </chapter>
 
+  <chapter>
+    <title>Deprecated Classes</title>
+    <xi:include href="xml/e-iterator.xml"/>
+    <xi:include href="xml/e-list.xml"/>
+    <xi:include href="xml/e-list-iterator.xml"/>
+  </chapter>
+
   <index id="api-index-full">
     <title>Index</title>
     <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>

diff --git a/libedataserver/e-iterator.h b/libedataserver/e-iterator.h
index 9da8274..356c239 100644 (file)
--- a/libedataserver/e-iterator.h
+++ b/libedataserver/e-iterator.h
@@ -6,6 +6,8 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_ITERATOR_H
 #define E_ITERATOR_H
 
@@ -86,3 +88,6 @@ void          e_iterator_invalidate           (EIterator *iterator);
 G_END_DECLS
 
 #endif /* E_ITERATOR_H */
+
+#endif /* EDS_DISABLE_DEPRECATED */
+

diff --git a/libedataserver/e-list-iterator.h b/libedataserver/e-list-iterator.h
index 97c9852..3d3a954 100644 (file)
--- a/libedataserver/e-list-iterator.h
+++ b/libedataserver/e-list-iterator.h
@@ -6,6 +6,8 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_LIST_ITERATOR_H
 #define E_LIST_ITERATOR_H
 
@@ -56,3 +58,6 @@ EIterator *   e_list_iterator_new             (EList *list);
 G_END_DECLS
 
 #endif /* E_LIST_ITERATOR_H */
+
+#endif /* EDS_DISABLE_DEPRECATED */
+

diff --git a/libedataserver/e-list.h b/libedataserver/e-list.h
index 981444a..35a9690 100644 (file)
--- a/libedataserver/e-list.h
+++ b/libedataserver/e-list.h
@@ -6,6 +6,8 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_LIST_H
 #define E_LIST_H
 
@@ -83,3 +85,6 @@ void          e_list_invalidate_iterators     (EList *list,
 G_END_DECLS
 
 #endif /* E_LIST_H */
+
+#endif /* EDS_DISABLE_DEPRECATED */
+