[evolution-data-server] Deprecate EProxy.



commit c57bf6751c341649a349894f9df5bf1bb376d4fa
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Oct 10 10:05:14 2013 -0400

    Deprecate EProxy.
    
    Proxy settings have moved to ESources.  See the ESourceProxy extension.

 .../libedataserver/libedataserver-docs.sgml        |    2 +-
 libedataserver/e-proxy.h                           |    9 +++++++++
 2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/docs/reference/libedataserver/libedataserver-docs.sgml 
b/docs/reference/libedataserver/libedataserver-docs.sgml
index 368d807..5c11b96 100644
--- a/docs/reference/libedataserver/libedataserver-docs.sgml
+++ b/docs/reference/libedataserver/libedataserver-docs.sgml
@@ -58,7 +58,6 @@
     <xi:include href="xml/e-flag.xml"/>
     <xi:include href="xml/e-memory.xml"/>
     <xi:include href="xml/e-operation-pool.xml"/>
-    <xi:include href="xml/e-proxy.xml"/>
     <xi:include href="xml/e-sexp.xml"/>
     <xi:include href="xml/e-time-utils.xml"/>
     <xi:include href="xml/e-uid.xml"/>
@@ -73,6 +72,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-proxy.xml"/>
     <xi:include href="xml/e-url.xml"/>
   </chapter>
 
diff --git a/libedataserver/e-proxy.h b/libedataserver/e-proxy.h
index 6dfa156..d93cbe1 100644
--- a/libedataserver/e-proxy.h
+++ b/libedataserver/e-proxy.h
@@ -25,6 +25,11 @@
 #error "Only <libedataserver/libedataserver.h> should be included directly."
 #endif
 
+#ifndef EDS_DISABLE_DEPRECATED
+
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_PROXY_H
 #define E_PROXY_H
 
@@ -86,3 +91,7 @@ gboolean      e_proxy_require_proxy_for_uri   (EProxy *proxy,
 G_END_DECLS
 
 #endif /* E_PROXY_H */
+
+#endif /* __GI_SCANNER__ */
+
+#endif /* EDS_DISABLE_DEPRECATED */


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]