PATCH: oaf crashes after recent changes

[Richard Hult <rhult hem passagen se>]

Hi,

Attached is a small patch that makes oaf work again after the
oaf_internal_activation_context_get_extended stuff was added. Without
this, oaf crashes when trying to start nautilus amongst other
applications.

Regards,
Richard

Index: liboaf/oaf-activate.c
===================================================================
RCS file: /cvs/gnome/oaf/liboaf/oaf-activate.c,v
retrieving revision 1.20.2.3
diff -u -b -B -p -r1.20.2.3 oaf-activate.c
--- liboaf/oaf-activate.c	2001/07/16 18:21:13	1.20.2.3
+++ liboaf/oaf-activate.c	2001/07/19 23:14:06
@@ -278,6 +278,11 @@ oaf_activate_from_id (const OAF_Activati
 
 	g_return_val_if_fail (aid, CORBA_OBJECT_NIL);
 
+        if (!ev) {
+		ev = &myev;
+		CORBA_exception_init (&myev);
+	}
+
         ac = oaf_internal_activation_context_get_extended ((flags & OAF_FLAG_EXISTING_ONLY) != 0, ev);
 
         if (ac == CORBA_OBJECT_NIL)
@@ -290,11 +295,6 @@ oaf_activate_from_id (const OAF_Activati
                 oaf_object_directory_get (ai->user, ai->host, ai->domain);
 
 		oaf_actinfo_free (ai);
-	}
-
-	if (!ev) {
-		ev = &myev;
-		CORBA_exception_init (&myev);
 	}
 
 	res = OAF_ActivationContext_activate_from_id (ac, aid, flags,
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/oaf/ChangeLog,v
retrieving revision 1.126.2.64
diff -u -b -B -p -r1.126.2.64 ChangeLog
--- ChangeLog	2001/07/16 21:03:50	1.126.2.64
+++ ChangeLog	2001/07/19 23:14:12
@@ -1,3 +1,10 @@
+2001-07-20  Richard Hult  <rhult codefactory se>
+
+	* liboaf/oaf-activate.c (oaf_activate_from_id): Move the code that
+	makes sure we have a CORBA_Environment over things that use ev, so
+	that we don't pass a NULL environment to things that can't handle
+	it (like CORBA_Object_non_existant).
+
 2001-07-16  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Added "nn" to ALL_LINGUAS.