Re: oaf async patch.



Mathieu Lacage <mathieu eazel com> writes:

> hi all,
> 
> 
> I got myself to implement this async thingy. Tests seem to pass and 
> I am still testing it.

First, please write a ChangeLog entry when sending a patch. :-)

Looks good modulo a few comments below.
 
> 
> 
> Index: idl/oaf.idl
> ===================================================================
> RCS file: /cvs/gnome/oaf/idl/oaf.idl,v
> retrieving revision 1.22
> diff -u -r1.22 oaf.idl
> --- idl/oaf.idl	2000/09/22 12:16:55	1.22
> +++ idl/oaf.idl	2000/10/05 08:45:18
> @@ -114,6 +114,11 @@
>                  REG_ERROR 
>          };
>  
> +        interface ActivationCallback {
> +                oneway void report_activation_failed (in string reason);
> +                oneway void report_activation_succeeded (in ActivationResult result);
> +        };
> +
>          /* Interfaces */
>          interface ObjectDirectory {
>  		enum UnregisterType {
> @@ -127,7 +132,7 @@
>  
>                  Object activate (in ImplementationID iid, in ActivationContext ac, in ActivationFlags flags)
>                          context ("username", "hostname", "domain", "display");
> -                
> +
>                  /* Ensures consistency for activations of publicly advertised objects */
>                  void lock();
>                  oneway void unlock();
> @@ -156,6 +161,14 @@
>                          raises (ParseFailed, IncompleteContext, GeneralError)
>                          context ("username", "hostname", "domain", "display");
>  
> +                oneway void activate_async (in string requirements,
> +                                            in GNOME::stringlist selection_order,
> +                                            in ActivationFlags flags,
> +                                            in ActivationCallback callback_object)
> +                        context ("username", "hostname", "domain", "display");
> +
> +
> +
>                  readonly attribute ServerInfoList servers;
>                  ServerInfoList query (in string requirements,
>                                        in GNOME::stringlist selection_order)
> @@ -165,5 +178,11 @@
>                  ActivationResult activate_from_id (in ActivationID aid, in ActivationFlags flags)
>                          raises (ParseFailed, IncompleteContext, GeneralError)
>                          context ("username", "hostname", "domain", "display");
> +
> +                oneway void activate_from_id_async (in ActivationID aid, 
> +                                                    in ActivationFlags flags,
> +                                                    in ActivationCallback callback_object)
> +                        context ("username", "hostname", "domain", "display");
> +
>          };
>  };
> Index: liboaf/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/oaf/liboaf/Makefile.am,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile.am
> --- liboaf/Makefile.am	2000/08/12 01:16:15	1.18
> +++ liboaf/Makefile.am	2000/10/05 08:45:18
> @@ -22,6 +22,7 @@
>  liboafinclude_HEADERS=		\
>  	oaf.h 			\
>  	liboaf.h 		\
> +	oaf-async.h		\
>  	oaf-factory.h 		\
>  	oaf-factory-suppress.h	\
>  	liboaf-version.h	\
> @@ -29,6 +30,7 @@
>  
>  liboaf_la_SOURCES=		\
>  	oaf-stubs.c 		\
> +	oaf-skels.c 		\
>  	oaf-common.c 		\
>  	oaf-mainloop.c 		\
>  	oaf-actid.c 		\
> @@ -38,14 +40,19 @@
>  	oaf-factory-common.c 	\
>  	oaf-plugin.c 		\
>  	oaf-activate.c 		\
> +	oaf-activate.h 		\
>  	oaf-registration.c 	\
>  	oaf-servreg.c 		\
>  	oaf-util.c		\
>  	oaf-i18n.h		\
> +	oaf-async.c		\
> +	oaf-async-corba.h	\
> +	oaf-async-corba.c	\
>  	$(NULL)
>  
>  BUILT_SOURCES=			\
>  	oaf-stubs.c 		\
> +	oaf-skels.c 		\
>  	oaf-common.c 		\
>  	oaf-factory-stubs.c 	\
>  	oaf-factory-skels.c 	\
> @@ -54,7 +61,7 @@
>  	oaf-factory.h		\
>  	$(NULL)
>  
> -oaf-stubs.c oaf.h oaf-common.c: stamp-idl
> +oaf-stubs.c oaf-skels.c oaf.h oaf-common.c: stamp-idl
>  
>  oaf-factory-stubs.c oaf-factory-skels.c oaf-factory.h oaf-factory-common.c: stamp-factory-idl
>  
> @@ -64,7 +71,7 @@
>  ../liboaf/oaf-factory.h: stamp-factory-idl
>  
>  stamp-idl: $(top_srcdir)/idl/oaf.idl
> -	$(ORBIT_IDL) --noskels -I$(top_srcdir)/idl --define=OAF_COMPILATION $(top_srcdir)/idl/oaf.idl
> +	$(ORBIT_IDL) -I$(top_srcdir)/idl --define=OAF_COMPILATION $(top_srcdir)/idl/oaf.idl
>  	touch stamp-idl
>  
>  oaf-factory.h stamp-factory-idl: $(top_srcdir)/idl/oaf-factory.idl
> Index: liboaf/liboaf.h
> ===================================================================
> RCS file: /cvs/gnome/oaf/liboaf/liboaf.h,v
> retrieving revision 1.30
> diff -u -r1.30 liboaf.h
> --- liboaf/liboaf.h	2000/09/22 12:16:56	1.30
> +++ liboaf/liboaf.h	2000/10/05 08:45:18
> @@ -63,6 +63,10 @@
>  const char *oaf_session_name_get (void);
>  const char *oaf_domain_get (void);
>  
> +void         oaf_set_test_components_enabled (gboolean val);
> +gboolean     oaf_get_test_components_enabled (void);
> +
> +
>  typedef struct
>  {
>  	const char *iid;
> @@ -98,8 +102,6 @@
>                                          CORBA_Environment * ev);
>  
>  
> -void         oaf_set_test_components_enabled (gboolean val);
> -gboolean     oaf_get_test_components_enabled (void);
>  
>  OAF_ServerInfoList *oaf_query (const char *requirements,
>  			       char *const *selection_order,
> @@ -154,6 +156,8 @@
>  void oaf_registration_unset (const OAFRegistrationCategory * regcat,
>  			     CORBA_Object obj, CORBA_Environment * ev);
>  
> +
> +
>  /* Do not release() the returned value */
>  CORBA_Object oaf_service_get (const OAFRegistrationCategory * regcat);
>  
> @@ -164,6 +168,9 @@
>  void oaf_registration_activator_add (OAFServiceActivator act_func,
>  				     int priority);
>  
> +
> +
> +
>  /* oaf-servreg.c */
>  OAF_RegistrationResult oaf_active_server_register (const char *iid,
>  						   CORBA_Object obj);
> @@ -171,6 +178,8 @@
>  
>  char *oaf_make_registration_id (const char *iid, const char *display);
>  
> +
> +
>  /* oaf-util.c */
>  OAF_Property *oaf_server_info_prop_find (OAF_ServerInfo * server,
>                                           const char *prop_name);
> @@ -201,7 +210,9 @@
>  CORBA_ORB oaf_orb_init (int *argc, char **argv);
>  void oaf_preinit (gpointer app, gpointer mod_info);
>  void oaf_postinit (gpointer app, gpointer mod_info);
> +
>  const char *oaf_activation_iid_get (void);
> +
>  extern const guint liboaf_major_version,
>  	liboaf_minor_version, liboaf_micro_version;
>  extern const char liboaf_version[];

The changes to this file seem to just add whitespace (or did I miss
something?)


> Index: liboaf/oaf-activate.c
> ===================================================================
> RCS file: /cvs/gnome/oaf/liboaf/oaf-activate.c,v
> retrieving revision 1.16
> diff -u -r1.16 oaf-activate.c
> --- liboaf/oaf-activate.c	2000/09/19 05:07:10	1.16
> +++ liboaf/oaf-activate.c	2000/10/05 08:45:18
> @@ -24,6 +24,7 @@
>   */
>  
>  #include "liboaf/liboaf-private.h"
> +#include "liboaf/oaf-activate.h"
>  
>  extern CORBA_Object oaf_server_activate_shlib (OAF_ActivationResult * sh,
>  					       CORBA_Environment * ev);
> @@ -44,7 +45,45 @@
>          return test_components_enabled;
>  }
>  
> +/**
> + * oaf_get_test_requirements:
> + * @requirements: the user requirements.
> + *
> + * internal function only: returns a new query string.
> + **/
> +char *
> +oaf_get_test_requirements (const char *requirements) 
> +{
> +        char *ext_requirements;
> +
> +        if (!oaf_get_test_components_enabled ()) {
> +                ext_requirements = g_strconcat ("( ", requirements,
> +                                                " ) AND (NOT test_only.defined() OR NOT test_only)",
> +                                                NULL);
> +        } else {
> +                ext_requirements = NULL;
> +        }
> +
> +        return ext_requirements;
> +}

