[monkey-bubble: 157/753] Removed; this is in libbonobo. (libgnome_module_requires): Require

[Sven Herzberg <herzi src gnome org>]

commit 34c76955f2672b94a40eeeb4d4f0250c2f1237fb
Author: Martin Baulig <baulig suse de>
Date:   Tue Apr 17 21:06:42 2001 +0000

    Removed; this is in libbonobo. (libgnome_module_requires): Require
    
    2001-04-17  Martin Baulig  <baulig suse de>
    
    	* libgnome-init.c (gnome_oaf_module_info): Removed; this is in libbonobo.
    	(libgnome_module_requires): Require libbonobo.
    
    	* libgnome-2.0.pc.in: Depend on libbonobo-2.

 libgnome/ChangeLog          |    7 +++++++
 libgnome/gnome-init.c       |   31 ++-----------------------------
 libgnome/libgnome-2.0.pc.in |    2 +-
 3 files changed, 10 insertions(+), 30 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index e62b0a5..ed25d70 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,5 +1,12 @@
 2001-04-17  Martin Baulig  <baulig suse de>
 
+	* libgnome-init.c (gnome_oaf_module_info): Removed; this is in libbonobo.
+	(libgnome_module_requires): Require libbonobo.
+
+	* libgnome-2.0.pc.in: Depend on libbonobo-2.
+
+2001-04-17  Martin Baulig  <baulig suse de>
+
 	* gnome-ditem.c (gnome_desktop_item_drop_uri_list): Don't call
 	gnome_uri_extract_filename(), just use the URI as-is.
 
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index 8c677ec..f05d572 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -40,6 +40,7 @@
 extern struct poptOption gconf_options[];
 
 #include <libgnome/libgnome-init.h>
+#include <bonobo/libbonobo-init.h>
 
 #include "libgnomeP.h"
 #include <errno.h>
@@ -53,35 +54,6 @@ extern struct poptOption gconf_options[];
 #include <libgnomevfs/gnome-vfs-init.h>
 
 /*****************************************************************************
- * oaf
- *****************************************************************************/
-
-static void
-gnome_oaf_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
-{
-    oaf_preinit (program, mod_info);
-}
-
-static void
-gnome_oaf_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
-{
-    int dumb_argc = 1;
-    char *dumb_argv[] = {NULL};
-
-    oaf_postinit (program, mod_info);
-
-    dumb_argv[0] = program_invocation_name;
-    (void) oaf_orb_init (&dumb_argc, dumb_argv);
-}
-
-GnomeModuleInfo gnome_oaf_module_info = {
-    "gnome-oaf", VERSION, N_("GNOME OAF Support"),
-    NULL,
-    gnome_oaf_pre_args_parse, gnome_oaf_post_args_parse,
-    oaf_popt_options
-};
-
-/*****************************************************************************
  * gconf
  *****************************************************************************/
 
@@ -308,6 +280,7 @@ GnomeModuleInfo gnome_vfs_module_info = {
 };
 
 static GnomeModuleRequirement libgnome_requirements[] = {
+    {VERSION, &libbonobo_module_info},
     {VERSION, &gnome_gconf_module_info},
     {"0.3.0", &gnome_vfs_module_info},
     {NULL}
diff --git a/libgnome/libgnome-2.0.pc.in b/libgnome/libgnome-2.0.pc.in
index 68ef682..58cd5f0 100644
--- a/libgnome/libgnome-2.0.pc.in
+++ b/libgnome/libgnome-2.0.pc.in
@@ -5,7 +5,7 @@ includedir= includedir@
 
 Name: libgnome
 Description: libgnome
-Requires: glib-2.0 ORBit-2.0 gconf-2.0 libgnomebase-2.0 @LIBGNOME_EXTRA_DEPS@
+Requires: glib-2.0 ORBit-2.0 gconf-2.0 libgnomebase-2.0 libbonobo-2.0
 Version: @VERSION@
 Libs: -L${libdir} -lgnome-2
 Cflags: -I${includedir}/gnome/2