Gnome 2 Alpha release: GConf 1.1.1 build fails

[Jens Finke <jens triq net>]

Hi,

I had to patch the Gconf-1.1.1 package in order to get it build with the
rest of the Gnome 2 alpha release. Especially it should search for the
orbit-idl-2 compiler. The other thing is a simple typo.

AFAICS these issues are both fixed in CVS so maybe you can make a new
release for the GNOME 2 alpha?

Regards,

   Jens

diff -ur orig-GConf-1.1.1/configure.in GConf-1.1.1/configure.in
--- orig-GConf-1.1.1/configure.in	Thu Aug  2 07:08:25 2001
+++ GConf-1.1.1/configure.in	Thu Sep 27 16:04:10 2001
@@ -153,8 +153,12 @@
 AC_SUBST(BDB_LIBS)
 AC_SUBST(BDB_CFLAGS)
 
-AC_PATH_PROG(ORBIT_IDL, orbit-idl, no)
+AC_PATH_PROG(ORBIT_IDL, orbit-idl-2, no)
 AC_SUBST(ORBIT_IDL)
+
+if test x$ORBIT_IDL = xno; then
+  AC_MSG_ERROR([Could not find orbit-idl-2 in your path, should come with ORBit2])
+fi
 
 AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt,
 	[AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[
diff -ur orig-GConf-1.1.1/gconf/gconf-internals.c GConf-1.1.1/gconf/gconf-internals.c
--- orig-GConf-1.1.1/gconf/gconf-internals.c	Thu Aug  2 05:51:17 2001
+++ GConf-1.1.1/gconf/gconf-internals.c	Thu Sep 27 16:06:00 2001
@@ -2158,7 +2158,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);