[monkey-bubble: 576/753] prune redundant pkgconfig checks, let the deps do the work ...

[Sven Herzberg <herzi src gnome org>]

commit 7710e083424ab9603f6b7a6515d429dee71aa636
Author: Michael Meeks <michael ximian com>
Date:   Wed Aug 1 16:20:33 2001 +0000

    prune redundant pkgconfig checks, let the deps do the work ...
    
    2001-08-01  Michael Meeks  <michael ximian com>
    
    	* configure.in: prune redundant pkgconfig checks, let the
    	deps do the work ...
    
    	* port to bonobo-activation.

 ChangeLog             |    7 +++++++
 configure.in          |    4 ++--
 libgnome/gnome-init.c |   27 ++++++++++++++-------------
 libgnome/gnome-init.h |    2 +-
 po/POTFILES.in        |    1 -
 tests/test-moniker.c  |    2 +-
 6 files changed, 25 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7675b5c..e5c19b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-01  Michael Meeks  <michael ximian com>
+
+	* configure.in: prune redundant pkgconfig checks, let the
+	deps do the work ...
+
+	* port to bonobo-activation.
+
 2001-07-31  Martin Baulig  <baulig suse de>
 
 	* monikers/: Don't build this directory.
diff --git a/configure.in b/configure.in
index b12e0ce..699188f 100644
--- a/configure.in
+++ b/configure.in
@@ -63,11 +63,11 @@ AC_SUBST(REBUILD)
 dnl
 dnl Start of pkg-config checks
 dnl
-PKG_CHECK_MODULES(LIBGNOME, ORBit-2.0 >= 2.3.90 glib-2.0 >= 1.3.1 gnome-vfs-2.0 oaf-2.0 libxml-2.0 libbonobo-2.0 >= 1.98.0)
+PKG_CHECK_MODULES(LIBGNOME, glib-2.0 >= 1.3.1 gnome-vfs-2.0 libxml-2.0 libbonobo-2.0 >= 1.98.0)
 AC_SUBST(LIBGNOME_CFLAGS)
 AC_SUBST(LIBGNOME_LIBS)
 
-PKG_CHECK_MODULES(MONIKER, ORBit-2.0 >= 2.3.90 glib-2.0 >= 1.3.1 gnome-vfs-2.0 oaf-2.0 libxml-2.0 libbonobo-2.0 libbonobo-config)
+PKG_CHECK_MODULES(MONIKER, glib-2.0 >= 1.3.1 gnome-vfs-2.0 libxml-2.0 libbonobo-2.0 libbonobo-config)
 AC_SUBST(MONIKER_CFLAGS)
 AC_SUBST(MONIKER_LIBS)
 
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index f252e92..a7cd52d 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -44,7 +44,7 @@
 #include <gobject/gparamspecs.h>
 #include <gobject/gvaluetypes.h>
 
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <libbonobo.h>
 
 #ifdef HAVE_GNOMESUPPORT
@@ -54,34 +54,35 @@
 #include <libgnomevfs/gnome-vfs-init.h>
 
 /*****************************************************************************
- * oaf
+ * bonobo-activation
  *****************************************************************************/
 
 static void
-gnome_oaf_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
+bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 {
-        if (!g_thread_supported()) g_thread_init (NULL);
+        if (!g_thread_supported ())
+		g_thread_init (NULL);
 
-	oaf_preinit (program, mod_info);
+	bonobo_activation_preinit (program, mod_info);
 }
 
 static void
-gnome_oaf_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
+bonobo_activation_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 {
 	int dumb_argc = 1;
 	char *dumb_argv[] = {NULL};
 
-	oaf_postinit (program, mod_info);
+	bonobo_activation_postinit (program, mod_info);
 
 	dumb_argv[0] = program_invocation_name;
-	(void) oaf_orb_init (&dumb_argc, dumb_argv);
+	(void) bonobo_activation_orb_init (&dumb_argc, dumb_argv);
 }
 
-GnomeModuleInfo gnome_oaf_module_info = {
-	"gnome-oaf", VERSION, N_("GNOME OAF Support"),
+GnomeModuleInfo gnome_bonobo_activation_module_info = {
+	"bonobo-activation", VERSION, N_("Bonobo activation Support"),
 	NULL, NULL,
-	gnome_oaf_pre_args_parse, gnome_oaf_post_args_parse,
-	oaf_popt_options
+	bonobo_activation_pre_args_parse, bonobo_activation_post_args_parse,
+	bonobo_activation_popt_options
 };
 
 /*****************************************************************************
@@ -314,7 +315,7 @@ libbonobo_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 }
 
 static GnomeModuleRequirement libbonobo_requirements [] = {
-	{ VERSION, &gnome_oaf_module_info },
+	{ VERSION, &gnome_bonobo_activation_module_info },
 	{ NULL }
 };
 
diff --git a/libgnome/gnome-init.h b/libgnome/gnome-init.h
index 35fe165..767d9d2 100644
--- a/libgnome/gnome-init.h
+++ b/libgnome/gnome-init.h
@@ -56,7 +56,7 @@ gnome_get_config_database (void);
 #define GNOME_PARAM_CONFIG_DATABASE "config-database"
 #define GNOME_PARAM_CONFIG_MONIKER  "config-moniker"
 
-extern GnomeModuleInfo gnome_oaf_module_info;
+extern GnomeModuleInfo gnome_bonobo_activation_module_info;
 extern GnomeModuleInfo gnome_vfs_module_info;
 extern GnomeModuleInfo libgnome_module_info;
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 50a3d5f..4fef320 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,3 @@
-libgnome/gnome-ditem.c
 libgnome/gnome-exec.c
 libgnome/gnome-moz-remote2.c
 libgnome/gnome-url.c
diff --git a/tests/test-moniker.c b/tests/test-moniker.c
index e6c405e..fa1e2ed 100644
--- a/tests/test-moniker.c
+++ b/tests/test-moniker.c
@@ -19,7 +19,7 @@ main (int argc, char *argv [])
 	ev = &real_ev;
 	CORBA_exception_init (ev);
 
-	ref = oaf_activate (
+	ref = bonobo_activation_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);