Re: Bonobo_ActivationContext.h snafu

[Maciej Stachowiak <mjs noisehavoc org>]

On 17Aug2001 12:42PM (-0700), Darin Adler wrote:
> 
> On Friday, August 17, 2001, at 12:24  PM, Maciej Stachowiak wrote:
> 
> > It's correct not to install it but I forgot to fix the other headers
> > to include Bonobo_Activation_types.h instead of
> > Bonobo_ActivationContext.h. I'll fix it in a moment.
> 
> I already took care of that, but there's still a problem. GConf looks at 
> the details of the Bonobo_ActivationContext_ParseFailed exception in 
> gconf-internals.c, which is not possible without Bonobo_ActivationContext.
> h.
> 

OK, I think in that case the best fix is to move all these exceptions
to Bonobo_Activation_types. I did that and also committed the
following patch to GConf (hope it's OK, Havoc)

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gconf/ChangeLog,v
retrieving revision 1.283
diff -u -r1.283 ChangeLog
--- ChangeLog	2001/08/15 21:54:21	1.283
+++ ChangeLog	2001/08/17 22:13:45
@@ -1,3 +1,8 @@
+2001-08-17  Maciej Stachowiak  <mjs noisehavoc org>
+
+	* gconf/gconf-internals.c: (gconf_handle_oaf_exception): Handle
+	rename for ParseFailed exception.
+
 2001-08-15  Havoc Pennington  <hp redhat com>
 
         Merge from stable.
Index: gconf/gconf-internals.c
===================================================================
RCS file: /cvs/gnome/gconf/gconf/gconf-internals.c,v
retrieving revision 1.92
diff -u -r1.92 gconf-internals.c
--- gconf/gconf-internals.c	2001/08/15 21:54:22	1.92
+++ gconf/gconf-internals.c	2001/08/17 22:13:45
@@ -2160,7 +2160,7 @@
           }
         else if (strcmp (id,"IDL:Bonobo/ActivationContext/ParseFailed:1.0") == 0)
           {
-            Bonobo_ActivationContext_ParseFailed* pe = CORBA_exception_value(ev);
+            Bonobo_Activation_ParseFailed* pe = CORBA_exception_value(ev);
             
             if (err)
               *err = gconf_error_new(GCONF_ERROR_OAF_ERROR, _("OAF parse error: %s"), pe->description);