Changes to the way Bonobo_Unknown is included,

affects ORBit2/Bonobo environment only.  See bug #313122.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@840 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 4087812..c535799 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
        * configure.in:
        Revved to 1.7.10, and edited the Xevie check (bug #319994).
+
+       * idl/Accessibility.idl:
+       Reworked inclusion of Bonobo_Unknown.idl, to 
+       avoid double-linking libs in the Bonobo environment.
+       Thanks to Michael Meeks for the workaround, see bug #313122.
        
 2006-07-18  Bill Haneman <billh@gnome.org> modifications to patch from
 

diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index c5be877..6822f22 100644 (file)
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -33,6 +33,17 @@
 #endif
 
 #ifndef _BONOBO_IDL_INCLUDED_
+#ifdef __ORBIT_IDL__
+%{
+#pragma include_defs bonobo/Bonobo.h
+%}
+#pragma inhibit push
+#endif
+#include <Bonobo_Unknown.idl>
+#ifdef __ORBIT_IDL__
+#pragma inhibit pop
+#endif
+
 #define _BONOBO_IDL_INCLUDED_
 #include <Bonobo_Unknown.idl>
 #endif /* _BONOBO_IDL_INCLUDED_ */