Oaf

[JP Rosevear <jpr ximian com>]

Attached is a patch that prevents two oaf_init calls (gnome vfs calls
it) and atleast allows the capplet to function again.

On a broader note, I'm thinking that now is a good time to dump the
gnorba support completely and go with oaf only.  I can hack this up if
it sounds good.

-JP
-- 
--
=======================================================================
JP Rosevear				jpr ximian com
Ximian Inc.				http://www.ximian.com

? gp-oaf-fix-patch.diff
? macros/macros.dep
Index: gpilotd/gnome-pilot-client.gob
===================================================================
RCS file: /cvs/gnome/gnome-pilot/gpilotd/gnome-pilot-client.gob,v
retrieving revision 1.25
diff -u -r1.25 gnome-pilot-client.gob
--- gpilotd/gnome-pilot-client.gob	2001/07/30 21:31:37	1.25
+++ gpilotd/gnome-pilot-client.gob	2001/08/23 22:14:46
@@ -116,6 +116,13 @@
 #endif /* WITH_VFS */
 	}
 
+	private ORBit_MessageValidationResult accept_all_cookies (CORBA_unsigned_long request_id,
+		    						  CORBA_Principal *principal,
+		    						  CORBA_char *operation) {
+	        /* allow ALL cookies */
+		return ORBIT_MESSAGE_ALLOW_ALL;
+	}
+
 	private void init_corba_class (self) {
 		static gboolean inited = FALSE;
 		
@@ -154,7 +161,11 @@
 
 			CORBA_exception_init (ev);
 #if USING_OAF
-			self->orb = oaf_init (argc, &argv);
+			if (!oaf_is_initialized ())
+				self->orb = oaf_init (argc, &argv);
+			else
+				self->orb = oaf_orb_get ();
+			ORBit_set_request_validation_handler (accept_all_cookies);
 #else /* USING_OAF */
 			self->orb = gnome_CORBA_ORB ();
 #endif /* USING_OAF */