From 31dcfbfe1181a558e4e1b8381ca397943bb96a78 Mon Sep 17 00:00:00 2001
From: louised <louised@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Wed, 17 Oct 2001 19:18:38 +0000
Subject: [PATCH] <2001-10-13  Louise Miller <louise.miller@sun.com>

        * idl/Accessible.idl, idl/Application.idl, idl/Desktop.idl,
        idl/Event.idl, idl/Registry.idl
        Changed these files to include Bonobo_Unknown.idl instead
        of Bonobo.idl


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@78 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---
 ChangeLog                         | 7 +++++++
 idl/Accessibility.idl             | 8 ++++++--
 idl/Accessibility_Accessible.idl  | 4 ++--
 idl/Accessibility_Application.idl | 2 +-
 idl/Accessibility_Desktop.idl     | 2 +-
 idl/Accessibility_Event.idl       | 2 +-
 idl/Accessibility_Registry.idl    | 2 +-
 idl/Accessible.idl                | 4 ++--
 idl/Application.idl               | 2 +-
 idl/Desktop.idl                   | 2 +-
 idl/Event.idl                     | 2 +-
 idl/Registry.idl                  | 2 +-
 po/ChangeLog                      | 4 ++++
 13 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b6193b1..bd9c187 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+<2001-10-13  Louise Miller <louise.miller@sun.com>
+
+	* idl/Accessible.idl, idl/Application.idl, idl/Desktop.idl,
+	idl/Event.idl, idl/Registry.idl
+	Changed these files to include Bonobo_Unknown.idl instead
+	of Bonobo.idl
+
 <2001-09-10  Marc Mulcahy <marc.mulcahy@sun.com
 	libspi/component.c libspi/component.h:
 		Fixed typo.  Added assertions for object checks in AccessibleComponent code.
diff --git a/idl/Accessibility.idl b/idl/Accessibility.idl
index f858a87..c2b425c 100644
--- a/idl/Accessibility.idl
+++ b/idl/Accessibility.idl
@@ -23,12 +23,14 @@
 #ifndef _ACCESSIBILITY_IDL_
 #define _ACCESSIBILITY_IDL_
 
-#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__)
+#ifndef  __ACCESSIBILITY_COMPILATION__
+#ifdef   __ORBIT_IDL__
 %{
 #pragma include_defs Accessibility.h
 %}
 #pragma inhibit push
 #endif
+#endif
 
 /*
  * Accessibility interfaces and subinterfaces
@@ -63,8 +65,10 @@
 #include <Registry.idl>
 #include <Role.idl>
 
-#if !defined(__ACCESSIBILITY_COMPILATION__) && defined(__ORBIT_IDL__)
+#ifndef __ACCESSIBILITY_COMPILATION__
+#ifdef  __ORBIT_IDL__
 #pragma inhibit pop
 #endif
+#endif
 
 #endif
diff --git a/idl/Accessibility_Accessible.idl b/idl/Accessibility_Accessible.idl
index 79785e7..09735cb 100644
--- a/idl/Accessibility_Accessible.idl
+++ b/idl/Accessibility_Accessible.idl
@@ -23,7 +23,7 @@
 #ifndef _ACCESSIBILITY_ACCESSIBLE_IDL
 #define _ACCESSIBILITY_ACCESSIBLE_IDL
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 
 #include "Relation.idl"
 #include "State.idl"
@@ -65,7 +65,7 @@ module Accessibility {
      * return values: a #boolean indicating whether the two object references
      *         point to the same object. 
      **/
-    boolean isEqual (in Accessible object);
+    boolean isEqual (in Accessible obj);
 
     /**
      * getChildAtIndex:
diff --git a/idl/Accessibility_Application.idl b/idl/Accessibility_Application.idl
index a41db3a..05139bc 100644
--- a/idl/Accessibility_Application.idl
+++ b/idl/Accessibility_Application.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_APPLICATION_DEFINED__
 #define __ACCESSIBILITY_APPLICATION_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Accessible.idl>
 
 module Accessibility {
diff --git a/idl/Accessibility_Desktop.idl b/idl/Accessibility_Desktop.idl
index 635fee5..5702fb3 100644
--- a/idl/Accessibility_Desktop.idl
+++ b/idl/Accessibility_Desktop.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_DESKTOP_DEFINED__
 #define __ACCESSIBILITY_DESKTOP_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Accessible.idl>
 
 module Accessibility {
diff --git a/idl/Accessibility_Event.idl b/idl/Accessibility_Event.idl
index 3e9d01a..2574a80 100644
--- a/idl/Accessibility_Event.idl
+++ b/idl/Accessibility_Event.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_EVENT_DEFINED__
 #define __ACCESSIBILITY_EVENT_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 
 module Accessibility
 {
diff --git a/idl/Accessibility_Registry.idl b/idl/Accessibility_Registry.idl
index 5f42d87..96da28b 100644
--- a/idl/Accessibility_Registry.idl
+++ b/idl/Accessibility_Registry.idl
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Event.idl>
 #include <Application.idl>
 #include <Desktop.idl>
diff --git a/idl/Accessible.idl b/idl/Accessible.idl
index 79785e7..09735cb 100644
--- a/idl/Accessible.idl
+++ b/idl/Accessible.idl
@@ -23,7 +23,7 @@
 #ifndef _ACCESSIBILITY_ACCESSIBLE_IDL
 #define _ACCESSIBILITY_ACCESSIBLE_IDL
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 
 #include "Relation.idl"
 #include "State.idl"
@@ -65,7 +65,7 @@ module Accessibility {
      * return values: a #boolean indicating whether the two object references
      *         point to the same object. 
      **/
-    boolean isEqual (in Accessible object);
+    boolean isEqual (in Accessible obj);
 
     /**
      * getChildAtIndex:
diff --git a/idl/Application.idl b/idl/Application.idl
index a41db3a..05139bc 100644
--- a/idl/Application.idl
+++ b/idl/Application.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_APPLICATION_DEFINED__
 #define __ACCESSIBILITY_APPLICATION_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Accessible.idl>
 
 module Accessibility {
diff --git a/idl/Desktop.idl b/idl/Desktop.idl
index 635fee5..5702fb3 100644
--- a/idl/Desktop.idl
+++ b/idl/Desktop.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_DESKTOP_DEFINED__
 #define __ACCESSIBILITY_DESKTOP_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Accessible.idl>
 
 module Accessibility {
diff --git a/idl/Event.idl b/idl/Event.idl
index 3e9d01a..2574a80 100644
--- a/idl/Event.idl
+++ b/idl/Event.idl
@@ -23,7 +23,7 @@
 #ifndef __ACCESSIBILITY_EVENT_DEFINED__
 #define __ACCESSIBILITY_EVENT_DEFINED__
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 
 module Accessibility
 {
diff --git a/idl/Registry.idl b/idl/Registry.idl
index 5f42d87..96da28b 100644
--- a/idl/Registry.idl
+++ b/idl/Registry.idl
@@ -20,7 +20,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <Bonobo.idl>
+#include <Bonobo_Unknown.idl>
 #include <Event.idl>
 #include <Application.idl>
 #include <Desktop.idl>
diff --git a/po/ChangeLog b/po/ChangeLog
index e973262..9131b2f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-13  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.38.
+
 2001-10-10  gettextize  <bug-gnu-utils@gnu.org>
 
 	* Makefile.in.in: Upgrade to gettext-0.10.38.
-- 
2.7.4