revised patch ...

[Michael Meeks <michael ximian com>]

	Incorporating your suggestions, and a fn rename.

		Michael.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/oaf/ChangeLog,v
retrieving revision 1.166
diff -u -r1.166 ChangeLog
--- ChangeLog	2001/07/17 19:31:45	1.166
+++ ChangeLog	2001/07/17 23:59:07
@@ -1,3 +1,20 @@
+2001-07-18  Michael Meeks  <michael ximian com>
+
+	* oafd/od-corba.c (impl_OAF_ObjectDirectory_register): rename to
+	(impl_OAF_ObjectDirectory_register_new): this to match IDL.
+
+2001-06-25  Michael Meeks  <michael ximian com>
+
+	* oafd/od-corba.c (od_dump_list): don't dump properties
+	containing a '-' they are most likely going to screw the
+	terminal.
+
+	* liboaf/oaf-fork-server.c (oaf_server_by_forking): add
+	more debug on failure case.
+
+	* liboaf/oaf-registration.c (rloc_file_lock): remove
+	redundant re-open.
+
 2001-07-17  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Added "nn" to ALL_LINGUAS.
Index: liboaf/oaf-fork-server.c
===================================================================
RCS file: /cvs/gnome/oaf/liboaf/oaf-fork-server.c,v
retrieving revision 1.3
diff -u -r1.3 oaf-fork-server.c
--- liboaf/oaf-fork-server.c	2001/07/16 18:22:48	1.3
+++ liboaf/oaf-fork-server.c	2001/07/17 23:59:07
@@ -26,8 +26,8 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE 1
 #endif
+#include <config.h>
 #include <string.h>
-
 #include "liboaf-private.h"
 #include "oaf-i18n.h"
 #include <limits.h>
@@ -221,8 +221,10 @@
 				retval = CORBA_OBJECT_NIL;
 #ifdef OAF_DEBUG
 			if (ai.do_srv_output)
-				g_message ("Did string_to_object on %s",
-					   ai.iorbuf);
+				g_message ("Did string_to_object on %s = '%p' (%s)",
+					   ai.iorbuf, retval,
+                                           ev->_major == CORBA_NO_EXCEPTION?
+                                           "no-exception" : ev->_id);
 #endif
 		} else {
 			OAF_GeneralError *errval;
Index: liboaf/oaf-registration.c
===================================================================
RCS file: /cvs/gnome/oaf/liboaf/oaf-registration.c,v
retrieving revision 1.29
diff -u -r1.29 oaf-registration.c
--- liboaf/oaf-registration.c	2001/07/16 18:22:48	1.29
+++ liboaf/oaf-registration.c	2001/07/17 23:59:08
@@ -469,7 +469,6 @@
 			break;
 	}
 
-	lock_fd = open (fn, O_CREAT | O_RDONLY, 0700);
 	fcntl (lock_fd, F_SETFD, FD_CLOEXEC);
 
 	if (lock_fd >= 0) {
Index: oafd/od-corba.c
===================================================================
RCS file: /cvs/gnome/oaf/oafd/od-corba.c,v
retrieving revision 1.31
diff -u -r1.31 od-corba.c
--- oafd/od-corba.c	2001/05/15 19:53:15	1.31
+++ oafd/od-corba.c	2001/07/17 23:59:08
@@ -106,9 +106,9 @@
 				 CORBA_Environment * ev);
 
 static OAF_RegistrationResult
-impl_OAF_ObjectDirectory_register (impl_POA_OAF_ObjectDirectory * servant,
-				   OAF_ImplementationID iid,
-				   CORBA_Object obj, CORBA_Environment * ev);
+impl_OAF_ObjectDirectory_register_new (impl_POA_OAF_ObjectDirectory * servant,
+                                       OAF_ImplementationID iid,
+                                       CORBA_Object obj, CORBA_Environment * ev);
 
 static void
 impl_OAF_ObjectDirectory_unregister (impl_POA_OAF_ObjectDirectory * servant,
@@ -134,7 +134,7 @@
 	(gpointer) &impl_OAF_ObjectDirectory_activate,
 	(gpointer) &impl_OAF_ObjectDirectory_lock,
 	(gpointer) &impl_OAF_ObjectDirectory_unlock,
-	(gpointer) &impl_OAF_ObjectDirectory_register,
+	(gpointer) &impl_OAF_ObjectDirectory_register_new,
 	(gpointer) &impl_OAF_ObjectDirectory_unregister
 };
 
@@ -163,6 +163,10 @@
 			OAF_Property *prop =
 				&(od->attr_servers._buffer[i].
 				  props._buffer[j]);
+                        if (strstr (prop->name, "-")) /* Translated, likely to
+                                                         be annoying garbage value */
+                                continue;
+
 			g_print ("    %s = ", prop->name);
 			switch (prop->v._d) {
 			case OAF_P_STRING:
@@ -478,9 +482,9 @@
 }
 
 static OAF_RegistrationResult
-impl_OAF_ObjectDirectory_register (impl_POA_OAF_ObjectDirectory * servant,
-				   OAF_ImplementationID iid,
-				   CORBA_Object obj, CORBA_Environment * ev)
+impl_OAF_ObjectDirectory_register_new (impl_POA_OAF_ObjectDirectory * servant,
+                                       OAF_ImplementationID iid,
+                                       CORBA_Object obj, CORBA_Environment * ev)
 {
 	CORBA_Object oldobj;
         OAF_ImplementationID actual_iid;

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot