Deprecate EUri.

Help end the proliferation of redundant URI-parsing APIs.  We avoid URIs
whenever possible now.  When it can't be avoided, SoupURI is sufficient.

diff --git a/docs/reference/libedataserver/libedataserver-docs.sgml b/docs/reference/libedataserver/libedataserver-docs.sgml
index 813d6c3..c7ebff9 100644 (file)
--- a/docs/reference/libedataserver/libedataserver-docs.sgml
+++ b/docs/reference/libedataserver/libedataserver-docs.sgml
@@ -58,7 +58,6 @@
     <xi:include href="xml/e-time-utils.xml"/>
     <xi:include href="xml/e-uid.xml"/>
     <xi:include href="xml/e-util.xml"/>
-    <xi:include href="xml/e-url.xml"/>
     <xi:include href="xml/e-xml-hash-utils.xml"/>
     <xi:include href="xml/eds-version.xml"/>
   </chapter>
@@ -69,6 +68,7 @@
     <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-url.xml"/>
   </chapter>
 
   <index id="api-index-full">

diff --git a/libedataserver/e-url.h b/libedataserver/e-url.h
index 783bb2d..fdf9669 100644 (file)
--- a/libedataserver/e-url.h
+++ b/libedataserver/e-url.h
@@ -29,6 +29,8 @@
 #error "Only <libedataserver/libedataserver.h> should be included directly."
 #endif
 
+#ifndef EDS_DISABLE_DEPRECATED
+
 #ifndef E_URL_H
 #define E_URL_H
 
@@ -81,3 +83,5 @@ G_END_DECLS
 
 #endif /* E_URL_H */
 
+#endif /* EDS_DISABLE_DEPRECATED */
+