[monkey-bubble: 559/753] add xml-i18n tools.

[Sven Herzberg <herzi src gnome org>]

commit afa9c0a57ea406dffc7c90a7746a5599ebf5d01a
Author: Michael Meeks <michael ximian com>
Date:   Fri Jul 27 14:30:02 2001 +0000

    add xml-i18n tools.
    
    2001-07-27  Michael Meeks  <michael ximian com>
    
    	* configure.in: add xml-i18n tools.
    
    	* tests/test-moniker.c (main): add.
    
    	* tests/Makefile.am: upd.

 .cvsignore                           |    8 +++++++
 ChangeLog                            |    8 +++++++
 configure.in                         |    6 +++++
 monikers/.cvsignore                  |    1 +
 monikers/ChangeLog                   |    7 ++++++
 monikers/GNOME_Moniker_std.oaf.in.in |    2 +-
 monikers/Makefile.am-50588           |   18 +++++++++------
 tests/.cvsignore                     |    1 +
 tests/Makefile.am                    |    5 +++-
 tests/test-moniker.c                 |   39 ++++++++++++++++++++++++++++++++++
 10 files changed, 86 insertions(+), 9 deletions(-)
---
diff --git a/.cvsignore b/.cvsignore
index ddc19bf..7dd0596 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -34,3 +34,11 @@ gnome-libs.spec
 libvfs
 compatConf.sh
 libgnome2-*.tar.gz
+deptree
+xml-i18n-extract
+xml-i18n-merge
+xml-i18n-merge.in
+xml-i18n-update
+xml-i18n-extract.in
+xml-i18n-update.in
+
diff --git a/ChangeLog b/ChangeLog
index 1fd7f3b..5689331 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-27  Michael Meeks  <michael ximian com>
+
+	* configure.in: add xml-i18n tools.
+
+	* tests/test-moniker.c (main): add.
+
+	* tests/Makefile.am: upd.
+
 2001-07-14  Martin Baulig  <baulig suse de>
 
 	* configure.in (BONOBO_IDLDIR): AC_SUBST this.
diff --git a/configure.in b/configure.in
index bc87a88..fa7c217 100644
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,12 @@ if test -z "$CERTIFIED_GNOMIE"; then
   exit 1
 fi
 
+dnl
+dnl Due to the sed scripts being split on 90 line
+dnl blocks, this macro needs to be right at the beggining.
+dnl
+AM_PROG_XML_I18N_TOOLS
+
 GNOME_COMMON_INIT
 GNOME_PLATFORM_GNOME_2(yes, force)
 
diff --git a/monikers/.cvsignore b/monikers/.cvsignore
index 040c8c3..160d8ee 100644
--- a/monikers/.cvsignore
+++ b/monikers/.cvsignore
@@ -7,3 +7,4 @@ Makefile
 *.oaf
 test-ditem
 desktop-item-boot
+GNOME_Moniker_std.oaf.in
diff --git a/monikers/ChangeLog b/monikers/ChangeLog
index 28ef384..2eb6cae 100644
--- a/monikers/ChangeLog
+++ b/monikers/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-27  Michael Meeks  <michael ximian com>
+
+	* GNOME_Moniker_std.oaf.in.in: fix the shlib factory name.
+
+	* Makefile.am (clean-local): actualy install the monikers.
+	use xml-i18n-tools.
+
 2001-07-20  Martin Baulig  <baulig suse de>
 
 	* Makefile.am (install-data-local): Don't run ./desktop-item-boot.
diff --git a/monikers/GNOME_Moniker_std.oaf.in.in b/monikers/GNOME_Moniker_std.oaf.in.in
index caa8f43..2697309 100644
--- a/monikers/GNOME_Moniker_std.oaf.in.in
+++ b/monikers/GNOME_Moniker_std.oaf.in.in
@@ -1,7 +1,7 @@
 <oaf_info>
 
 <oaf_server iid="OAFIID:GNOME_Moniker_std_Factory"
-	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_std.so">
+	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gnome_std.so">
 	<oaf_attribute name="repo_ids" type="stringv">
 		<item value="IDL:Bonobo/GenericFactory:1.0"/>
 	</oaf_attribute>
diff --git a/monikers/Makefile.am-50588 b/monikers/Makefile.am-50588
index d05c5a0..70518ff 100644
--- a/monikers/Makefile.am-50588
+++ b/monikers/Makefile.am-50588
@@ -14,13 +14,6 @@ INCLUDES = \
 	-DVERSION=\""$(VERSION)"\"			\
 	-DG_LOG_DOMAIN=\"GnomeMonikers\"
 
-OAF_FILES = 						\
-	Bonobo_Moniker_ditem.oaf
-	GNOME_Moniker_std.oaf
-
-clean-local:
-	-rm -f $(OAF_FILES)
-
 EXTRA_DIST = \
 	Bonobo_Moniker_ditem.oaf.in \
 	GNOME_Moniker_std.oaf.in.in
@@ -34,8 +27,19 @@ monikerdir = $(libdir)/bonobo/monikers
 GNOME_Moniker_std.oaf.in : $(srcdir)/GNOME_Moniker_std.oaf.in.in
 	sed -e "s|\ MONIKER_LIBDIR\@|$(monikerdir)|" \
 	 $(srcdir)/GNOME_Moniker_std.oaf.in.in > GNOME_Moniker_std.oaf.in
+
 CLEANFILES+=GNOME_Moniker_std.oaf GNOME_Moniker_std.oaf.in
 
+oafdir = $(datadir)/oaf
+oaf_DATA = \
+	Bonobo_Moniker_ditem.oaf \
+	GNOME_Moniker_std.oaf
+
+ XML_I18N_MERGE_OAF_RULE@
+
+clean-local:
+	-rm -f $(oaf_DATA)
+
 libmoniker_gnome_std_la_SOURCES = \
 	gnome-moniker-std.c		\
 	gnome-moniker-std.h		\
diff --git a/tests/.cvsignore b/tests/.cvsignore
index 7ec9cbb..8093660 100644
--- a/tests/.cvsignore
+++ b/tests/.cvsignore
@@ -6,3 +6,4 @@ Makefile
 *.lo
 *.oaf
 test-storage
+test-moniker
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 663501d..07a8700 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,6 @@
 noinst_PROGRAMS = \
-	test-storage
+	test-storage \
+	test-moniker
 
 INCLUDES = \
 	-I$(srcdir) -I$(top_srcdir) \
@@ -9,6 +10,8 @@ LDADD =	$(LIBGNOME_LIBS)
 
 test_storage_SOURCES = test-storage.c
 
+test_moniker_SOURCES = test-moniker.c
+
 TESTS_ENVIRONMENT =					\
 	LD_LIBRARY_PATH=$(top_builddir)/libgnome/.libs/	\
 	BONOBO_PLUGIN_PATH=$(top_builddir)/storage-modules/.libs
diff --git a/tests/test-moniker.c b/tests/test-moniker.c
new file mode 100644
index 0000000..e6c405e
--- /dev/null
+++ b/tests/test-moniker.c
@@ -0,0 +1,39 @@
+#include <config.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <libbonobo.h>
+#include <orbit/poa/poa.h>
+
+int
+main (int argc, char *argv [])
+{
+	Bonobo_Unknown    ref;
+	CORBA_Environment *ev, real_ev;
+
+	free (malloc (8));
+
+	if (bonobo_init (&argc, argv) == FALSE)
+		g_error ("Can not bonobo_init");
+	bonobo_activate ();
+
+	ev = &real_ev;
+	CORBA_exception_init (ev);
+
+	ref = oaf_activate (
+		"repo_ids.has ('IDL:Bonobo/Moniker:1.0') AND "
+		"bonobo:moniker.has ('file:')", NULL, 0, NULL, ev);
+	g_assert (ev->_major == CORBA_NO_EXCEPTION);
+	g_assert (ref != CORBA_OBJECT_NIL);
+	bonobo_object_release_unref (ref, ev);
+	g_assert (ev->_major == CORBA_NO_EXCEPTION);
+
+	ref = bonobo_get_object ("file:/tmp/foo", "Bonobo/Stream", ev);
+	g_assert (ev->_major == CORBA_NO_EXCEPTION);
+	g_assert (ref != CORBA_OBJECT_NIL);
+	bonobo_object_release_unref (ref, ev);
+	g_assert (ev->_major == CORBA_NO_EXCEPTION);
+
+	CORBA_exception_free (ev);
+
+	return 0;
+}