libedataserver: Allow *some* deprecated API into bindings.

Allow some functions with "Deprecated" tags into bindings.

There are still some old, deprecated classes that we definitely don't
want to allow into bindings.  Use "#ifndef __GI_SCANNER__ ... #endif"
to force g-ir-scanner to skip them.

They are:

    ECredentials
    EIterator
    EListIterator
    EList
    EUrl

diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 0b5378f..fd3627f 100644 (file)
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -206,7 +206,6 @@ INTROSPECTION_SCANNER_ARGS = \
        --identifier-prefix E \
        --pkg-export libedataserver-1.2 \
        --c-include="libedataserver/libedataserver.h" \
-       -D EDS_DISABLE_DEPRECATED \
        $(NULL)
 INTROSPECTION_COMPILER_ARGS =
 

diff --git a/libedataserver/e-credentials.h b/libedataserver/e-credentials.h
index e3dcd93..2da0f48 100644 (file)
--- a/libedataserver/e-credentials.h
+++ b/libedataserver/e-credentials.h
@@ -25,6 +25,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_CREDENTIALS_H
 #define E_CREDENTIALS_H
 
@@ -175,4 +178,6 @@ G_END_DECLS
 
 #endif /* E_CREDENTIALS_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */

diff --git a/libedataserver/e-iterator.h b/libedataserver/e-iterator.h
index 1102f89..91be6f2 100644 (file)
--- a/libedataserver/e-iterator.h
+++ b/libedataserver/e-iterator.h
@@ -12,6 +12,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_ITERATOR_H
 #define E_ITERATOR_H
 
@@ -93,5 +96,7 @@ G_END_DECLS
 
 #endif /* E_ITERATOR_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
 

diff --git a/libedataserver/e-list-iterator.h b/libedataserver/e-list-iterator.h
index e5386b4..b714e64 100644 (file)
--- a/libedataserver/e-list-iterator.h
+++ b/libedataserver/e-list-iterator.h
@@ -12,6 +12,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_LIST_ITERATOR_H
 #define E_LIST_ITERATOR_H
 
@@ -63,5 +66,7 @@ G_END_DECLS
 
 #endif /* E_LIST_ITERATOR_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
 

diff --git a/libedataserver/e-list.h b/libedataserver/e-list.h
index 7ee10bf..f31dd9e 100644 (file)
--- a/libedataserver/e-list.h
+++ b/libedataserver/e-list.h
@@ -12,6 +12,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_LIST_H
 #define E_LIST_H
 
@@ -90,5 +93,7 @@ G_END_DECLS
 
 #endif /* E_LIST_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
 

diff --git a/libedataserver/e-url.h b/libedataserver/e-url.h
index fdf9669..4865ae2 100644 (file)
--- a/libedataserver/e-url.h
+++ b/libedataserver/e-url.h
@@ -31,6 +31,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_URL_H
 #define E_URL_H
 
@@ -83,5 +86,7 @@ G_END_DECLS
 
 #endif /* E_URL_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */