Re: Committed patch to bonobo-activation

[Maciej Stachowiak <mjs noisehavoc org>]

On 17Oct2001 08:49PM (+0100), Louise Miller - Sun Microsystems Ireland - Computer Systems - Engineer wrote:
> Hi,
> 
> I've been working on compiling bonobo and at-spi IDL with the Java idlj 
> compiler, so that we can interoperate with Java UI components for at-spi.
> 
> After discussing this with Michael Meeks , i've committed some very simple 
> changes to bonobo-activation so that idlj is able to compile the idl files.
> 
> 

It looks OK to me, except for the CVS conflict in the ChangeLog. 

Also, it's probably not a good idea to try to access the stuff in
Bonobo_ActivationContext.idl or Bonobo_ObjectDirectory.idl. The
bonobo-activation library handles important parts of the work,
including launching the server and loading shared library
servers. These files should not be considered a public CORBA interface
to the bonobo-activation server.

Yes, it's a bug that there is currently no public CORBA interface to
libbonobo-activation. I'm hoping that will be fixed for 2.2.


> 
> 
> ? bonobo-activation/server/activation-server-main.c.louise
> Index: bonobo-activation/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
> retrieving revision 1.233
> diff -u -p -r1.233 ChangeLog
> --- bonobo-activation/ChangeLog	2001/10/17 08:41:07	1.233
> +++ bonobo-activation/ChangeLog	2001/10/17 19:37:15
> @@ -1,3 +1,10 @@
> +2001-10-17  Louise Miller <louise miller sun com>
> +
> +	* idl/Bonobo_ActivationContext.idl,idl/Bonobo_Activation_types.idl, 
> idl/Bonobo_ObjectDirectory.idl 
> +	  idl/Bonobo_Unknown.idl
> +	Changed #if !defined lines to #ifdef for compatibility with idlj 
> compiler
> + 
> +
>  2001-10-16  Mark McLoughlin <mark skynet ie>
>  
>  	* bonobo-activation/bonobo-activaion.h: kill
> Index: bonobo-activation/idl/Bonobo_ActivationContext.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_ActivationContext.idl,v
> retrieving revision 1.33
> diff -u -p -r1.33 Bonobo_ActivationContext.idl
> --- bonobo-activation/idl/Bonobo_ActivationContext.idl	2001/08/21 09:36:10	
> 1.33
> +++ bonobo-activation/idl/Bonobo_ActivationContext.idl	2001/10/17 19:37:15
> @@ -27,12 +27,14 @@
>  #ifndef __BONOBO_ACTIVATION_CONTEXT_IDL__
>  #define __BONOBO_ACTIVATION_CONTEXT_IDL__
>  
> -#if !defined(__Bonobo_ActivationContext_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_ActivationContext_COMPILATION
> +#ifdef  __ORBIT_IDL__
>  %{
>  #pragma include_defs bonobo-activation/Bonobo_ActivationContext.h
>  %}
>  #pragma inhibit push
>  #endif
> +#endif
>  
>  #include <Bonobo_Unknown.idl>
>  #include <Bonobo_Activation_types.idl>
> @@ -89,9 +91,10 @@ module Bonobo {
>          };
>  };
>  
> -#if !defined(__Bonobo_ActivationContext_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_ActivationContext_COMPILATION
> +#ifdef  __ORBIT_IDL__
>  #pragma inhibit pop
>  #endif
> -
> +#endif
>  
>  #endif
> Index: bonobo-activation/idl/Bonobo_Activation_types.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_Activation_types.idl,v
> retrieving revision 1.3
> diff -u -p -r1.3 Bonobo_Activation_types.idl
> --- bonobo-activation/idl/Bonobo_Activation_types.idl	2001/08/21 09:36:10	
> 1.3
> +++ bonobo-activation/idl/Bonobo_Activation_types.idl	2001/10/17 19:37:15
> @@ -7,12 +7,14 @@
>  #ifndef __BONOBO_ACTIVATION_TYPES_IDL__
>  #define __BONOBO_ACTIVATION_TYPES_IDL__
>  
> -#if !defined(__Bonobo_Activation_types_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef  __Bonobo_Activation_types_COMPILATION
> +#ifdef   __ORBIT_IDL__
>  %{
>  #pragma include_defs bonobo-activation/Bonobo_Activation_types.h
>  %}
>  #pragma inhibit push
>  #endif
> +#endif
>  
>  module Bonobo {
>  	typedef sequence<string> StringList;
> @@ -103,8 +105,10 @@ module Bonobo {
>  };
>  
>  
> -#if !defined(__Bonobo_Activation_types_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef  __Bonobo_Activation_types_COMPILATION
> +#ifdef   __ORBIT_IDL__
>  #pragma inhibit pop
> +#endif
>  #endif
>  
>  #endif
> Index: bonobo-activation/idl/Bonobo_ObjectDirectory.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_ObjectDirectory.idl,v
> retrieving revision 1.2
> diff -u -p -r1.2 Bonobo_ObjectDirectory.idl
> --- bonobo-activation/idl/Bonobo_ObjectDirectory.idl	2001/08/21 09:36:10	
> 1.2
> +++ bonobo-activation/idl/Bonobo_ObjectDirectory.idl	2001/10/17 19:37:15
> @@ -27,12 +27,14 @@
>  #ifndef __BONOBO_OBJECT_DIRECTORY_IDL__
>  #define __BONOBO_OBJECT_DIRECTORY_IDL__
>  
> -#if !defined(__Bonobo_ObjectDirectory_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_ObjectDirectory_COMPILATION
> +#ifdef  __ORBIT_IDL__
>  %{
>  #pragma include_defs bonobo-activation/Bonobo_ObjectDirectory.h
>  %}
>  #pragma inhibit push
>  #endif
> +#endif
>  
>  #include <Bonobo_Unknown.idl>
>  #include <Bonobo_Activation_types.idl>
> @@ -81,9 +83,10 @@ module Bonobo {
>  };
>  
>  
> -#if !defined(__Bonobo_ObjectDirectory_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_ObjectDirectory_COMPILATION
> +#ifdef  __ORBIT_IDL__
>  #pragma inhibit pop
>  #endif
> -
> +#endif
>  
>  #endif
> Index: bonobo-activation/idl/Bonobo_Unknown.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_Unknown.idl,v
> retrieving revision 1.7
> diff -u -p -r1.7 Bonobo_Unknown.idl
> --- bonobo-activation/idl/Bonobo_Unknown.idl	2001/08/21 09:36:10	1.7
> +++ bonobo-activation/idl/Bonobo_Unknown.idl	2001/10/17 19:37:15
> @@ -14,12 +14,14 @@
>  #ifndef __BONOBO_UNKNOWN_IDL__
>  #define __BONOBO_UNKNOWN_IDL__
>  
> -#if !defined(__Bonobo_Unknown_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_Unknown_COMPILATION
> +#ifdef  __ORBIT_IDL__
>  %{
>  #pragma include_defs bonobo-activation/Bonobo_Unknown.h
>  %}
>  #pragma inhibit push
>  #endif
> +#endif
>  
>  module Bonobo {
>  	interface Unknown {
> @@ -49,8 +51,10 @@ module Bonobo {
>  	};
>  };
>  
> -#if !defined(__Bonobo_Unknown_COMPILATION) && defined(__ORBIT_IDL__)
> +#ifndef __Bonobo_Unknown_COMPILATION
> +#ifdef __ORBIT_IDL__
>  #pragma inhibit pop
> +#endif
>  #endif
>  
>  #endif /* ! __BONOBO_UNKNOWN_IDL__ */
> Index: bonobo-activation/po/ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/po/ChangeLog,v
> retrieving revision 1.83
> diff -u -p -r1.83 ChangeLog
> --- bonobo-activation/po/ChangeLog	2001/10/14 14:18:27	1.83
> +++ bonobo-activation/po/ChangeLog	2001/10/17 19:37:15
> @@ -1,3 +1,9 @@
> +<<<<<<< ChangeLog
> +2001-10-12  gettextize  <bug-gnu-utils gnu org>
> +
> +	* Makefile.in.in: Upgrade to gettext-0.10.38.
> +
> +=======
>  2001-10-14  Stanislav Visnovsky  <visnovsky nenya ms mff cuni cz>
>  
>  	* sk.po: Updated Slovak translation.
> @@ -6,6 +12,7 @@
>  
>  	* ru.po: updated russian translation.
>  
> +>>>>>>> 1.83
>  2001-10-12  Carlos Perelló Marín <carlos gnome-db org>
>  
>  	* es.po: Updated.
> 
> 
> ------------------------------
> Louise Miller
> Sun Microsystems Ltd - Ireland
> louise miller ireland sun com
> 01-8199014
> ------------------------------
> 
> _______________________________________________
> gnome-components-list mailing list
> gnome-components-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-components-list