[evolution-data-server] libebook: Allow *some* deprecated API into bindings.

[Matthew Barnes <mbarnes src gnome org>]

commit a2ccd137cabccb90916502d3edb10878e0a64814
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Jan 19 13:35:25 2013 -0500

    libebook: Allow *some* deprecated API into bindings.
    
    Also 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:
    
        EBook
        EBookView

 addressbook/libebook/Makefile.am           |    1 -
 addressbook/libebook/e-book-view-private.h |    5 +++++
 addressbook/libebook/e-book-view.h         |    5 +++++
 addressbook/libebook/e-book.h              |    5 +++++
 addressbook/libebook/e-destination.h       |    2 ++
 5 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 12d4cec..5e29354 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -103,7 +103,6 @@ INTROSPECTION_SCANNER_ARGS = \
 	--identifier-prefix=E \
 	--pkg-export libebook-1.2 \
 	--c-include="libebook/libebook.h" \
-	-D EDS_DISABLE_DEPRECATED \
 	$(NULL)
 INTROSPECTION_COMPILER_ARGS = \
 	--includedir=$(top_builddir)/libedataserver \
diff --git a/addressbook/libebook/e-book-view-private.h b/addressbook/libebook/e-book-view-private.h
index 131d738..87d112c 100644
--- a/addressbook/libebook/e-book-view-private.h
+++ b/addressbook/libebook/e-book-view-private.h
@@ -21,6 +21,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_BOOK_VIEW_PRIVATE_H
 #define E_BOOK_VIEW_PRIVATE_H
 
@@ -38,5 +41,7 @@ G_END_DECLS
 
 #endif /* E_BOOK_VIEW_PRIVATE_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
 
diff --git a/addressbook/libebook/e-book-view.h b/addressbook/libebook/e-book-view.h
index 1aa5268..b80e0a0 100644
--- a/addressbook/libebook/e-book-view.h
+++ b/addressbook/libebook/e-book-view.h
@@ -14,6 +14,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef E_BOOK_VIEW_H
 #define E_BOOK_VIEW_H
 
@@ -87,4 +90,6 @@ G_END_DECLS
 
 #endif /* E_BOOK_VIEW_H */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
diff --git a/addressbook/libebook/e-book.h b/addressbook/libebook/e-book.h
index 8c168d0..91d12e8 100644
--- a/addressbook/libebook/e-book.h
+++ b/addressbook/libebook/e-book.h
@@ -14,6 +14,9 @@
 
 #ifndef EDS_DISABLE_DEPRECATED
 
+/* Do not generate bindings. */
+#ifndef __GI_SCANNER__
+
 #ifndef __E_BOOK_H__
 #define __E_BOOK_H__
 
@@ -352,4 +355,6 @@ G_END_DECLS
 
 #endif /* __E_BOOK_H__ */
 
+#endif /* __GI_SCANNER__ */
+
 #endif /* EDS_DISABLE_DEPRECATED */
diff --git a/addressbook/libebook/e-destination.h b/addressbook/libebook/e-destination.h
index db35ade..7cb65c5 100644
--- a/addressbook/libebook/e-destination.h
+++ b/addressbook/libebook/e-destination.h
@@ -144,7 +144,9 @@ void          e_destination_export_to_vcard_attribute   (EDestination *dest, EVC
 void           e_destination_freev              (EDestination **destv);
 
 #ifndef EDS_DISABLE_DEPRECATED
+#ifndef __GI_SCANNER__
 void           e_destination_set_book           (EDestination *dest, EBook *book);
+#endif /* __GI_SCANNER__ */
 #endif /* EDS_DISABLE_DEPRECATED */
 
 G_END_DECLS