Re: bonobo-activation patch ...

[Maciej Stachowiak <mjs noisehavoc org>]

On 10Aug2001 11:03AM (-0400), Michael Meeks wrote:
> 
> Hi there,
> 
> 	This is really just Jacob's fix for bonobo-activation - to make
> the error message nicer.

That part of it is fine.
 
> 	I've also moved GeneralError into the factory include, so that we
> can use it more generaly in bonobo - since it's a useful exception type,
> and it would be good to propagate it up from the moniker resolution
> process in fact.

But please don't commit this part. I'm splitting up the bonobo-activation
IDL files to be more sensible right now, it will be easier to find the right place
for the GeneralError exception afterwards (I'm hoping to commit later tonight
if I can get my laptop on the net from my parents' house). 


> 	May I commit ?
> 
> 		Michael.
> 
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/ChangeLog,v
> retrieving revision 1.200
> diff -u -r1.200 ChangeLog
> --- ChangeLog	2001/08/08 08:33:38	1.200
> +++ ChangeLog	2001/08/10 15:00:10
> @@ -1,3 +1,13 @@
> +2001-08-10  Michael Meeks  <michael ximian com>
> +
> +	* idl/Bonobo_ActivationContext.idl: move GeneralError
> +
> +	* idl/Bonobo_GenericFactory.idl: to here.
> +
> +	* bonobo-activation/bonobo-activation-shlib.c
> +	(bonobo_activation_activate_shlib_server): dump the
> +	g_module_error.
> +
>  2001-08-07  Maciej Stachowiak  <mjs noisehavoc org>
> 
>  	* server/activation-context-query-parser.y: Add prototype to fix
> Index: bonobo-activation/bonobo-activation-shlib.c
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/bonobo-activation/bonobo-activation-shlib.c,v
> retrieving revision 1.22
> diff -u -r1.22 bonobo-activation-shlib.c
> --- bonobo-activation/bonobo-activation-shlib.c	2001/08/01 23:01:48	1.22
> +++ bonobo-activation/bonobo-activation-shlib.c	2001/08/10 15:00:10
> @@ -98,7 +98,8 @@
>                          Bonobo_GeneralError *error = Bonobo_GeneralError__alloc ();
> 
>                          error_string = g_strdup_printf (
> -                                _("g_module_open of '%s' failed"), filename);
> +                                _("g_module_open of '%s' failed with '%s'"),
> +                                filename, g_module_error ());
>                          error->description = CORBA_string_dup (error_string);
>                          CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
>                                               ex_Bonobo_GeneralError, error);
> Index: idl/Bonobo_ActivationContext.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_ActivationContext.idl,v
> retrieving revision 1.29
> diff -u -r1.29 Bonobo_ActivationContext.idl
> --- idl/Bonobo_ActivationContext.idl	2001/07/31 16:52:02	1.29
> +++ idl/Bonobo_ActivationContext.idl	2001/08/10 15:00:10
> @@ -36,10 +36,6 @@
>  #include <Bonobo_GenericFactory.idl>
> 
>  module Bonobo {
> -        exception GeneralError {
> -                string description;
> -        };
> -
>          typedef string ImplementationID;
>          typedef string ActivationID;
>          interface ActivationContext;
> Index: idl/Bonobo_GenericFactory.idl
> ===================================================================
> RCS file: /cvs/gnome/bonobo-activation/idl/Bonobo_GenericFactory.idl,v
> retrieving revision 1.12
> diff -u -r1.12 Bonobo_GenericFactory.idl
> --- idl/Bonobo_GenericFactory.idl	2001/08/01 23:01:46	1.12
> +++ idl/Bonobo_GenericFactory.idl	2001/08/10 15:00:10
> @@ -19,6 +19,10 @@
>  module Bonobo {
>  	typedef sequence<string> StringList;
> 
> +        exception GeneralError {
> +                string description;
> +        };
> +
>  	interface GenericFactory : Bonobo::Unknown {
>  		exception CannotActivate { };
> 
> 
> -- 
>  mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot
>