Hmm, why do the NULL thing, why not just g_strdup the passed string in
that case, it would make client code a lot simpler. Also suggest
renaming this to oaf_maybe_add_test_requirements or something; `get'
implies an accessor.

> +void 
> +oaf_activate_selection_order_get_corba (char *const *selection_order, GNOME_stringlist *ret_val)
> +{
> +        int i;
> +
> +	if (selection_order) {
> +		for (i = 0; selection_order[i]; i++)
> +			/**/;
> +
> +		ret_val->_length = i;
> +		ret_val->_buffer = (char **) selection_order;
> +		CORBA_sequence_set_release (ret_val, CORBA_FALSE);
> +	} else {
> +		memset (ret_val, 0, sizeof (*ret_val));
> +        }
> +}
> +

for this I'd suggest oaf_copy_string_array_to_GNOME_stringlist as the name


>  /**
>   * oaf_query: 
>   * @requirements: query string.
> @@ -66,7 +105,6 @@
>  {
>  	GNOME_stringlist selorder;
>  	OAF_ServerInfoList *res;
> -	int i;
>  	CORBA_Environment myev;
>  	OAF_ActivationContext ac;
>          char *ext_requirements;
> @@ -76,31 +114,22 @@
>  	ac = oaf_activation_context_get ();
>  	g_return_val_if_fail (ac, CORBA_OBJECT_NIL);
>  
> -        if (!oaf_get_test_components_enabled ()) {
> -                ext_requirements = g_strconcat ("( ", requirements,
> -                                                " ) AND (NOT test_only.defined() OR NOT test_only)",
> -                                                NULL);
> -        } else {
> -                ext_requirements = NULL;
> -        }
> +        ext_requirements = oaf_get_test_requirements (requirements);
>  
>  	if (!ev) {
>  		ev = &myev;
>  		CORBA_exception_init (&myev);
>  	}
> -
> -	if (selection_order) {
> -		for (i = 0; selection_order[i]; i++)
> -			/**/;
>  
> -		selorder._length = i;
> -		selorder._buffer = (char **) selection_order;
> -		CORBA_sequence_set_release (&selorder, CORBA_FALSE);
> -	} else
> -		memset (&selorder, 0, sizeof (selorder));
> +        oaf_activate_selection_order_get_corba (selection_order, &selorder);
>  
> -	res = OAF_ActivationContext_query (ac, (char *) (ext_requirements ? ext_requirements : requirements),
> -					   &selorder, oaf_context_get (), ev);
> +        if (ext_requirements == NULL) {
> +                res = OAF_ActivationContext_query (ac, (char *) requirements,
> +                                                   &selorder, oaf_context_get (), ev);
> +        } else {
> +                res = OAF_ActivationContext_query (ac, (char *) ext_requirements,
> +                                                   &selorder, oaf_context_get (), ev);
> +        }
>  
>          if (ext_requirements != NULL) {
>                  g_free (ext_requirements);
> @@ -137,50 +166,49 @@
>  	      CORBA_Environment * ev)
>  {
>  	GNOME_stringlist selorder;
> -	CORBA_Object retval = CORBA_OBJECT_NIL;
> +	CORBA_Object retval;
>  	OAF_ActivationResult *res;
> -	int i;
>  	CORBA_Environment myev;
>  	OAF_ActivationContext ac;
>          char *ext_requirements;
>  
> +        retval = CORBA_OBJECT_NIL;
> +
>  	g_return_val_if_fail (requirements, CORBA_OBJECT_NIL);
>  	ac = oaf_activation_context_get ();
>  	g_return_val_if_fail (ac, CORBA_OBJECT_NIL);
>  
> -        if (!oaf_get_test_components_enabled ()) {
> -                ext_requirements = g_strconcat ("( ", requirements,
> -                                                " ) AND (NOT test_only.defined() OR NOT test_only)",
> -                                                NULL);
> -        } else {
> -                ext_requirements = NULL;
> -        }
> +        ext_requirements = oaf_get_test_requirements (requirements);
>  
>  	if (!ev) {
>  		ev = &myev;
>  		CORBA_exception_init (&myev);
>  	}
>  
> -	if (selection_order) {
> -		for (i = 0; selection_order[i]; i++)
> -			/**/;
> +        oaf_activate_selection_order_get_corba (selection_order, &selorder);
>  
> -		selorder._length = i;
> -		selorder._buffer = (char **) selection_order;
> -		CORBA_sequence_set_release (&selorder, CORBA_FALSE);
> -	} else
> -		memset (&selorder, 0, sizeof (selorder));
> -
> -	res = OAF_ActivationContext_activate (ac, (char *) (ext_requirements ? ext_requirements : requirements),
> -					      &selorder, flags,
> -					      oaf_context_get (), ev);
> +        if (ext_requirements == NULL) {
> +                res = OAF_ActivationContext_activate (ac, (char *) requirements,
> +                                                      &selorder, flags,
> +                                                      oaf_context_get (), ev);
> +        } else {
> +                res = OAF_ActivationContext_activate (ac, (char *) ext_requirements,
> +                                                      &selorder, flags,
> +                                                      oaf_context_get (), ev);
> +        }
>  
>          if (ext_requirements != NULL) {
>                  g_free (ext_requirements);
>          }
>  
> -	if (ev->_major != CORBA_NO_EXCEPTION)
> -		goto out;
> +	if (ev->_major != CORBA_NO_EXCEPTION) {
> +                if (ev == &myev) {
> +                        CORBA_exception_free (&myev);
> +                }
> +                
> +                return retval;
> +        }
> +
>  
>  	switch (res->res._d) {
>  	case OAF_RESULT_SHLIB:
> @@ -202,7 +230,6 @@
>  
>  	CORBA_free (res);
>  
> -      out:
>  	if (ev == &myev)
>  		CORBA_exception_free (&myev);
>  
> @@ -238,8 +265,9 @@
>  
>  	ai = oaf_actid_parse (aid);
>  
> -	if (ai) {		/* This is so that using an AID in an unactivated OD will work nicely */
> -		OAFRegistrationCategory regcat;
> +	if (ai) {		
> +                /* This is so that using an AID in an unactivated OD will work nicely */
> +                OAFRegistrationCategory regcat;
>  
>  		memset (&regcat, 0, sizeof (regcat));
>  		regcat.name = "IDL:OAF/ObjectDirectory:1.0";
> @@ -258,10 +286,9 @@
>  		CORBA_exception_init (&myev);
>  	}
>  
> -	res =
> -		OAF_ActivationContext_activate_from_id (ac, aid, flags,
> -							oaf_context_get (),
> -							ev);
> +	res = OAF_ActivationContext_activate_from_id (ac, aid, flags,
> +                                                      oaf_context_get (),
> +                                                      ev);
>  	if (ev->_major != CORBA_NO_EXCEPTION)
>  		goto out;
>  
> Index: liboaf/oaf-activate.h
> ===================================================================
> RCS file: oaf-activate.h
> diff -N oaf-activate.h
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-activate.h	Thu Oct  5 04:45:18 2000
> @@ -0,0 +1,38 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +/*
> + *  liboaf: A library for accessing oafd in a nice way.
> + *
> + *  Copyright (C) 1999, 2000 Red Hat, Inc.
> + *  Copyright (C) 2000 Eazel, Inc.
> + *
> + *  This library is free software; you can redistribute it and/or
> + *  modify it under the terms of the GNU Library General Public
> + *  License as published by the Free Software Foundation; either
> + *  version 2 of the License, or (at your option) any later version.
> + *
> + *  This library is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + *  Library General Public License for more details.
> + *
> + *  You should have received a copy of the GNU Library General Public
> + *  License along with this library; if not, write to the Free
> + *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + *  Author: Elliot Lee <sopwith redhat com>
> + *
> + */
> +
> +#ifndef OAF_ACTIVATE_H
> +#define OAF_ACTIVATE_H
> +
> +char              *oaf_get_test_requirements               (const char *requirements);
> +void               oaf_activate_selection_order_get_corba  (char *const *selection_order, 
> +							    GNOME_stringlist *ret_val);
> +
> +
> +
> +
> +#endif /* OAF_ACTIVATE_H */
> +
> +
> Index: liboaf/oaf-async-corba.c
> ===================================================================
> RCS file: oaf-async-corba.c
> diff -N oaf-async-corba.c
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-async-corba.c	Thu Oct  5 04:45:18 2000
> @@ -0,0 +1,190 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +/*
> + *  oaf-async: A library for accessing oafd in a nice way.
> + *
> + *  Copyright (C) 2000 Eazel, Inc.
> + *
> + *  This library is free software; you can redistribute it and/or
> + *  modify it under the terms of the GNU Library General Public
> + *  License as published by the Free Software Foundation; either
> + *  version 2 of the License, or (at your option) any later version.
> + *
> + *  This library is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + *  Library General Public License for more details.
> + *
> + *  You should have received a copy of the GNU Library General Public
> + *  License along with this library; if not, write to the Free
> + *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + *  Author: Mathieu Lacage <mathieu eazel com>
> + *
> + */
> +
> +#include "oaf.h"
> +#include "liboaf.h"
> +#include "oaf-async.h"
> +#include "oaf-async-corba.h"
> +#include "oaf-i18n.h"
> +
> +/*** App-specific servant structures ***/
> +typedef struct {
> +
> +   POA_OAF_ActivationCallback servant;
> +   PortableServer_POA poa;
> +   OAFActivationCallback callback;
> +   gpointer user_data;
> +
> +} impl_POA_OAF_ActivationCallback;
> +
> +void
> +impl_OAF_ActivationCallback__destroy(impl_POA_OAF_ActivationCallback *servant, 
> +				     CORBA_Environment *ev);
> +
> +
> +
> +/*** Implementation stub prototypes ***/
> +
> +static void
> +impl_OAF_ActivationCallback_report_activation_failed
> +           (impl_POA_OAF_ActivationCallback * servant, 
> +	    CORBA_char * reason,
> +	    CORBA_Environment * ev);
> +
> +static void
> +impl_OAF_ActivationCallback_report_activation_succeeded
> +           (impl_POA_OAF_ActivationCallback * servant, 
> +	    OAF_ActivationResult * result,
> +	    CORBA_Environment * ev);
> +
> +/*** epv structures ***/
> +
> +static PortableServer_ServantBase__epv impl_OAF_ActivationCallback_base_epv = {
> +   NULL,			/* _private data */
> +   NULL,			/* finalize routine */
> +   NULL,			/* default_POA routine */
> +};
> +static POA_OAF_ActivationCallback__epv impl_OAF_ActivationCallback_epv = {
> +   NULL,			/* _private */
> +   (gpointer) & impl_OAF_ActivationCallback_report_activation_failed,
> +
> +   (gpointer) & impl_OAF_ActivationCallback_report_activation_succeeded,
> +
> +};
> +
> +/*** vepv structures ***/
> +
> +static POA_OAF_ActivationCallback__vepv impl_OAF_ActivationCallback_vepv = {
> +   &impl_OAF_ActivationCallback_base_epv,
> +   &impl_OAF_ActivationCallback_epv,
> +};
> +
> +/*** Stub implementations ***/
> +
> +CORBA_Object
> +oaf_async_corba_callback_new (OAFActivationCallback callback,
> +                              gpointer user_data,
> +                              CORBA_Environment * ev)
> +{
> +   CORBA_Object retval;
> +   impl_POA_OAF_ActivationCallback *newservant;
> +   PortableServer_ObjectId *objid;
> +   PortableServer_POA poa;
> +   PortableServer_POAManager manager;
> +   CORBA_ORB orb;
> +
> +   orb = oaf_orb_get ();
> +
> +   poa =  (PortableServer_POA) CORBA_ORB_resolve_initial_references (orb, "RootPOA", ev);
> +   manager = PortableServer_POA__get_the_POAManager (poa, ev);
> +   PortableServer_POAManager_activate (manager, ev);
> +
> +   newservant = g_new0(impl_POA_OAF_ActivationCallback, 1);
> +   newservant->servant.vepv = &impl_OAF_ActivationCallback_vepv;
> +   newservant->poa = poa;
> +   newservant->callback = callback;
> +   newservant->user_data = user_data;
> +
> +   POA_OAF_ActivationCallback__init((PortableServer_Servant) newservant, ev);
> +   objid = PortableServer_POA_activate_object(poa, newservant, ev);
> +   CORBA_free(objid);
> +   retval = PortableServer_POA_servant_to_reference(poa, newservant, ev);
> +
> +   return retval;
> +}
> +
> +void
> +impl_OAF_ActivationCallback__destroy(impl_POA_OAF_ActivationCallback *servant, 
> +				     CORBA_Environment * ev)
> +{
> +   PortableServer_ObjectId *objid;
> +
> +   objid = PortableServer_POA_servant_to_id(servant->poa, servant, ev);
> +   PortableServer_POA_deactivate_object(servant->poa, objid, ev);
> +   CORBA_free(objid);
> +
> +   POA_OAF_ActivationCallback__fini((PortableServer_Servant) servant, ev);
> +   g_free(servant);
> +}
> +
> +static void
> +impl_OAF_ActivationCallback_report_activation_failed
> +   (impl_POA_OAF_ActivationCallback * servant, 
> +    CORBA_char * reason,
> +    CORBA_Environment * ev)
> +{
> +        char *message;
> +
> +        if (servant->callback == NULL) {
> +                return;
> +        }
> +
> +        message = g_strconcat ("Activation failed: ", reason, NULL);

May as well skip this, the client can probably handle formatting the
message better.

> +        servant->callback (CORBA_OBJECT_NIL, message, servant->user_data);
> +        g_free (message);
> +
> +        /* destroy this object */
> +        impl_OAF_ActivationCallback__destroy (servant, ev);
> +}
> +
> +static void
> +impl_OAF_ActivationCallback_report_activation_succeeded
> +   (impl_POA_OAF_ActivationCallback * servant, 
> +    OAF_ActivationResult * result,
> +    CORBA_Environment * ev)
> +{
> +        CORBA_Object retval;
> +
> +        retval = CORBA_OBJECT_NIL;
> +
> +        if (servant->callback == NULL) {
> +                return;
> +        }
> +
> +	switch (result->res._d) {
> +	case OAF_RESULT_SHLIB:
> +                retval = oaf_server_activate_shlib (result, ev);
> +		break;
> +	case OAF_RESULT_OBJECT:
> +		retval = CORBA_Object_duplicate (result->res._u.res_object, ev);
> +		break;
> +	case OAF_RESULT_NONE:
> +                retval = CORBA_OBJECT_NIL;
> +                break;
> +	default:
> +                g_assert_not_reached ();
> +		break;
> +	}
> +
> +        if (retval == CORBA_OBJECT_NIL) {
> +                servant->callback (CORBA_OBJECT_NIL,
> +                                   _("No server corresponding to your query"), 
> +                                   servant->user_data);
> +        } else {
> +                servant->callback (retval, NULL, servant->user_data);
> +        }
> +
> +        /* destroy this object */
> +        impl_OAF_ActivationCallback__destroy (servant, ev);
> +}
> Index: liboaf/oaf-async-corba.h
> ===================================================================
> RCS file: oaf-async-corba.h
> diff -N oaf-async-corba.h
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-async-corba.h	Thu Oct  5 04:45:18 2000
> @@ -0,0 +1,40 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +/*
> + *  oaf-async: A library for accessing oafd in a nice way.
> + *
> + *  Copyright (C) 2000 Eazel, Inc.
> + *
> + *  This library is free software; you can redistribute it and/or
> + *  modify it under the terms of the GNU Library General Public
> + *  License as published by the Free Software Foundation; either
> + *  version 2 of the License, or (at your option) any later version.
> + *
> + *  This library is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + *  Library General Public License for more details.
> + *
> + *  You should have received a copy of the GNU Library General Public
> + *  License along with this library; if not, write to the Free
> + *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + *  Author: Mathieu Lacage <mathieu eazel com>
> + *
> + */
> +
> +
> +#ifndef OAF_ASYNC_CORBA_H
> +#define OAF_ASYNC_CORBA_H
> +
> +#include "oaf.h"
> +
> +
> +
> +CORBA_Object 
> +oaf_async_corba_callback_new (OAFActivationCallback callback,
> +                              gpointer user_data,
> +                              CORBA_Environment * ev);
> +
> +
> +
> +#endif /* OAF_ASYNC_CORBA_H */
> Index: liboaf/oaf-async.c
> ===================================================================
> RCS file: oaf-async.c
> diff -N oaf-async.c
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-async.c	Thu Oct  5 04:45:18 2000
> @@ -0,0 +1,179 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +/*
> + *  oaf-async: A library for accessing oafd in a nice way.
> + *
> + *  Copyright (C) 2000 Eazel, Inc.
> + *
> + *  This library is free software; you can redistribute it and/or
> + *  modify it under the terms of the GNU Library General Public
> + *  License as published by the Free Software Foundation; either
> + *  version 2 of the License, or (at your option) any later version.
> + *
> + *  This library is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + *  Library General Public License for more details.
> + *
> + *  You should have received a copy of the GNU Library General Public
> + *  License along with this library; if not, write to the Free
> + *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + *  Author: Mathieu Lacage <mathieu eazel com>
> + */
> +
> +#include <config.h>
> +
> +#include "oaf-async.h"
> +#include "oaf-async-corba.h"
> +#include "liboaf/oaf-activate.h"
> +#include "liboaf/liboaf-private.h"
> +
> +void oaf_activate_async (const char *requirements,
> +			 char *const *selection_order,
> +			 OAF_ActivationFlags flags,
> +			 OAFActivationCallback callback,
> +			 gpointer user_data,
> +			 CORBA_Environment * ev)
> +{
> +        CORBA_Object callback_object;
> +        CORBA_Environment myev;
> +        GNOME_stringlist sel_order;
> +	OAF_ActivationContext activation_context;
> +        char *ext_requirements;
> +
> +        g_return_if_fail (callback);
> +
> +	if (ev == NULL) {
> +		ev = &myev;
> +	}
> +        
> +        CORBA_exception_init (ev);
> +
> +        if (requirements == NULL) {
> +                callback (CORBA_OBJECT_NIL, "Requirements NULL", user_data);
> +                return;
> +        }
> +
> +        /* get the Activation Context */
> +	activation_context = oaf_activation_context_get ();
> +        if (activation_context == CORBA_OBJECT_NIL) {
> +                callback (CORBA_OBJECT_NIL, "Could not get Activation Context", user_data);
> +                return;
> +        }
> +
> +        ext_requirements = oaf_get_test_requirements (requirements);
> +
> +        oaf_activate_selection_order_get_corba (selection_order, &sel_order);
> +
> +        /* create the CORBA callback for this call It will destroy itelf later */
> +        callback_object = oaf_async_corba_callback_new (callback, user_data, ev);
> +        if (ev->_major != CORBA_NO_EXCEPTION
> +            || callback_object == CORBA_OBJECT_NIL) {
> +                callback (CORBA_OBJECT_NIL, "Could not create CORBA callback", user_data);
> +                return;
> +        }
> +
> +
> +        /* make the OAF call :) */
> +        if (ext_requirements == NULL) {
> +                OAF_ActivationContext_activate_async (activation_context, 
> +                                                      requirements, &sel_order, 
> +                                                      flags, callback_object, 
> +                                                      oaf_context_get (), ev);
> +        } else {
> +                OAF_ActivationContext_activate_async (activation_context,
> +                                                      ext_requirements, &sel_order, 
> +                                                      flags, callback_object, 
> +                                                      oaf_context_get (), ev);
> +        }
> +
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                message = g_strconcat ("Could not contact Activation Context: ", 
> +                                       CORBA_exception_id (ev), NULL);
> +                callback (CORBA_OBJECT_NIL, message, user_data );
> +                g_free (message);
> +                return;
> +        }
> +
> +        /* the end :) */
> +}
> +
> +void oaf_activate_from_id_async (const OAF_ActivationID aid,
> +				 OAF_ActivationFlags flags,
> +				 OAFActivationCallback callback,
> +				 gpointer user_data,
> +				 CORBA_Environment * ev)
> +{
> +        CORBA_Object callback_object;
> +        CORBA_Environment myev;
> +	OAF_ActivationContext activation_context;
> +	OAFActivationInfo *ai;
> +
> +        g_return_if_fail (callback);
> +
> +	if (ev == NULL) {
> +		ev = &myev;
> +	}
> +        
> +        CORBA_exception_init (ev);
> +
> +        if (aid == NULL) {
> +                callback (CORBA_OBJECT_NIL, "AID NULL", user_data);
> +                return;
> +        }
> +
> +        /* get the Activation Context */
> +	activation_context = oaf_activation_context_get ();
> +        if (activation_context == CORBA_OBJECT_NIL) {
> +                callback (CORBA_OBJECT_NIL, "Could not get Activation Context", user_data);
> +                return;
> +        }
> +
> +	ai = oaf_actid_parse (aid);
> +
> +	if (ai) {		
> +                /* This is so that using an AID in an unactivated OD will work nicely */
> +		OAFRegistrationCategory regcat;
> +
> +		memset (&regcat, 0, sizeof (regcat));
> +		regcat.name = "IDL:OAF/ObjectDirectory:1.0";
> +		regcat.session_name = oaf_session_name_get ();
> +		regcat.username = ai->user;
> +		regcat.hostname = ai->host;
> +		regcat.domain = ai->domain;
> +
> +		oaf_service_get (&regcat);
> +
> +		oaf_actinfo_free (ai);
> +	}
> +
> +        /* create the CORBA callback for this call It will destroy itelf later */
> +        callback_object = oaf_async_corba_callback_new (callback, user_data, ev);
> +        if (ev->_major != CORBA_NO_EXCEPTION
> +            || callback_object == CORBA_OBJECT_NIL) {
> +                callback (CORBA_OBJECT_NIL, "Could not create CORBA callback", user_data);
> +                return;
> +        }
> +
> +        OAF_ActivationContext_activate_from_id_async (activation_context, 
> +                                                      aid, flags,
> +                                                      callback_object,
> +                                                      oaf_context_get (),
> +                                                      ev);
> +
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                message = g_strconcat ("Could not contact Activation Context: ", 
> +                                       CORBA_exception_id (ev), NULL);
> +                callback (CORBA_OBJECT_NIL, message, user_data );
> +                g_free (message);
> +        }
> +            
> +}
> +
> +
> +

This looks like it could share more code with oaf_activate_from_id

> +
> +
> +
> Index: liboaf/oaf-async.h
> ===================================================================
> RCS file: oaf-async.h
> diff -N oaf-async.h
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-async.h	Thu Oct  5 04:45:18 2000
> @@ -0,0 +1,60 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +/*
> + *  oaf-async: A library for accessing oafd in a nice way.
> + *
> + *  Copyright (C) 2000 Eazel, Inc.
> + *
> + *  This library is free software; you can redistribute it and/or
> + *  modify it under the terms of the GNU Library General Public
> + *  License as published by the Free Software Foundation; either
> + *  version 2 of the License, or (at your option) any later version.
> + *
> + *  This library is distributed in the hope that it will be useful,
> + *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> + *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + *  Library General Public License for more details.
> + *
> + *  You should have received a copy of the GNU Library General Public
> + *  License along with this library; if not, write to the Free
> + *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
> + *
> + *  Author: Mathieu Lacage <mathieu eazel com>
> + *
> + */
> +
> +
> +#ifndef OAF_ASYNC_H
> +#define OAF_ASYNC_H
> +
> +#include <liboaf/liboaf-version.h>
> +#include <liboaf/oaf.h>
> +
> +
> +/* activated_object is CORBA_OBJECT_NIL if the activation 
> +   failed somehow. If this is the case, error_reason contains
> +   a valid string which describes the pb encountered.
> +   If this is not the case, error_reason is not defined.
> +   activated_object should be CORBA_Object_release'd by the user
> +*/
> +typedef void (*OAFActivationCallback) (CORBA_Object   activated_object, 
> +				       const char    *error_reason, 
> +				       gpointer       user_data);
> +
> +
> +void oaf_activate_async (const char *requirements,
> +			 char *const *selection_order,
> +			 OAF_ActivationFlags flags,
> +			 OAFActivationCallback callback,
> +			 gpointer user_data,
> +			 CORBA_Environment * ev);
> +
> +void oaf_activate_from_id_async (const OAF_ActivationID aid,
> +				 OAF_ActivationFlags flags,
> +				 OAFActivationCallback callback,
> +				 gpointer user_data,
> +				 CORBA_Environment * ev);
> +
> +
> +
> +#endif /* OAF_ASYNC_H */
> +
> Index: liboaf/oaf-registration.c
> ===================================================================
> RCS file: /cvs/gnome/oaf/liboaf/oaf-registration.c,v
> retrieving revision 1.20
> diff -u -r1.20 oaf-registration.c
> --- liboaf/oaf-registration.c	2000/09/23 00:30:20	1.20
> +++ liboaf/oaf-registration.c	2000/10/05 08:45:18
> @@ -107,9 +107,8 @@
>  		if (!ri->regloc->check)
>  			continue;
>  
> -		new_ior =
> -			ri->regloc->check (ri->regloc, regcat, &new_dist,
> -					   ri->user_data);
> +		new_ior = ri->regloc->check (ri->regloc, regcat, 
> +                                             &new_dist, ri->user_data);
>  		if (new_ior && (new_dist < dist)) {
>  			g_free (ior);
>  			ior = new_ior;
> @@ -451,14 +450,11 @@
>  }
>  activatable_servers[] =
>  {
> -	{
> -		"IDL:OAF/ActivationContext:1.0", (const char **) oaf_ac_cmd,
> -			2, CORBA_OBJECT_NIL}
> -	, {
> -		"IDL:OAF/ObjectDirectory:1.0", (const char **) oaf_od_cmd,
> -			1, CORBA_OBJECT_NIL}
> -	, {
> -	NULL}
> +	{"IDL:OAF/ActivationContext:1.0", (const char **) oaf_ac_cmd,
> +         2, CORBA_OBJECT_NIL}, 
> +        {"IDL:OAF/ObjectDirectory:1.0", (const char **) oaf_od_cmd,
> +         1, CORBA_OBJECT_NIL},
> +	{ NULL}
>  };
>  
>  #define STRMATCH(x, y) ((!x && !y) || (x && y && !strcmp(x, y)))
> @@ -479,7 +475,9 @@
>  		    && (!ssi->domain
>  			|| STRMATCH (ssi->domain,
>  				     regcat->
> -				     domain))) return ssi->already_running;
> +				     domain))) {
> +                        return ssi->already_running;
> +                }
>  	}
>  
>  	return CORBA_OBJECT_NIL;
> Index: oafd/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/oaf/oafd/Makefile.am,v
> retrieving revision 1.18
> diff -u -r1.18 Makefile.am
> --- oafd/Makefile.am	2000/09/22 12:16:56	1.18
> +++ oafd/Makefile.am	2000/10/05 08:45:18
> @@ -68,4 +68,8 @@
>  CLEANFILES=stamp-parser stamp-idl
>  
>  oaf-skels.c: $(top_srcdir)/idl/oaf.idl
> -	$(ORBIT_IDL) --nostubs --noheaders $(top_srcdir)/idl/oaf.idl
> +	$(ORBIT_IDL) --noheaders $(top_srcdir)/idl/oaf.idl
> +
> +
> +
> +
> Index: oafd/ac-corba.c
> ===================================================================
> RCS file: /cvs/gnome/oaf/oafd/ac-corba.c,v
> retrieving revision 1.32
> diff -u -r1.32 ac-corba.c
> --- oafd/ac-corba.c	2000/09/22 12:16:56	1.32
> +++ oafd/ac-corba.c	2000/10/05 08:45:18
> @@ -55,6 +55,17 @@
>  }
>  ChildODInfo;
>  
> +
> +
> +/* forward declarations */
> +char     *ac_aid_to_query_string       (OAF_ActivationID aid);
> +void      ac_context_to_string_array   (CORBA_Context context, 
> +                                        char *sort_criteria[4],
> +                                        CORBA_Environment *ev);
> +
> +
> +
> +
>  static ChildODInfo *
>  child_od_info_new (OAF_ObjectDirectory obj, CORBA_Environment * ev)
>  {
> @@ -240,6 +251,15 @@
>  				     CORBA_Context ctx,
>  				     CORBA_Environment * ev);
>  
> +static void
> +impl_OAF_ActivationContext_activate_async(impl_POA_OAF_ActivationContext *
> +					  servant, CORBA_char * requirements,
> +					  GNOME_stringlist * selection_order,
> +					  OAF_ActivationFlags flags,
> +					  OAF_ActivationCallback
> +					  callback_object, CORBA_Context ctx,
> +					  CORBA_Environment * ev);
> +
>  static OAF_ServerInfoList
>  	* impl_OAF_ActivationContext__get_servers
>  	(impl_POA_OAF_ActivationContext * servant, CORBA_Environment * ev);
> @@ -260,6 +280,13 @@
>  	 CORBA_Environment * ev);
>  
>  static void
> +impl_OAF_ActivationContext_activate_from_id_async
> +   (impl_POA_OAF_ActivationContext * servant, OAF_ActivationID aid,
> +    OAF_ActivationFlags flags, OAF_ActivationCallback callback_object,
> +    CORBA_Context ctx, CORBA_Environment * ev);
> +
> +
> +static void
>  ac_query_run (impl_POA_OAF_ActivationContext * servant,
>  	      CORBA_char * requirements,
>  	      GNOME_stringlist * selection_order,
> @@ -286,9 +313,11 @@
>  	(gpointer) &impl_OAF_ActivationContext_add_directory,
>  	(gpointer) &impl_OAF_ActivationContext_remove_directory,
>  	(gpointer) &impl_OAF_ActivationContext_activate,
> +        (gpointer) &impl_OAF_ActivationContext_activate_async,
>  	(gpointer) &impl_OAF_ActivationContext__get_servers,
>  	(gpointer) &impl_OAF_ActivationContext_query,
> -	(gpointer) &impl_OAF_ActivationContext_activate_from_id
> +	(gpointer) &impl_OAF_ActivationContext_activate_from_id,
> +        (gpointer) &impl_OAF_ActivationContext_activate_from_id_async
>  };
>  
>  /*** vepv structures ***/
> @@ -584,7 +613,76 @@
>  	return retval;
>  }
>  
> +
>  static void
> +impl_OAF_ActivationContext_activate_async(impl_POA_OAF_ActivationContext *
> +					  servant, CORBA_char * requirements,
> +					  GNOME_stringlist * selection_order,
> +					  OAF_ActivationFlags flags,
> +					  OAF_ActivationCallback callback_object, 
> +                                          CORBA_Context ctx,
> +					  CORBA_Environment * ev)
> +{
> +	OAF_ActivationResult *retval = NULL;
> +	OAF_ServerInfo **items, *curitem;
> +	int i;
> +	char *hostname;
> +
> +	hostname = ac_CORBA_Context_get_value (ctx, "hostname", ev);
> +	ac_update_lists (servant, ev);
> +
> +	servant->refs++;
> +
> +	items = oaf_alloca (servant->total_servers *
> +			    sizeof (OAF_ServerInfo *));
> +	ac_query_run (servant, requirements, selection_order, ctx, items, ev);
> +
> +	if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                g_free (hostname);
> +                servant->refs--;
> +                
> +                message = g_strconcat(_("Query failed: "), CORBA_exception_id (ev), NULL);
> +                OAF_ActivationCallback_report_activation_failed (callback_object,
> +                                                                 message, ev);
> +                g_free (message);
> +                return;
> +        }
> +
> +	retval = OAF_ActivationResult__alloc ();
> +	retval->res._d = OAF_RESULT_NONE;
> +
> +	for (i = 0; (retval->res._d == OAF_RESULT_NONE) && items[i]
> +	     && (i < servant->total_servers); i++) {
> +		curitem = items[i];
> +
> +		ac_do_activation (servant, curitem, retval, flags, hostname,
> +				  ctx, ev);
> +	}
> +
> +	if (retval->res._d == OAF_RESULT_NONE)
> +		retval->aid = CORBA_string_dup ("");
> +
> +
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                g_free (hostname);
> +                CORBA_free (retval);
> +                servant->refs--;
> +                
> +                message = g_strconcat(_("Activation failed: "), CORBA_exception_id (ev), NULL);
> +                OAF_ActivationCallback_report_activation_failed (callback_object,
> +                                                                 message, ev);
> +                g_free (message);
> +                return;
> +        }
> +
> +        /* return the correct value back to the client */
> +        OAF_ActivationCallback_report_activation_succeeded (callback_object, retval, ev);
> +}
> +
> +
> +static void
>  ac_update_lists (impl_POA_OAF_ActivationContext * servant,
>  		 CORBA_Environment * ev)
>  {
> @@ -831,34 +929,18 @@
>  	return retval;
>  }
>  
> -static OAF_ActivationResult *
> -impl_OAF_ActivationContext_activate_from_id (impl_POA_OAF_ActivationContext *
> -					     servant, OAF_ActivationID aid,
> -					     OAF_ActivationFlags flags,
> -					     CORBA_Context ctx,
> -					     CORBA_Environment * ev)
> +char *
> +ac_aid_to_query_string (OAF_ActivationID aid)
>  {
> -	OAF_ActivationResult *retval;
> -	OAFActivationInfo *ainfo;
> -	char *context_username;
> -	char *context_hostname;
> -	char *context_domain;
>          char *tmp_aid;
>          char *requirements;
>          char *iid_requirement;
>          char *username_requirement;
>          char *hostname_requirement;
>          char *domain_requirement;
> -        char *sort_criteria[4];
> -        GNOME_stringlist selection_order;
> -
> -	ac_update_lists (servant, ev);
> -
> -	servant->refs++;
> -
> -	retval = OAF_ActivationResult__alloc ();
> -	retval->res._d = OAF_RESULT_NONE;
> +	OAFActivationInfo *ainfo;
>  
> +        /* FIXME: this is completely broken. we activate by AID, not IID. */
>          if (strncmp ("OAFIID:", aid, 7) == 0) {
>                  tmp_aid = g_strconcat ("OAFAID:[", aid, "]", NULL);
>                  ainfo = oaf_actid_parse (tmp_aid);
> @@ -867,8 +949,8 @@
>                  ainfo = oaf_actid_parse (aid);
>          }
>  
> -	if (!ainfo) {
> -                goto out;
> +	if (ainfo == NULL) {
> +                return NULL;
>  	}
>  
>          iid_requirement = g_strconcat ("iid == \'", ainfo->iid, "\' ", NULL);
> @@ -898,18 +980,27 @@
>          g_free (username_requirement);
>          g_free (hostname_requirement);
>          g_free (domain_requirement);
> +        oaf_actinfo_free (ainfo);
> +
> +        return requirements;
> +}
> +
> +void
> +ac_context_to_string_array (CORBA_Context context, char **sort_criteria, CORBA_Environment *ev)
> +{
> +	char *context_username;
> +	char *context_hostname;
> +	char *context_domain;
>  
>          /* FIXME bugzilla.eazel.com 2730: either I am doing something
>           * really wrong here or CORBA_Context is broken in ORBit 
>           */
>  
> -        context_username = ac_CORBA_Context_get_value (ctx, "username", ev);
> -        context_hostname = ac_CORBA_Context_get_value (ctx, "hostname", ev);
> -        context_domain = ac_CORBA_Context_get_value (ctx, "domain", ev);
> -
> -	if (ev->_major != CORBA_NO_EXCEPTION)
> -        {
> -                goto out;
> +        context_username = ac_CORBA_Context_get_value (context, "username", ev);
> +        context_hostname = ac_CORBA_Context_get_value (context, "hostname", ev);
> +        context_domain = ac_CORBA_Context_get_value (context, "domain", ev);
> +	if (ev->_major != CORBA_NO_EXCEPTION) {
> +                return;
>          }
>          
>          sort_criteria[0] = g_strconcat ("username == \'", context_username, "\'", NULL);
> @@ -920,91 +1011,128 @@
>          g_free (context_username);
>          g_free (context_hostname);
>          g_free (context_domain);
> +}
> +
> +
> +
> +
> +static OAF_ActivationResult *
> +impl_OAF_ActivationContext_activate_from_id (impl_POA_OAF_ActivationContext *
> +					     servant, OAF_ActivationID aid,
> +					     OAF_ActivationFlags flags,
> +					     CORBA_Context ctx,
> +					     CORBA_Environment * ev)
> +{
> +	OAF_ActivationResult *retval;
> +        char *requirements;
> +        char *sort_criteria[4];
> +        GNOME_stringlist selection_order;
> +
> +	ac_update_lists (servant, ev);
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                return CORBA_OBJECT_NIL;
> +        }
> +
> +
> +	servant->refs++;
> +
> +        requirements = ac_aid_to_query_string (aid);
> +        if (requirements == NULL) {
> +                servant->refs--;
> +                return CORBA_OBJECT_NIL;
> +        }
> +
> +        ac_context_to_string_array (ctx, sort_criteria, ev);
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                servant->refs--;
> +                return CORBA_OBJECT_NIL;
> +        }
>  
>          selection_order._length = 3;
>          selection_order._buffer = sort_criteria;
>          CORBA_sequence_set_release (&selection_order, CORBA_FALSE);
> -        
> -        retval =
> -                impl_OAF_ActivationContext_activate (servant,
> -                                                     requirements,
> -                                                     &selection_order,
> -                                                     flags,
> -                                                     ctx, ev);
>  
> +        retval = impl_OAF_ActivationContext_activate (servant,
> +                                                      requirements,
> +                                                      &selection_order,
> +                                                      flags,
> +                                                      ctx, ev);        
>          g_free (sort_criteria[0]);
>          g_free (sort_criteria[1]);
>          g_free (sort_criteria[2]);
> -
> -        goto out;
>  
> -#if 0
> +        servant->refs--;
>  
> -	for (cur = servant->dirs; cur && !child; cur = cur->next) {
> -		ChildODInfo *curchild;
> +        return retval;
> +}
>  
> -		curchild = cur->data;
>  
> -		if (ainfo->user
> -		    && (!curchild->username
> -			|| strcmp (ainfo->user,
> -				   curchild->username))) continue;
> -		if (ainfo->host
> -		    && (!curchild->hostname
> -			|| strcmp (ainfo->host,
> -				   curchild->hostname))) continue;
> -		if (ainfo->domain
> -		    && (!curchild->domain
> -			|| strcmp (ainfo->domain,
> -				   curchild->domain))) continue;
> -		child = curchild;
> -	}
> +static void
> +impl_OAF_ActivationContext_activate_from_id_async
> +                (impl_POA_OAF_ActivationContext * servant, 
> +                 OAF_ActivationID aid,
> +                 OAF_ActivationFlags flags, 
> +                 OAF_ActivationCallback callback_object,
> +                 CORBA_Context ctx, 
> +                 CORBA_Environment * ev)
> +{
> +	OAF_ActivationResult *retval;
> +        char *requirements;
> +        char *sort_criteria[4];
> +        GNOME_stringlist selection_order;
>  
> -	if (!child)
> -        {
> -                CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
> -                                     ex_OAF_ActivationContext_IncompleteContext,
> -                                     NULL);
> -		goto out;	/* FIXME bugzilla.eazel.com 2731: in future, add hook to allow starting a new OD on demand */
> -        }
> +	ac_update_lists (servant, ev);
>  
> +	servant->refs++;
>  
> +        requirements = ac_aid_to_query_string (aid);
> +        if (requirements == NULL) {
> +                servant->refs--;
> +                OAF_ActivationCallback_report_activation_failed (callback_object,
> +                                                                 _("Could not parse AID"), ev);
> +                return;
> +        }
>  
> -	if (!si)
> -		goto out;
>  
> -	hostname = ac_CORBA_Context_get_value (ctx, "hostname", ev);
> -	if (ev->_major != CORBA_NO_EXCEPTION)
> -        {
> -                CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
> -                                     ex_OAF_ActivationContext_IncompleteContext,
> -                                     NULL);
> -		goto out;
> +        ac_context_to_string_array (ctx, sort_criteria, ev);
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                servant->refs--;
> +                message = g_strconcat (_("Could not parse context: "), CORBA_exception_id (ev), NULL);
> +                OAF_ActivationCallback_report_activation_failed (callback_object,
> +                                                                 message, ev);
> +                g_free (message);
> +                return;
>          }
>  
> -	ac_do_activation (servant, si, retval, flags, hostname, ctx, ev);
> +        selection_order._length = 3;
> +        selection_order._buffer = sort_criteria;
> +        CORBA_sequence_set_release (&selection_order, CORBA_FALSE);
>  
> -	g_free (hostname);
> -#endif
> +        retval = impl_OAF_ActivationContext_activate (servant,
> +                                                      requirements,
> +                                                      &selection_order,
> +                                                      flags,
> +                                                      ctx, ev);
> +        g_free (sort_criteria[0]);
> +        g_free (sort_criteria[1]);
> +        g_free (sort_criteria[2]);
>  
> -      out:
> -	servant->refs--;
> -	if (ainfo) {
> -		oaf_actinfo_free (ainfo);
> -	}
> +        if (ev->_major != CORBA_NO_EXCEPTION) {
> +                char *message;
> +                servant->refs--;
> +                message = g_strconcat (_("Could not activate server: "), CORBA_exception_id (ev), NULL);
> +                OAF_ActivationCallback_report_activation_failed (callback_object,
> +                                                                 message, ev);
> +                g_free (message);
> +                return;
> +        }
>  
> -	if (ev->_major == CORBA_NO_EXCEPTION) {
> -		if (retval->res._d == OAF_RESULT_NONE)
> -			retval->aid = CORBA_string_dup ("");
> -	} else {
> -		CORBA_free (retval);
> -		retval = NULL;
> -	}
> +        servant->refs--;
>  
> -	return retval;
> +        OAF_ActivationCallback_report_activation_succeeded (callback_object,
> +                                                            retval, ev);
>  }
> -
> -
>  
>  
>  
> Index: po/da.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/da.po,v
> retrieving revision 1.5
> diff -u -r1.5 da.po
> --- po/da.po	2000/09/28 16:09:18	1.5
> +++ po/da.po	2000/10/05 08:45:18
> @@ -6,7 +6,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf 0.2\n"
> -"POT-Creation-Date: 2000-08-02 01:24+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-27 01:28+0200\n"
>  "Last-Translator: Keld Simonsen <keld dkuug dk>\n"
>  "Language-Team: Danish <dansk klid dk>\n"
> @@ -34,29 +34,49 @@
>  msgid "Prevent registering of server with OAF"
>  msgstr "Forhindr registrering af tjener hos OAF"
>  
> -#: liboaf/oaf-registration.c:324
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Kunne ikke starte en ny proces"
>  
> -#: liboaf/oaf-registration.c:345
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Barn modtog signal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:351
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Ukendt \"non-exit\" fejl (status er %u)"
>  
> -#: liboaf/oaf-registration.c:427
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec fejlede: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:447
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Kunne ikke finde hvilket barn, tjeneren var opført hos"
>  
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
>  #: oafd/main.c:57
>  msgid "Directory to read .oafinfo files from"
>  msgstr "Katalog til indlæsning af .oafinfo filer"
> @@ -94,31 +114,31 @@
>  msgstr ""
>  "Vi kan endnu ikke behandle aktivering af shlib objekter i en fjernproces"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Egenskab '%s' har ingen værdi"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "en NUL iid er ugyldig"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s har en NUL type"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s har et NUL sted"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "Ugyldigt tegn '%c' i iid '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Prøver katalog %s\n"
> Index: po/de.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/de.po,v
> retrieving revision 1.6
> diff -u -r1.6 de.po
> --- po/de.po	2000/09/28 14:28:46	1.6
> +++ po/de.po	2000/10/05 08:45:18
> @@ -6,7 +6,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: OAF 0.4.0 (cvs)\n"
> -"POT-Creation-Date: 2000-09-28 16:26+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-26 18:26+0200\n"
>  "Last-Translator: Christian Meyer <linux chrisime de>\n"
>  "Language-Team: deutsch <gnome-de gnome org>\n"
> @@ -34,29 +34,49 @@
>  msgid "Prevent registering of server with OAF"
>  msgstr "Registrieren von Servern mit OAF vermeiden"
>  
> -#: liboaf/oaf-registration.c:324
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Neuer Prozess konnte nicht aufgeteilt werden"
>  
> -#: liboaf/oaf-registration.c:345
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Kindprozess erhielt Signal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:351
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Unbekannter non-exit Fehler (Status ist %u)"
>  
> -#: liboaf/oaf-registration.c:427
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Ausführen gescheitert: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:447
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Keine Informationen, in welchem Kindprozess der Server gelistet war"
>  
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
>  #: oafd/main.c:57
>  msgid "Directory to read .oafinfo files from"
>  msgstr "Verzeichnis, in dem die .oafinfo-Datei gelesen werden soll"
> @@ -94,31 +114,31 @@
>  msgstr ""
>  "Es können noch keine shlib-Objekte in einem fernen Prozess aktiviert werden"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Attribut '%s' hat keinen Wert"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "eine NULL iid ist nicht gültig"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s hat einen NULL Typ"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s hat einen NULL Ort"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "ungültige Zeichen '%c' in iid '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Verzeichnis %s wird versucht\n"
> Index: po/es.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/es.po,v
> retrieving revision 1.2
> diff -u -r1.2 es.po
> --- po/es.po	2000/08/25 15:17:28	1.2
> +++ po/es.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf\n"
> -"POT-Creation-Date: 2000-08-13 19:00+0100\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-13 19:00+0100\n"
>  "Last-Translator: Diego Sevilla <dsevilla um es>\n"
>  "Language-Team: Spanish <es li org>\n"
> @@ -13,125 +13,202 @@
>  "Content-Type: text/plain; charset=iso-8859-1\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:64
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "No se pudo guardar el fichero de configuración de OAF.\n"
> -
> -#: utils/oaf-sysconf.c:65
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"Por favor, asegúrese de que tiene permiso de escritura en el fichero de configuración de OAF.\n"
> -
> -#: utils/oaf-sysconf.c:68
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "Fichero de configuración de OAF guardado.\n"
> -
> -#: utils/oaf-sysconf.c:80
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"El fichero de configuración de OAF es:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:107
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s ya está en el fichero de configuración de OAF\n"
> -
> -#: utils/oaf-sysconf.c:183
> -msgid "OAF configuration file contains:\n"
> -msgstr "El fichero de configuración de OAF contiene:\n"
> -
> -#: utils/oaf-sysconf.c:215
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "Directorio a eliminar del fichero de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:215 utils/oaf-sysconf.c:218
> -msgid "directory path"
> -msgstr "directorio"
> -
> -#: utils/oaf-sysconf.c:218
> -msgid "Directory to add to OAF configuration file"
> -msgstr "Directorio a añadir al fichero de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:221
> -msgid "Display directories in OAF configuration file"
> -msgstr "Mostrar los directorios del fichero de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:224
> -msgid "Display path to OAF configuration file"
> -msgstr "Mostrar el directorio en el que se encuentra el fichero de configuración de OAF"
> -
> -#: liboaf/oaf-mainloop.c:178
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Directorio de objetos utilizado al registrar los servidores"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "Descriptor de fichero en el que escribir el IOR"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:182
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID a activar"
>  
> -#: liboaf/oaf-mainloop.c:184
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "Evitar el registro de un servidor en el OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "No puedo iniciar (fork) un nuevo proceso"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "El proceso hijo recibió la señal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Error de salida desconocido (el estado es %u)"
>  
>  #  liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec falló: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "No se ha podido determinar qué proceso hijo contiene al servidor"
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "Directorio a añadir al fichero de configuración de OAF"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "Descriptor de fichero en el que escribir el IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
> -msgstr "OAF no supporta todavía la activación de objetos basados en librerías dináminas en un proceso remoto"
> +msgstr ""
> +"OAF no supporta todavía la activación de objetos basados en librerías "
> +"dináminas en un proceso remoto"
>  
> -#: oafd/od-load.c:116 oafd/od-load.c:146
> -#, c-format
> -msgid "Attribute '%s' has no value"
> +#: oafd/od-load.c:122 oafd/od-load.c:152
> +#, fuzzy, c-format
> +msgid "Property '%s' has no value"
>  msgstr "Al atributo '%s' no se le ha dado un valor"
> +
> +#: oafd/od-load.c:172
> +msgid "a NULL iid is not valid"
> +msgstr ""
>  
> -#: oafd/od-load.c:204
> +#: oafd/od-load.c:175
>  #, c-format
> -msgid "Trying dir %s\n"
> -msgstr "Probando el directorio %s\n"
> +msgid "iid %s has a NULL type"
> +msgstr ""
>  
> -#: oafd/od-load.c:250
> +#: oafd/od-load.c:178
>  #, c-format
> -msgid "IID '%s' contains illegal characters; discarding\n"
> -msgstr "El IID '%s' contiene caracteres ilegales; ignorado\n"
> +msgid "iid %s has a NULL location"
> +msgstr ""
> +
> +#: oafd/od-load.c:186
> +#, c-format
> +msgid "invalid character '%c' in iid '%s'"
> +msgstr ""
>  
> -#: oafd/od-utils.c:44
> +#: oafd/od-load.c:219
>  #, c-format
> +msgid "Trying dir %s\n"
> +msgstr "Probando el directorio %s\n"
> +
> +#: oafd/od-utils.c:45
> +#, c-format
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
>  msgstr ""
>  "El fichero de configuración de OAF no se leyó satisfactoriamente. Por favor, "
>  "compruebe (en %s) que es válido"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "No se pudo guardar el fichero de configuración de OAF.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +"Por favor, asegúrese de que tiene permiso de escritura en el fichero de "
> +"configuración de OAF.\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "Fichero de configuración de OAF guardado.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"El fichero de configuración de OAF es:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s ya está en el fichero de configuración de OAF\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "El fichero de configuración de OAF contiene:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "Directorio a eliminar del fichero de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "directorio"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "Directorio a añadir al fichero de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "Mostrar los directorios del fichero de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr ""
> +"Mostrar el directorio en el que se encuentra el fichero de configuración de "
> +"OAF"
> +
> +#~ msgid "IID '%s' contains illegal characters; discarding\n"
> +#~ msgstr "El IID '%s' contiene caracteres ilegales; ignorado\n"
> Index: po/fr.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/fr.po,v
> retrieving revision 1.3
> diff -u -r1.3 fr.po
> --- po/fr.po	2000/09/25 09:14:21	1.3
> +++ po/fr.po	2000/10/05 08:45:19
> @@ -7,7 +7,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf 0.5.1\n"
> -"POT-Creation-Date: 2000-09-25 11:09+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-25 11:15+0200\n"
>  "Last-Translator: Christophe Merlet (RedFox) <christophe merlet net>\n"
>  "Language-Team: GNOME French Team <gnomefr gnomefr traduc org>\n"
> @@ -35,30 +35,50 @@
>  msgid "Prevent registering of server with OAF"
>  msgstr "Empèche le serveur de s'enregistrer avec OAF"
>  
> -#: liboaf/oaf-registration.c:324
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "OAF n'a pas pu cloner un nouveau processus"
>  
> -#: liboaf/oaf-registration.c:345
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Le processus fils a reçu le signal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:351
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Erreur inconnue (l'état est %u)"
>  
>  #  liboaf/oaf-registration.c:394
> -#: liboaf/oaf-registration.c:427
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec a échoué : %d (%s)\n"
>  
> -#: oafd/ac-corba.c:447
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "OAF n'a pu trouver dans quel fils le serveur est enregistré"
>  
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
>  #: oafd/main.c:57
>  msgid "Directory to read .oafinfo files from"
>  msgstr "Répertoire dans lequel lire les fichiers .oafinfo"
> @@ -98,31 +118,31 @@
>  "OAF ne supporte pas l'activation de bibliothèques partagées dans un "
>  "processus distant"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "La propriété '%s' n'a pas de valeur"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "un IID NULL n'est pas valide"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "l'IID %s a un type NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "l'IID %s a une location NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "caractère '%c' invalide dans l'IID '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Essaie le répertoire %s\n"
> Index: po/ga.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/ga.po,v
> retrieving revision 1.1
> diff -u -r1.1 ga.po
> --- po/ga.po	2000/09/26 19:41:07	1.1
> +++ po/ga.po	2000/10/05 08:45:19
> @@ -4,7 +4,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf CVS\n"
> -"POT-Creation-Date: 2000-08-24 20:39+0100\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-24 20:00-0000\n"
>  "Last-Translator: Alastair McKinstry <mckinstry computer org>\n"
>  "Language-Team: Irish <ga li org>\n"
> @@ -12,127 +12,130 @@
>  "Content-Type: text/plain; charset=ISO_8859-1\n"
>  "Content-Transfer-Encoding: 8-bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> +#: liboaf/oaf-mainloop.c:188
> +msgid "Object directory to use when registering servers"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> +#: liboaf/oaf-mainloop.c:190
> +msgid "File descriptor to print IOR on"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
> +msgid "FD"
> +msgstr "FD"
> +
> +#: liboaf/oaf-mainloop.c:192
> +msgid "IID to activate"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> +#: liboaf/oaf-mainloop.c:194
> +msgid "Prevent registering of server with OAF"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> +#: liboaf/oaf-registration.c:323
> +msgid "Couldn't fork a new process"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> +#: liboaf/oaf-registration.c:344
> +#, c-format
> +msgid "Child received signal %u (%s)"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> +#: liboaf/oaf-registration.c:350
> +#, c-format
> +msgid "Unknown non-exit error (status is %u)"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> +#: liboaf/oaf-registration.c:426
> +#, c-format
> +msgid "Exec failed: %d (%s)\n"
> +msgstr "Teip ar 'Exec': %d (%s)\n"
> +
> +#: oafd/ac-corba.c:476
> +msgid "Couldn't find which child the server was listed in"
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
>  msgstr ""
>  
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
>  msgstr ""
>  
> -#: liboaf/oaf-mainloop.c:186
> -msgid "Object directory to use when registering servers"
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
>  msgstr ""
>  
> -#: liboaf/oaf-mainloop.c:188
> -msgid "File descriptor to print IOR on"
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
>  msgstr ""
>  
> -#: liboaf/oaf-mainloop.c:188
> -msgid "FD"
> -msgstr "FD"
> +#: oafd/main.c:57
> +msgid "Directory to read .oafinfo files from"
> +msgstr ""
>  
> -#: liboaf/oaf-mainloop.c:190
> -msgid "IID to activate"
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
>  msgstr ""
>  
> -#: liboaf/oaf-mainloop.c:192
> -msgid "Prevent registering of server with OAF"
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:299
> -msgid "Couldn't fork a new process"
> +#: oafd/main.c:59
> +msgid "DOMAIN"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:317
> -#, c-format
> -msgid "Child received signal %u (%s)"
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:323
> -#, c-format
> -msgid "Unknown non-exit error (status is %u)"
> +#: oafd/main.c:67
> +msgid "File descriptor to write IOR to"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:394
> -#, c-format
> -msgid "Exec failed: %d (%s)\n"
> -msgstr "Teip ar 'Exec': %d (%s)\n"
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
>  
> -#: oafd/ac-corba.c:433
> -msgid "Couldn't find which child the server was listed in"
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
>  msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr ""
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr ""
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr ""
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr ""
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr ""
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr ""
> @@ -142,4 +145,53 @@
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
>  msgstr ""
> Index: po/gl.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/gl.po,v
> retrieving revision 1.1
> diff -u -r1.1 gl.po
> --- po/gl.po	2000/09/15 08:47:07	1.1
> +++ po/gl.po	2000/10/05 08:45:19
> @@ -10,7 +10,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf\n"
> -"POT-Creation-Date: 2000-08-28 01:30+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-15 10:42+0200\n"
>  "Last-Translator: Jesús Bravo Álvarez <jba pobox com>\n"
>  "Language-Team: Galician <trasno ceu fi udc es>\n"
> @@ -18,133 +18,134 @@
>  "Content-Type: text/plain; charset=iso-8859-1\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "Non foi posible garda-lo ficheiro de configuración de OAF.\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"Asegúrese de que ten permisos para escribi-lo ficheiro de configuración de "
> -"OAF.\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "Ficheiro de configuración de OAF escrito correctamente.\n"
> -
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"O ficheiro de configuración de OAF é:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s xa está no ficheiro de configuración de OAF\n"
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "O ficheiro de configuración de OAF contén:\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "Directorio para eliminar do ficheiro de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr "camiño do directorio"
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr "Directorio para engadir ó ficheiro de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr "Amosa-los directorios do ficheiro de configuración de OAF"
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr "Amosa-lo camiño ó ficheiro de configuración de OAF"
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Directorio de obxectos que se usará ó rexistra-los servidores"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "Descriptor de ficheiro no que escribi-lo IOR"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "DF"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID a activar"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "Evita-lo rexistro do servidor con OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Non foi posible crear (fork) un novo proceso fillo"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "O fillo recibiu o sinal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Erro non de saída descoñecido (o estado é %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "A execución fallou: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr ""
>  "Non foi posible determinar en que proceso fillo estaba listado o servidor"
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "Directorio para engadir ó ficheiro de configuración de OAF"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "Descriptor de ficheiro no que escribi-lo IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  "Aínda non está soportada a activación de obxectos shlib nun proceso remoto"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "A propiedade '%s' non ten valor"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "un iid NULO non é válido"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "o iid %s ten un tipo NULO"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "o iid %s ten unha localización NULA"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "carácter '%c' non válido no iid '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Tentando o directorio %s\n"
> @@ -157,3 +158,56 @@
>  msgstr ""
>  "O ficheiro de configuración de OAF non se leu correctamente. Verifique que é "
>  "válido en: %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "Non foi posible garda-lo ficheiro de configuración de OAF.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +"Asegúrese de que ten permisos para escribi-lo ficheiro de configuración de "
> +"OAF.\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "Ficheiro de configuración de OAF escrito correctamente.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"O ficheiro de configuración de OAF é:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s xa está no ficheiro de configuración de OAF\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "O ficheiro de configuración de OAF contén:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "Directorio para eliminar do ficheiro de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "camiño do directorio"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "Directorio para engadir ó ficheiro de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "Amosa-los directorios do ficheiro de configuración de OAF"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "Amosa-lo camiño ó ficheiro de configuración de OAF"
> Index: po/it.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/it.po,v
> retrieving revision 1.1
> diff -u -r1.1 it.po
> --- po/it.po	2000/08/24 18:43:18	1.1
> +++ po/it.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf 0.5.1\n"
> -"POT-Creation-Date: 2000-08-24 12:42-0600\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-24 12:42-06:00\n"
>  "Last-Translator: Pier Luigi Fiorini <plfiorini users sourceforge net>\n"
>  "Language-Team: Italiano <it li org>\n"
> @@ -13,132 +13,133 @@
>  "Content-Type: text/plain; charset=iso-8859-1\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "Impossibile salvare il file di configurazione di OAF.\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"Accertarsi di avere i permessi per scrivere il file di configurazione di "
> -"OAF.\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "Il file di configurazione di OAF è stato scritto con successo.\n"
> -
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"Il file di configurazione di OAF è:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s è già nel file di configurazione di OAF\n"
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "Il file di configurazione di OAF contiene:\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "Directory da rimuovere dal file di configurazione di OAF"
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr "percorso directory"
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr "Directory da aggiungere al file di configurazione di OAF"
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr "Mostra le directory nel file di configurazione di OAF"
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr "Mostra il percorso del file di configurazione di OAF"
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Object directory da usare per la registrazione dei server"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "Descrittore del file su cui stampare lo IOR"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID da attivare"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "Impedisci la registrazione del server con OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Impossibile eseguire il fork di un nuovo processo"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Il processo figlio ha ricevuto il segnale %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Errore non di uscita sconosciuto (lo stato è %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Esecuzione fallita: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Impossibile trovare in quale processo figlio era elencato il server"
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "Directory da aggiungere al file di configurazione di OAF"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "Descrittore del file su cui stampare lo IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  "L'attivazione degli shlib objects in un processo remoto non è ancora gestita"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "La proprietà '%s' non ha un valore"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "un iid NULL non è valido"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s ha un tipo NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s ha un percorso NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "carattere '%c' non valido nel iid '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Sto provando la directory %s\n"
> @@ -151,3 +152,56 @@
>  msgstr ""
>  "Il file di configurazione di OAF non è stato letto correttamente. Verificare "
>  "che sia valido: %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "Impossibile salvare il file di configurazione di OAF.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +"Accertarsi di avere i permessi per scrivere il file di configurazione di "
> +"OAF.\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "Il file di configurazione di OAF è stato scritto con successo.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"Il file di configurazione di OAF è:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s è già nel file di configurazione di OAF\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "Il file di configurazione di OAF contiene:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "Directory da rimuovere dal file di configurazione di OAF"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "percorso directory"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "Directory da aggiungere al file di configurazione di OAF"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "Mostra le directory nel file di configurazione di OAF"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "Mostra il percorso del file di configurazione di OAF"
> Index: po/ja.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/ja.po,v
> retrieving revision 1.1
> diff -u -r1.1 ja.po
> --- po/ja.po	2000/08/14 06:58:43	1.1
> +++ po/ja.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf 0.5.1\n"
> -"POT-Creation-Date: 2000-08-14 15:07+0900\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-14 15:50+09:00\n"
>  "Last-Translator: Takeshi Aihana <aihana muc biglobe ne jp>\n"
>  "Language-Team: Japanese <translation gnome gr jp>\n"
> @@ -13,130 +13,133 @@
>  "Content-Type: text/plain; charset=euc-jp\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£\n"
> -
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"OAF ÀßÄê¥Õ¥¡¥¤¥ë:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s ¤Ï OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£\n"
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ:\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤«¤éºï½ü¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê"
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹"
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ØÄɲ乤ë¥Ç¥£¥ì¥¯¥È¥ê"
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Îɽ¼¨"
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òɽ¼¨"
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "¥µ¡¼¥Ð¡¼ÅÐÏ¿»þ¤Ë»ÈÍѤ¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¥Ç¥£¥ì¥¯¥È¥ê"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "IOR ¤Î½ÐÎÏÀè¤Î¥Õ¥¡¥¤¥ë¥Ç¥£¥¹¥¯¥ê¥×¥¿"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID ¤Î³èÀ­²½"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "OAF ¤Ç¥µ¡¼¥Ð¡¼¤ÎÅÐÏ¿¤ò¶Ø»ß"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "¿·µ¬¥×¥í¥»¥¹¤ò fork ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "»Ò¥×¥í¥»¥¹¤¬¥·¥°¥Ê¥ë %u (%s) ¤ò¼õ¤±¼è¤ê¤Þ¤·¤¿¡£"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "ÉÔÌÀ¤Ê̤½ªÎ»¥¨¥é¡¼ (¾õÂÖ = %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "¼Â¹Ô¥¨¥é¡¼: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "¥µ¡¼¥Ð¡¼¤¬¤É¤Î»Ò¥×¥í¥»¥¹¤ÇÅÐÏ¿¤µ¤ì¤¿¤«Ê¬¤«¤ê¤Þ¤»¤ó¤Ç¤·¤¿¡£"
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ØÄɲ乤ë¥Ç¥£¥ì¥¯¥È¥ê"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "IOR ¤Î½ÐÎÏÀè¤Î¥Õ¥¡¥¤¥ë¥Ç¥£¥¹¥¯¥ê¥×¥¿"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  "¥ê¥â¡¼¥È¥×¥í¥»¥¹¤Î shlib ¥ª¥Ö¥¸¥§¥¯¥È¤Î³èÀ­²½¤Ï̤¤À¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "¥×¥í¥Ñ¥Æ¥£ %s ¤ÏÃͤò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó¡£"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "NULL ¤Î iid ¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s ¤Î·¿¤¬ NULL ¤Ç¤¹¡£"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s ¤Î¾ì½ê¤¬ NULL ¤Ç¤¹¡£"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "ÉÔÀµ¤Êʸ»ú '%c' ¤¬ iid '%s' ¤ÎÃæ¤Ë¤¢¤ê¤Þ¤¹¡£"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "¥Ç¥£¥ì¥¯¥È¥ê %s ¤ò»î¹ÔÃæ\n"
> @@ -149,3 +152,54 @@
>  msgstr ""
>  "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£\n"
>  "ÂÅÅö¤Ê¤â¤Î¤«³Îǧ¤·¤Æ²¼¤µ¤¤ : %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤òÊݸ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Ø¤Î½ñ¤­¹þ¤ß¸¢¸Â¤ò»ý¤Ã¤Æ¤¤¤ë¤«³Îǧ¤·¤Æ²¼¤µ¤¤¡£\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß¤ËÀ®¸ù¤·¤Þ¤·¤¿¡£\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"OAF ÀßÄê¥Õ¥¡¥¤¥ë:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s ¤Ï OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÃæ¤Ë´û¤Ë¸ºß¤·¤Æ¤¤¤Þ¤¹¡£\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÆâÍÆ:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤«¤éºï½ü¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Ñ¥¹"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤ØÄɲ乤ë¥Ç¥£¥ì¥¯¥È¥ê"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ëÃæ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Îɽ¼¨"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "OAF ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹¤òɽ¼¨"
> Index: po/ko.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/ko.po,v
> retrieving revision 1.1
> diff -u -r1.1 ko.po
> --- po/ko.po	2000/09/06 13:30:45	1.1
> +++ po/ko.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf-CVS20000906\n"
> -"POT-Creation-Date: 2000-09-06 20:49+0900\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-06 20:49+0900\n"
>  "Last-Translator: Chideok Hwang <hwang mizi co kr>\n"
>  "Language-Team: Korean <ko li org>\n"
> @@ -13,130 +13,132 @@
>  "Content-Type: text/plain; charset=euc-kr\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "OAF ¼³Á¤ ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö°¡ ¾ø½À´Ï´Ù.\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"OAF ¼³Á¤ ÆÄÀÏÀ» ¾µ ¼öÀÖ´Â ±ÇÇÑÀÌ ÀÖ´ÂÁö¸¦ ¸ÕÀú È®ÀÎÇØÁֽʽÿä.\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "OAF ¼³Á¤ÆÄÀÏÀ» ÀúÀåÇß½À´Ï´Ù.\n"
> -
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"OAF ¼³Á¤ ÆÄÀÏÀº ´ÙÀ½°ú °°½À´Ï´Ù:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%sÀº ÀÌ¹Ì OAF ¼³Á¤¿¡ ÀÖ½À´Ï´Ù.\n"
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "OAF ¼³Á¤ÆÄÀÏÀº ´ÙÀ½À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "OAF ¼³Á¤ ÆÄÀϷκÎÅÍ Á¦°ÅÇÒ µð·ºÅ丮"
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr "µð·ºÅ丮 °æ·Î"
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr "OAF ¼³Á¤ÆÄÀÏÀ» Ãß°¡ÇÒ µð·ºÅ丮"
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr "OAF ¼³Á¤ÆÄÀÏ¿¡ ÀÖ´Â µð·ºÅ丮¸¦ º¸¿©ÁÖ±â"
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr "OAF ¼³Á¤ÆÄÀÏ¿¡´ëÇÑ °æ·Î¸¦ º¸¿©ÁÖ±â"
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "¼­¹öµéÀ» µî·ÏÇÒ¶§ »ç¿ëÇÒ Object µð·ºÅ丮"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "IORÀ» ÀμâÇÒ ÆÄÀÏ ÀνÄÀÚ"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "È°¼ºÈ­½Ãų IID"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "OAF¸¦ ÅëÇÑ ¼­¹öÀÇ µî·ÏÀ» ±ÝÁöÇÑ´Ù"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "»õ·Î¿î ÇÁ·Î¼¼½º¸¦ »ý¼ºÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "ÀÚ½ÄÀÌ %u (%s) ½Ã±×³¯À» ¹Þ¾Ò½À´Ï´Ù"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "¾Ë¼ö¾ø´Â non-exit ¿À·ù (»óÅ´ %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec°¡ ½ÇÆÐÇß½À´Ï´Ù: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "¼­¹ö°¡ ¿­°ÅµÇ¾îÀÖ´Â ÀÚ½Ä ÇÁ·Î¼¼½º¸¦ ¹ß°ßÇÒ ¼ö°¡ ¾ø½À´Ï´Ù"
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "OAF ¼³Á¤ÆÄÀÏÀ» Ãß°¡ÇÒ µð·ºÅ丮"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "IORÀ» ÀμâÇÒ ÆÄÀÏ ÀνÄÀÚ"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr "¾ÆÁ÷ º°µµÀÇ ÇÁ·Î¼¼½º¿¡ ÀÖ´Â shlib object¸¦ È°¼ºÈ­ ½Ãų¼ö´Â ¾ø½À´Ï´Ù"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Property '%s'´Â °ªÀÌ ÁöÁ¤µÇÁö¾Ê¾Ò½À´Ï´Ù"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "NULL iid´Â ÀûÇÕÇÏÁö¾Ê½À´Ï´Ù"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s°¡ NULL ŸÀÔÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s°¡ NULL locationÀ» °¡Áö°í ÀÖ½À´Ï´Ù"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "ºÎÀûÀýÇÑ ¹®ÀÚ '%c'°¡ iid '%s'¿¡ ³¢¿©ÀÖ½À´Ï´Ù"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "%s µð·ºÅ丮¸¦ ½ÃµµÇÕ´Ï´Ù\n"
> @@ -147,6 +149,56 @@
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
>  msgstr ""
> -"OAF ¼³Á¤ ÆÄÀÏÀ» Á¦´ë·Î ÀÐÀ»¼ö°¡ ¾ø½À´Ï´Ù. ±×°ÍÀÌ %s¿¡ Á¸ÀçÇÏ´ÂÁö"
> -"È®ÀÎÇØ Áֽʽÿä"
> +"OAF ¼³Á¤ ÆÄÀÏÀ» Á¦´ë·Î ÀÐÀ»¼ö°¡ ¾ø½À´Ï´Ù. ±×°ÍÀÌ %s¿¡ Á¸ÀçÇÏ´ÂÁöÈ®ÀÎÇØ "
> +"Áֽʽÿä"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "OAF ¼³Á¤ ÆÄÀÏÀ» ÀúÀåÇÒ ¼ö°¡ ¾ø½À´Ï´Ù.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr "OAF ¼³Á¤ ÆÄÀÏÀ» ¾µ ¼öÀÖ´Â ±ÇÇÑÀÌ ÀÖ´ÂÁö¸¦ ¸ÕÀú È®ÀÎÇØÁֽʽÿä.\n"
>  
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "OAF ¼³Á¤ÆÄÀÏÀ» ÀúÀåÇß½À´Ï´Ù.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"OAF ¼³Á¤ ÆÄÀÏÀº ´ÙÀ½°ú °°½À´Ï´Ù:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%sÀº ÀÌ¹Ì OAF ¼³Á¤¿¡ ÀÖ½À´Ï´Ù.\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "OAF ¼³Á¤ÆÄÀÏÀº ´ÙÀ½À» Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "OAF ¼³Á¤ ÆÄÀϷκÎÅÍ Á¦°ÅÇÒ µð·ºÅ丮"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "µð·ºÅ丮 °æ·Î"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "OAF ¼³Á¤ÆÄÀÏÀ» Ãß°¡ÇÒ µð·ºÅ丮"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "OAF ¼³Á¤ÆÄÀÏ¿¡ ÀÖ´Â µð·ºÅ丮¸¦ º¸¿©ÁÖ±â"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "OAF ¼³Á¤ÆÄÀÏ¿¡´ëÇÑ °æ·Î¸¦ º¸¿©ÁÖ±â"
> Index: po/no.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/no.po,v
> retrieving revision 1.1
> diff -u -r1.1 no.po
> --- po/no.po	2000/08/01 22:25:28	1.1
> +++ po/no.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf 0.2\n"
> -"POT-Creation-Date: 2000-08-02 01:24+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-02 01:28+0200\n"
>  "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
>  "Language-Team: Norwegian <no li org>\n"
> @@ -13,120 +13,187 @@
>  "Content-Type: text/plain; charset=iso-8859-1\n"
>  "Content-Transfer-Encoding: 8-bit\n"
>  
> -#: utils/oaf-sysconf.c:64
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "Kunne ikke lagre OAF konfigurasjonsfil.\n"
> -
> -#: utils/oaf-sysconf.c:65
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:68
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:80
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:107
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:183
> -msgid "OAF configuration file contains:\n"
> -msgstr "OAF konfigurasjonsfil inneholder:\n"
> -
> -#: utils/oaf-sysconf.c:215
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "Katalog som skal fjernes fra OAF konfigurasjonsfil"
> -
> -#: utils/oaf-sysconf.c:215 utils/oaf-sysconf.c:218
> -msgid "directory path"
> -msgstr "katalogsti"
> -
> -#: utils/oaf-sysconf.c:218
> -msgid "Directory to add to OAF configuration file"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:221
> -msgid "Display directories in OAF configuration file"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:224
> -msgid "Display path to OAF configuration file"
> -msgstr "Vis sti til OAF konfigurasjonsfil"
> -
> -#: liboaf/oaf-mainloop.c:178
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Objektkatalog som skal brukes ved registrering av tjenere"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "Fildeskriptor som IOR skal skrives til"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:182
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID som skal aktiveres"
>  
> -#: liboaf/oaf-mainloop.c:184
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "Forhindre registrering av tjener hos OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Kunne ikke starte en ny prosess"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Barn mottok signal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Ukjent \"non-exit\" feil (status er %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec feilet: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr ""
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "Directory to read .oafinfo files from"
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "Fildeskriptor som IOR skal skrives til"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr ""
> +
> +#: oafd/od-load.c:172
> +msgid "a NULL iid is not valid"
> +msgstr ""
>  
> -#: oafd/od-load.c:206
> +#: oafd/od-load.c:175
>  #, c-format
> -msgid "Trying dir %s\n"
> +msgid "iid %s has a NULL type"
> +msgstr ""
> +
> +#: oafd/od-load.c:178
> +#, c-format
> +msgid "iid %s has a NULL location"
>  msgstr ""
>  
> -#: oafd/od-load.c:253
> +#: oafd/od-load.c:186
>  #, c-format
> -msgid "IID '%s' contains illegal characters; discarding\n"
> +msgid "invalid character '%c' in iid '%s'"
>  msgstr ""
>  
> -#: oafd/od-utils.c:44
> +#: oafd/od-load.c:219
>  #, c-format
> +msgid "Trying dir %s\n"
> +msgstr ""
> +
> +#: oafd/od-utils.c:45
> +#, c-format
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
>  msgstr ""
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "Kunne ikke lagre OAF konfigurasjonsfil.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "OAF konfigurasjonsfil inneholder:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "Katalog som skal fjernes fra OAF konfigurasjonsfil"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "katalogsti"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "Vis sti til OAF konfigurasjonsfil"
> Index: po/ru.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/ru.po,v
> retrieving revision 1.2
> diff -u -r1.2 ru.po
> --- po/ru.po	2000/08/09 13:13:53	1.2
> +++ po/ru.po	2000/10/05 08:45:19
> @@ -4,7 +4,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf\n"
> -"POT-Creation-Date: 2000-08-09 17:10+0000\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-09 17:12+00:00\n"
>  "Last-Translator: Valek Filippov <frob df ru>\n"
>  "Language-Team: Russian <ru li org>\n"
> @@ -12,83 +12,136 @@
>  "Content-Type: text/plain; charset=koi8-r\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: liboaf/oaf-mainloop.c:178
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "ëÁÔÁÌÏÇ ÏÂßÅËÔÁ ÉÓÐÏÌØÚÕÅÍÙÊ ÐÒÉ ÒÅÇÉÓÔÒÁÃÉÉ ÓÅÒ×ÅÒÏ×"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "äÅÓËÒÉÐÔÏÒ ÆÁÊÌÁ ÄÌÑ ÐÅÞÁÔÉ IOR"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "äæ"
>  
> -#: liboaf/oaf-mainloop.c:182
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID ÄÌÑ ÁËÔÉ×ÁÃÉÉ"
>  
> -#: liboaf/oaf-mainloop.c:184
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "ðÒÅÄÏÔ×ÒÁÔÉÔØ ÒÅÇÉÓÔÒÁÃÉÀ ÓÅÒ×ÅÒÁ Ó OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "îÅ ÕÄÁÌÏÓØ ÐÏÒÏÄÉÔØ ÎÏ×ÙÊ ÐÒÏÃÅÓÓ"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "ðÏÔÏÍÏË ÐÏÌÕÞÉÌ ÓÉÇÎÁÌ %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "óÂÏÊ ×ÙÐÏÌÎÅÎÉÑ: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr ""
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "Directory to read .oafinfo files from"
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "äÅÓËÒÉÐÔÏÒ ÆÁÊÌÁ ÄÌÑ ÐÅÞÁÔÉ IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "ó×ÏÊÓÔ×Ï \"%s\" ÎÅ ÉÍÅÅÔ ÚÎÁÞÅÎÉÑ"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "NULL iid ÎÅ Ñ×ÌÑÅÔÓÑ ÄÏÐÕÓÔÉÍÙÍ"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s ÉÍÅÅÔ ÔÉÐ NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s ÉÍÅÅÔ ÒÁÓÐÏÌÏÖÅÎÉÅ NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "ÎÅÄÏÐÕÓÔÉÍÙÊ ÓÉÍ×ÏÌ \"%c\" × iid \"%s\""
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "ðÒÏÂÁ ËÁÔÁÌÏÇÁ %s\n"
>  
> -#: oafd/od-utils.c:44
> +#: oafd/od-utils.c:45
>  #, c-format
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
> @@ -96,3 +149,52 @@
>  msgstr ""
>  "æÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ OAF ÎÅ ÂÙÌ ÕÓÐÅÛÎÏ ÐÒÏÞÔÅÎ. ðÏÖÁÌÕÊÓÔÁ, ÐÒÏ×ÅÒØÔÅ, ÞÔÏ ÏÎ "
>  "ÉÓÐÒÁ×ÅÎ × : %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr ""
> Index: po/sl.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/sl.po,v
> retrieving revision 1.2
> diff -u -r1.2 sl.po
> --- po/sl.po	2000/10/03 20:50:51	1.2
> +++ po/sl.po	2000/10/05 08:45:19
> @@ -1,4 +1,3 @@
> -
>  # Slovenian translation file for Balsa.
>  # Copyright (C) 2000 Free Software Foundation, Inc.
>  # Andraz Tori <andraz tori1 guest arnes si> 2000
> @@ -6,138 +5,140 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: balsa\n"
> -"POT-Creation-Date: 2000-09-04 21:51+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-04 21:51+0200\n"
>  "Last-Translator: Andraz Tori <andraz tori1 guest arnes si>\n"
>  "Language-Team: Slovenian <sl li org>\n"
>  "MIME-Version: 1.0\n"
>  "Content-Type: text/plain; charset=iso8859-2\n"
>  "Content-Transfer-Encoding: 8bit\n"
> -
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "Ne morem shraniti OAF nastavitvene datoteke.\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"Prosim preverite, da imate dovoljenja za pisanje v OAF nastavitveno datoteko.\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "Uspe¹no zapisal OAF nastavitveno datoteko.\n"
>  
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"OAF nastavitvena datoteka je:\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s je ¾e v OAF nastavitveni datoteki\n"
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "OAF nastavitvena datoteka vsebuje:\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "Imenik, ki naj se odstrani iz OAF nastavitvene datoteke"
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr "pot imenika"
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr "Imenik, ki naj se doda OAF nastavitveni datoteki"
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr "Poka¾i imenike v OAF nastavitveni datoteki"
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr "Poka¾i pot do OAF nastavitvene datoteke"
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Predmetni imenik, ki naj se uporabi ob registraciji stre¾nikov"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "Datoteèni deskriptor kamor naj se ispisuje IOR"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID, ki naj se aktivira"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "Prepreèi registracijo stre¾nika pri OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Nisem se mogel razvejiti novega procesa"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Otrok je dobil signal %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Neznana ne-izhodna napaka (status je %u)"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Exec neuspe¹en: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Nisem mogel ugotoviti v seznamu katerega otroka je bil stre¾nik"
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "Imenik, ki naj se doda OAF nastavitveni datoteki"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "Datoteèni deskriptor kamor naj se ispisuje IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr "Ne znamo ¹e aktivirati shlib predmetov v oddaljenem procesu"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Lastnost '%s' nima vrednosti"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "NULL iid ni veljaven"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s ima tip NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s ima lokacijo NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "napaèen znak '%c' v iid '%s'"
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Posku¹am imenik %s\n"
> @@ -148,5 +149,58 @@
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
>  msgstr ""
> -"The OAF nastavitvena datoteka ni bila uspe¹no prebrana. Prosim preverite "
> -"ali je veljavna v: %s"
> +"The OAF nastavitvena datoteka ni bila uspe¹no prebrana. Prosim preverite ali "
> +"je veljavna v: %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "Ne morem shraniti OAF nastavitvene datoteke.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +"Prosim preverite, da imate dovoljenja za pisanje v OAF nastavitveno "
> +"datoteko.\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "Uspe¹no zapisal OAF nastavitveno datoteko.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +"OAF nastavitvena datoteka je:\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s je ¾e v OAF nastavitveni datoteki\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "OAF nastavitvena datoteka vsebuje:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "Imenik, ki naj se odstrani iz OAF nastavitvene datoteke"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "pot imenika"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "Imenik, ki naj se doda OAF nastavitveni datoteki"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "Poka¾i imenike v OAF nastavitveni datoteki"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "Poka¾i pot do OAF nastavitvene datoteke"
> Index: po/sv.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/sv.po,v
> retrieving revision 1.2
> diff -u -r1.2 sv.po
> --- po/sv.po	2000/09/26 10:55:09	1.2
> +++ po/sv.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf\n"
> -"POT-Creation-Date: 2000-09-26 12:50+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-09-26 12:53+0200\n"
>  "Last-Translator: Christian Rose <menthos menthos com>\n"
>  "Language-Team: Swedish <sv li org>\n"
> @@ -33,29 +33,49 @@
>  msgid "Prevent registering of server with OAF"
>  msgstr "Förhindra registrering av server med OAF"
>  
> -#: liboaf/oaf-registration.c:324
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Kunde inte grena en ny process"
>  
> -#: liboaf/oaf-registration.c:345
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Barnet tog emot signalen %u (%s)"
>  
> -#: liboaf/oaf-registration.c:351
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Okänd icke-slutstatus (status är %u)"
>  
> -#: liboaf/oaf-registration.c:427
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Körning misslyckades: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:447
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Kunde inte hitta vilket barn som servern var angiven i"
>  
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
>  #: oafd/main.c:57
>  msgid "Directory to read .oafinfo files from"
>  msgstr "Katalog som .oaf-filer ska läsas ifrån"
> @@ -92,31 +112,31 @@
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr "Vi hanterar inte aktivering av shlib-objekt i en fjärrprocess än"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Egenskapen \"%s\" har inget värde"
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr "NULL är inget giltigt värde på en iid"
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid:n %s har typen NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid:n %s har platsen NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "felaktigt tecken \"%c\" i iid:n \"%s\""
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "Försöker med katalogen %s\n"
> Index: po/tr.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/tr.po,v
> retrieving revision 1.4
> diff -u -r1.4 tr.po
> --- po/tr.po	2000/08/06 17:49:48	1.4
> +++ po/tr.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: OAF 0.4\n"
> -"POT-Creation-Date: 2000-08-06 19:51+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-06 19:51+0200\n"
>  "Last-Translator: Fatih Demir <kabalak gmx net>\n"
>  "Language-Team: Turkish <tr li org>\n"
> @@ -13,126 +13,196 @@
>  "Content-Type: text/plain; charset=iso-8859-9\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:64
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "OAF ayar dosyasýný kaydedmedim .\n"
> -
> -#: utils/oaf-sysconf.c:65
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr ""
> -"OAF ayar dosyasýný yazmak için gerekli eriþim haklarýný sahip olduðunu "
> -"te'min et .\n"
> -
> -#: utils/oaf-sysconf.c:68
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "OAF ayar dosyasýný baþarýyla yazdým .\n"
> -
> -#: utils/oaf-sysconf.c:80
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -"OAF ayar dosyasý :\n"
> -"    %s\n"
> -
> -#: utils/oaf-sysconf.c:107
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr "%s zaten OAF dosyasýnda var\n"
> -
> -#: utils/oaf-sysconf.c:183
> -msgid "OAF configuration file contains:\n"
> -msgstr "OAF ayar dosyasý içeriði :\n"
> -
> -#: utils/oaf-sysconf.c:215
> -msgid "Directory to remove from OAF configuration file"
> -msgstr "OAF ayar dosyasýndan silinecek dizin"
> -
> -#: utils/oaf-sysconf.c:215 utils/oaf-sysconf.c:218
> -msgid "directory path"
> -msgstr "dizinleme"
> -
> -#: utils/oaf-sysconf.c:218
> -msgid "Directory to add to OAF configuration file"
> -msgstr "OAF ayar dosyasýna eklenecek dizin"
> -
> -#: utils/oaf-sysconf.c:221
> -msgid "Display directories in OAF configuration file"
> -msgstr "OAF ayar dosyasýndaki dizinleri göster"
> -
> -#: utils/oaf-sysconf.c:224
> -msgid "Display path to OAF configuration file"
> -msgstr "OAF ayar dosyasýnýn dizinlemesini göster"
> -
> -#: liboaf/oaf-mainloop.c:178
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "Sunucularý kaydederken kullanýlýnacak nesne dizini"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "IOR'u yazdýracak dosya ibaresi"
>  
> -#: liboaf/oaf-mainloop.c:180
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "FD"
>  
> -#: liboaf/oaf-mainloop.c:182
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "Çalýþtýrýlanacak IID"
>  
> -#: liboaf/oaf-mainloop.c:184
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "OAF'la sunucu kaydetmesine izin verme"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "Yeni bir iþlem çatallayamadým"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "Altiþlem sinyal %u'yu aldý ( %s )"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr "Bilinmeyen hata ( durum %u )"
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "Çalýþtýrma baþarýsýz oldu : %d ( %s )\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr "Sunucunun listelendiði altiþlemi bulamadým"
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +#, fuzzy
> +msgid "Directory to read .oafinfo files from"
> +msgstr "OAF ayar dosyasýna eklenecek dizin"
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "IOR'u yazdýracak dosya ibaresi"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr "Bölüþülebilinen nesneleri uzaktan iþletmeyi þimdilik desteklemiyoruz"
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr "Özellik '%s'nin deðeri yok"
> +
> +#: oafd/od-load.c:172
> +msgid "a NULL iid is not valid"
> +msgstr ""
>  
> -#: oafd/od-load.c:206
> +#: oafd/od-load.c:175
>  #, c-format
> -msgid "Trying dir %s\n"
> -msgstr "Dizin %s'yi deniyorum \n"
> +msgid "iid %s has a NULL type"
> +msgstr ""
> +
> +#: oafd/od-load.c:178
> +#, c-format
> +msgid "iid %s has a NULL location"
> +msgstr ""
> +
> +#: oafd/od-load.c:186
> +#, c-format
> +msgid "invalid character '%c' in iid '%s'"
> +msgstr ""
>  
> -#: oafd/od-load.c:253
> +#: oafd/od-load.c:219
>  #, c-format
> -msgid "IID '%s' contains illegal characters; discarding\n"
> -msgstr "IID '%s' geçersiz harfleri içeriyor : geçiyorum \n"
> +msgid "Trying dir %s\n"
> +msgstr "Dizin %s'yi deniyorum \n"
>  
> -#: oafd/od-utils.c:44
> +#: oafd/od-utils.c:45
>  #, c-format
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
> +msgstr ""
> +"OAF ayar dosyasý baþarýyla okunmadý. Lütfen, geçerli olmasýný te'min et :%s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "OAF ayar dosyasýný kaydedmedim .\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr ""
> +"OAF ayar dosyasýný yazmak için gerekli eriþim haklarýný sahip olduðunu "
> +"te'min et .\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "OAF ayar dosyasýný baþarýyla yazdým .\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
>  msgstr ""
> -"OAF ayar dosyasý baþarýyla okunmadý. Lütfen, geçerli olmasýný te'min et :"
> -"%s"
> +"OAF ayar dosyasý :\n"
> +"    %s\n"
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr "%s zaten OAF dosyasýnda var\n"
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "OAF ayar dosyasý içeriði :\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr "OAF ayar dosyasýndan silinecek dizin"
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr "dizinleme"
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr "OAF ayar dosyasýna eklenecek dizin"
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr "OAF ayar dosyasýndaki dizinleri göster"
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
> +msgstr "OAF ayar dosyasýnýn dizinlemesini göster"
> +
> +#~ msgid "IID '%s' contains illegal characters; discarding\n"
> +#~ msgstr "IID '%s' geçersiz harfleri içeriyor : geçiyorum \n"
> Index: po/uk.po
> ===================================================================
> RCS file: /cvs/gnome/oaf/po/uk.po,v
> retrieving revision 1.1
> diff -u -r1.1 uk.po
> --- po/uk.po	2000/08/16 15:18:49	1.1
> +++ po/uk.po	2000/10/05 08:45:19
> @@ -5,7 +5,7 @@
>  msgid ""
>  msgstr ""
>  "Project-Id-Version: oaf\n"
> -"POT-Creation-Date: 2000-08-16 17:57+0200\n"
> +"POT-Creation-Date: 2000-10-05 10:42+0200\n"
>  "PO-Revision-Date: 2000-08-16 18:00+0200\n"
>  "Last-Translator: Yuri Syrota <rasta renome rovno ua>\n"
>  "Language-Team: Ukrainian <linux linux org ua>\n"
> @@ -13,127 +13,131 @@
>  "Content-Type: text/plain; charset=koi8-u\n"
>  "Content-Transfer-Encoding: 8bit\n"
>  
> -#: utils/oaf-sysconf.c:65
> -msgid "Could not save OAF configuration file.\n"
> -msgstr "îÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÆÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF.\n"
> -
> -#: utils/oaf-sysconf.c:66
> -msgid ""
> -"Please, make sure you have permissions to write OAF configuration file.\n"
> -msgstr "ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ ×É ÍÁ¤ÔÅ ÐÒÁ×Ï ÎÁ ÚÁÐÉÓ ÆÁÊÌÕ ËÏÎƦ­ÕÒÁæ§ OAF.\n"
> -
> -#: utils/oaf-sysconf.c:69
> -msgid "Successfully wrote OAF configuration file.\n"
> -msgstr "æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ÕÓЦÛÎÏ ÚÂÅÒÅÖÅÎÏ.\n"
> -
> -#: utils/oaf-sysconf.c:81
> -#, c-format
> -msgid ""
> -"OAF configuration file is:\n"
> -"    %s\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:108
> -#, c-format
> -msgid "%s already in OAF configuration file\n"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:184
> -msgid "OAF configuration file contains:\n"
> -msgstr "æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ͦÓÔÉÔØ:\n"
> -
> -#: utils/oaf-sysconf.c:216
> -msgid "Directory to remove from OAF configuration file"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> -msgid "directory path"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:219
> -msgid "Directory to add to OAF configuration file"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:222
> -msgid "Display directories in OAF configuration file"
> -msgstr ""
> -
> -#: utils/oaf-sysconf.c:225
> -msgid "Display path to OAF configuration file"
> -msgstr ""
> -
> -#: liboaf/oaf-mainloop.c:186
> +#: liboaf/oaf-mainloop.c:188
>  msgid "Object directory to use when registering servers"
>  msgstr "ëÁÔÁÌÏÇ ÏÂ'¤ËÔÁ, ÝÏ ×ÉËÏÒÉÓÔÏ×Õ¤ÔØÓÑ Ð¦Ä ÞÁÓ ÒŤÓÔÒÁæ§ ÓÅÒ×ÅÒ¦×"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190
>  msgid "File descriptor to print IOR on"
>  msgstr "äÅÓËÒÉÐÔÏÒ ÆÁÊÌÕ ÄÌÑ ÄÒÕËÕ IOR"
>  
> -#: liboaf/oaf-mainloop.c:188
> +#: liboaf/oaf-mainloop.c:190 oafd/main.c:67
>  msgid "FD"
>  msgstr "æä"
>  
> -#: liboaf/oaf-mainloop.c:190
> +#: liboaf/oaf-mainloop.c:192
>  msgid "IID to activate"
>  msgstr "IID ÄÏ ÁËÔÉ×Áæ§"
>  
> -#: liboaf/oaf-mainloop.c:192
> +#: liboaf/oaf-mainloop.c:194
>  msgid "Prevent registering of server with OAF"
>  msgstr "ðÏÐÅÒÅÄÉÔÉ ÒÅ­¦ÓÔÒÁæÀ ÓÅÒ×ÅÒÁ Ú OAF"
>  
> -#: liboaf/oaf-registration.c:299
> +#: liboaf/oaf-registration.c:323
>  msgid "Couldn't fork a new process"
>  msgstr "îÅ ×ÄÁÌÏÓÑ ÒÏÚÇÁÌÕÄÉÔÉ ÐÒÏÃÅÓ"
>  
> -#: liboaf/oaf-registration.c:317
> +#: liboaf/oaf-registration.c:344
>  #, c-format
>  msgid "Child received signal %u (%s)"
>  msgstr "îÁÝÁÄÏË ÏÔÒÉÍÁ× ÓÉ­ÎÁÌ %u (%s)"
>  
> -#: liboaf/oaf-registration.c:323
> +#: liboaf/oaf-registration.c:350
>  #, c-format
>  msgid "Unknown non-exit error (status is %u)"
>  msgstr ""
>  
> -#: liboaf/oaf-registration.c:394
> +#: liboaf/oaf-registration.c:426
>  #, c-format
>  msgid "Exec failed: %d (%s)\n"
>  msgstr "÷ÉËÏÎÁÎÎÑ ÎÅ ×ÄÁÌÏÓØ: %d (%s)\n"
>  
> -#: oafd/ac-corba.c:433
> +#: oafd/ac-corba.c:476
>  msgid "Couldn't find which child the server was listed in"
>  msgstr ""
> +
> +#: oafd/ac-corba.c:645
> +msgid "Query failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:673
> +msgid "Activation failed: "
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1092
> +msgid "Could not parse AID"
> +msgstr ""
> +
> +#: oafd/ac-corba.c:1101
> +msgid "Could not parse context: "
> +msgstr ""
>  
> -#: oafd/od-activate.c:60
> +#: oafd/ac-corba.c:1124
> +msgid "Could not activate server: "
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "Directory to read .oafinfo files from"
> +msgstr ""
> +
> +#: oafd/main.c:57
> +msgid "DIRECTORY"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "Domain of ObjectDirectory"
> +msgstr ""
> +
> +#: oafd/main.c:59
> +msgid "DOMAIN"
> +msgstr ""
> +
> +#: oafd/main.c:62
> +msgid "Serve as an ActivationContext (default is as an ObjectDirectory only)"
> +msgstr ""
> +
> +#: oafd/main.c:67
> +#, fuzzy
> +msgid "File descriptor to write IOR to"
> +msgstr "äÅÓËÒÉÐÔÏÒ ÆÁÊÌÕ ÄÌÑ ÄÒÕËÕ IOR"
> +
> +#: oafd/main.c:72
> +msgid "Query expression to evaluate"
> +msgstr ""
> +
> +#: oafd/main.c:72
> +msgid "EXPRESSION"
> +msgstr ""
> +
> +#: oafd/od-activate.c:62
>  msgid "We don't handle activating shlib objects in a remote process yet"
>  msgstr ""
>  
> -#: oafd/od-load.c:118 oafd/od-load.c:148
> +#: oafd/od-load.c:122 oafd/od-load.c:152
>  #, c-format
>  msgid "Property '%s' has no value"
>  msgstr ""
>  
> -#: oafd/od-load.c:168
> +#: oafd/od-load.c:172
>  msgid "a NULL iid is not valid"
>  msgstr ""
>  
> -#: oafd/od-load.c:171
> +#: oafd/od-load.c:175
>  #, c-format
>  msgid "iid %s has a NULL type"
>  msgstr "iid %s ÍÁ¤ ÔÉÐ NULL"
>  
> -#: oafd/od-load.c:174
> +#: oafd/od-load.c:178
>  #, c-format
>  msgid "iid %s has a NULL location"
>  msgstr "iid %s ÍÁ¤ ÒÏÚͦÝÅÎÎÑ NULL"
>  
> -#: oafd/od-load.c:182
> +#: oafd/od-load.c:186
>  #, c-format
>  msgid "invalid character '%c' in iid '%s'"
>  msgstr "ÎÅצÒÎÉÊ ÓÉÍ×ÏÌ  \"%c\" × iid \"%s\""
>  
> -#: oafd/od-load.c:215
> +#: oafd/od-load.c:219
>  #, c-format
>  msgid "Trying dir %s\n"
>  msgstr "ðÒÏÂÁ ËÁÔÁÌÏÇÕ %s\n"
> @@ -143,6 +147,55 @@
>  msgid ""
>  "The OAF configuration file was not read successfully. Please, check it is "
>  "valid in: %s"
> +msgstr ""
> +"æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ÎÅ ÂÕÌÏ ÕÓЦÛÎÏ ÚÞÉÔÁÎÏ. ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ ×¦Î ×¦ÒÎÉÊ "
> +"× : %s"
> +
> +#: utils/oaf-sysconf.c:65
> +msgid "Could not save OAF configuration file.\n"
> +msgstr "îÅÍÏÖÌÉ×Ï ÚÂÅÒÅÇÔÉ ÆÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF.\n"
> +
> +#: utils/oaf-sysconf.c:66
> +msgid ""
> +"Please, make sure you have permissions to write OAF configuration file.\n"
> +msgstr "ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ ×É ÍÁ¤ÔÅ ÐÒÁ×Ï ÎÁ ÚÁÐÉÓ ÆÁÊÌÕ ËÏÎƦ­ÕÒÁæ§ OAF.\n"
> +
> +#: utils/oaf-sysconf.c:69
> +msgid "Successfully wrote OAF configuration file.\n"
> +msgstr "æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ÕÓЦÛÎÏ ÚÂÅÒÅÖÅÎÏ.\n"
> +
> +#: utils/oaf-sysconf.c:81
> +#, c-format
> +msgid ""
> +"OAF configuration file is:\n"
> +"    %s\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:108
> +#, c-format
> +msgid "%s already in OAF configuration file\n"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:184
> +msgid "OAF configuration file contains:\n"
> +msgstr "æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ͦÓÔÉÔØ:\n"
> +
> +#: utils/oaf-sysconf.c:216
> +msgid "Directory to remove from OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:216 utils/oaf-sysconf.c:219
> +msgid "directory path"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:219
> +msgid "Directory to add to OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:222
> +msgid "Display directories in OAF configuration file"
> +msgstr ""
> +
> +#: utils/oaf-sysconf.c:225
> +msgid "Display path to OAF configuration file"
>  msgstr ""
> -"æÁÊÌ ËÏÎƦ­ÕÒÁæ§ OAF ÎÅ ÂÕÌÏ ÕÓЦÛÎÏ ÚÞÉÔÁÎÏ. ðÅÒÅËÏÎÁÊÔÅÓØ, ÝÏ ×¦Î "
> -"צÒÎÉÊ × : %s"
> Index: test/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/oaf/test/Makefile.am,v
> retrieving revision 1.14
> diff -u -r1.14 Makefile.am
> --- test/Makefile.am	2000/08/09 05:46:01	1.14
> +++ test/Makefile.am	2000/10/05 08:45:19
> @@ -1,13 +1,46 @@
> -noinst_PROGRAMS=oaf-empty-server oaf-test-client
> -bin_PROGRAMS=oaf-run-query
> +NULL=
>  
> -oaf_test_client_SOURCES=oaf-test-client.c empty-common.c empty.h empty-stubs.c
> +noinst_PROGRAMS=		\
> +	oaf-empty-server 	\
> +	oaf-test-client		\
> +	oaf-test-async		\
> +	$(NULL)
>  
> -oaf_run_query_SOURCES=oaf-run-query.c empty-common.c empty.h empty-stubs.c
> +bin_PROGRAMS=			\
> +	oaf-run-query		\
> +	$(NULL)
>  
> -oaf_empty_server_SOURCES=empty-server.c empty.h empty-common.c empty-skels.c
> +oaf_test_async_SOURCES=		\
> +	oaf-test-async.c 	\
> +	$(NULL)
>  
> -BUILT_SOURCES=empty.h empty-common.c empty-stubs.c empty-skels.c
> +oaf_test_client_SOURCES=	\
> +	oaf-test-client.c 	\
> +	empty-common.c 		\
> +	empty.h 		\
> +	empty-stubs.c		\
> +	$(NULL)
> +
> +oaf_run_query_SOURCES=		\
> +	oaf-run-query.c 	\
> +	empty-common.c 		\
> +	empty.h 		\
> +	empty-stubs.c		\
> +	$(NULL)
> +
> +oaf_empty_server_SOURCES=	\
> +	empty-server.c 		\
> +	empty.h 		\
> +	empty-common.c 		\
> +	empty-skels.c		\
> +	$(NULL)
> +
> +BUILT_SOURCES=			\
> +	empty.h 		\
> +	empty-common.c 		\
> +	empty-stubs.c 		\
> +	empty-skels.c		\
> +	$(NULL)
>  
>  empty.h empty-common.c empty-stubs.c empty-skels.c: empty_built
>  
> Index: test/oaf-test-async.c
> ===================================================================
> RCS file: oaf-test-async.c
> diff -N oaf-test-async.c
> --- /dev/null	Tue May  5 16:32:27 1998
> +++ oaf-test-async.c	Thu Oct  5 04:45:19 2000
> @@ -0,0 +1,174 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
> +#include <liboaf/liboaf.h>
> +#include <liboaf/oaf-async.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <time.h>
> +
> +#define DEBUG_TIME 0
> +
> +typedef struct {
> +        gboolean callback_called;
> +        gboolean succeeded;
> +} callback_data;
> +
> +
> +static 
> +void test_callback (CORBA_Object   activated_object, 
> +                    const char    *error_reason, 
> +                    gpointer       user_data)
> +{
> +        callback_data *data;
> +
> +        data = (callback_data *) user_data;
> +
> +        if (activated_object == CORBA_OBJECT_NIL) {
> +                data->succeeded = FALSE;
> +        } else {
> +                data->succeeded = TRUE;
> +        }
> +                
> +        data->callback_called = TRUE;
> +}
> +
> +
> +/* returns TRUE in case of success. FALSE otherwise. 
> +   -1 if answer timeouted.... */
> +static int
> +test_activate (char *requirements)
> +{
> +        CORBA_Environment ev;
> +        callback_data data;
> +#if DEBUG_TIME        
> +        time_t beg_time;
> +#endif
> +
> +        CORBA_exception_init (&ev);
> +
> +        data.callback_called = FALSE;
> +        oaf_activate_async (requirements, NULL, 0, test_callback, &data, &ev);
> +
> +#if DEBUG_TIME
> +        beg_time = time (NULL);
> +#endif
> +
> +        while (data.callback_called == FALSE) {
> +                g_main_iteration (TRUE);
> +#if DEBUG_TIME
> +                if (time (NULL) > (beg_time + 10)) {
> +                        return -1;
> +                }
> +#endif
> +        }
> +
> +        
> +        if (data.succeeded == TRUE) {
> +                return TRUE;
> +        } else {
> +                return FALSE;
> +        }
> +}
> +
> +/* returns TRUE in case of success. FALSE otherwise. 
> +   -1 if answer timeouted.... */
> +static int
> +test_activate_from_id (char *aid)
> +{
> +        CORBA_Environment ev;
> +        callback_data data;
> +#if DEBUG_TIME        
> +        time_t beg_time;
> +#endif
> +
> +        CORBA_exception_init (&ev);
> +
> +        data.callback_called = FALSE;
> +        oaf_activate_from_id_async (aid, 0, test_callback, &data, &ev);
> +
> +#if DEBUG_TIME
> +        beg_time = time (NULL);
> +#endif
> +
> +        while (data.callback_called == FALSE) {
> +                g_main_iteration (TRUE);
> +#if DEBUG_TIME
> +                if (time (NULL) > (beg_time + 10)) {
> +                        return -1;
> +                }
> +#endif
> +        }
> +
> +        
> +        if (data.succeeded == TRUE) {
> +                return TRUE;
> +        } else {
> +                return FALSE;
> +        }
> +}
> +
> +
> +#define TOTAL_TESTS 4
> +int
> +main (int argc, char *argv[])
> +{
> +        int test_status;
> +        int test_passed;
> +
> +        test_passed = 0;
> +
> +	oaf_init (argc, argv);
> +        printf ("testing async interfaces\n");
> +
> +        printf ("testing activate_async... ");
> +        /* this should fail */
> +        test_status = test_activate ("");
> +        if (test_status == FALSE) {
> +                test_passed++;
> +                printf (" passed\n");
> +        } else if (test_status == TRUE
> +                   || test_status == -1) {
> +                printf (" failed\n");
> +        }
> +
> +        printf ("testing activate_async... ");
> +        test_status = test_activate ("has (repo_ids, 'IDL:Empty:1.0')");
> +        if (test_status == TRUE) {
> +                test_passed++;
> +                printf (" passed\n");
> +        } else if (test_status == FALSE
> +                   || test_status == -1) {
> +                printf (" failed\n");
> +        }
> +
> +        printf ("testing activate_from_id_async... ");
> +        test_status = test_activate_from_id ("");
> +        if (test_status == FALSE) {
> +                test_passed++;
> +                printf (" passed\n");
> +        } else if (test_status == TRUE
> +                   || test_status == -1) {
> +                printf (" failed\n");
> +        }
> +
> +        printf ("testing activate_from_id_async... ");
> +        test_status = test_activate_from_id ("OAFIID:Empty:19991025");
> +        if (test_status == TRUE) {
> +                test_passed++;
> +                printf (" passed\n");
> +        } else if (test_status == FALSE
> +                   || test_status == -1) {
> +                printf (" failed\n");
> +        }
> +
> +        printf ("Async Test Results: %d passed upon %d \n", 
> +                test_passed, TOTAL_TESTS);
> +
> +        if (test_passed != TOTAL_TESTS) {
> +                return 1;
> +        }
> +
> +        return 0;
> +}
> +
> +
> +
> Index: test/oaf-test-client.c
> ===================================================================
> RCS file: /cvs/gnome/oaf/test/oaf-test-client.c,v
> retrieving revision 1.12
> diff -u -r1.12 oaf-test-client.c
> --- test/oaf-test-client.c	2000/08/12 22:28:28	1.12
> +++ test/oaf-test-client.c	2000/10/05 08:45:19
> @@ -207,7 +207,6 @@
>          }
>          fprintf (stderr, "\n");
>  
> -
>          fprintf (stderr, "\n%d of %d tests passed (%s)\n", passed,
>                   TOTAL_TEST_SCORE,
>                   passed == TOTAL_TEST_SCORE? "All": "some failures");
> 
> 
> -- 
> Mathieu Lacage <mathieu eazel com>
> 
> 
> _______________________________________________
> gnome-components-list mailing list
> gnome-components-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnome-components-list




[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]