[monkey-bubble: 171/753] kill, (libbonobo_module_info): Update.

[Sven Herzberg <herzi src gnome org>]

commit 513c0b8f6a5e113d6503052e617588ca46a3cb7a
Author: Michael Meeks <michael ximian com>
Date:   Wed Apr 18 21:24:39 2001 +0000

    kill, (libbonobo_module_info): Update.
    
    2001-04-18  Michael Meeks  <michael ximian com>
    
    	* libgnome-init.c (gnome_oaf_module_info): kill,
    	(libbonobo_module_info): Update.

 doc/depends.dia       |  Bin 3807 -> 3899 bytes
 libgnome/ChangeLog    |    5 ++++
 libgnome/gnome-init.c |   56 +++++++-----------------------------------------
 3 files changed, 14 insertions(+), 47 deletions(-)
---
diff --git a/doc/depends.dia b/doc/depends.dia
index e77e3c4..8983ecd 100644
Binary files a/doc/depends.dia and b/doc/depends.dia differ
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 0b53b89..6b0bbcb 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-18  Michael Meeks  <michael ximian com>
+
+	* libgnome-init.c (gnome_oaf_module_info): kill,
+	(libbonobo_module_info): Update.
+
 2001-04-18  Martin Baulig  <baulig suse de>
 
 	* libgnome-init.c (gnome_oaf_module_info): Put this back.
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index fd253b6..95a68ef 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -40,7 +40,6 @@
 extern struct poptOption gconf_options[];
 
 #include <libgnome/libgnome-init.h>
-#include <bonobo/libbonobo-init.h>
 
 #include "libgnomeP.h"
 #include <errno.h>
@@ -50,36 +49,25 @@ extern struct poptOption gconf_options[];
 #include <gobject/gvaluetypes.h>
 
 #include <liboaf/liboaf.h>
-#include <bonobo/libbonobo.h>
+#include <libbonobo.h>
 
 #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)
+libbonobo_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;
 
-    dumb_argv[0] = program_invocation_name;
-    (void) oaf_orb_init (&dumb_argc, dumb_argv);
+    bonobo_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,
+GnomeModuleInfo libbonobo_module_info = {
+    "libbonobo", VERSION, N_("Bonobo Support"),
+    NULL, NULL, libbonobo_post_args_parse,
     oaf_popt_options
 };
 
@@ -263,7 +251,7 @@ gnome_gconf_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
 }
 
 static GnomeModuleRequirement gnome_gconf_requirements[] = {
-    { VERSION, &gnome_oaf_module_info },
+    { VERSION, &libbonobo_module_info },
     { NULL, NULL }
 };
 
@@ -277,32 +265,6 @@ GnomeModuleInfo gnome_gconf_module_info = {
 };
 
 /*****************************************************************************
- * libbonobo
- *****************************************************************************/
-
-static void
-libbonobo_post_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
-{
-    CORBA_ORB orb;
-
-    orb = oaf_orb_get ();
-
-    bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
-}
-
-static GnomeModuleRequirement libbonobo_requirements[] = {
-    { VERSION, &gnome_oaf_module_info },
-    { NULL, NULL }
-};
-
-GnomeModuleInfo libbonobo_module_info = {
-    "libbonobo", VERSION, N_("Bonobo"),
-    libbonobo_requirements,
-    NULL, libbonobo_post_args_parse, NULL,
-    NULL, NULL, NULL, NULL
-};
-
-/*****************************************************************************
  * libgnome
  *****************************************************************************/