[monkey-bubble: 177/753] Put this back. (libbonobo_module_info): Depend of gnome_oaf_module_info;

[Sven Herzberg <herzi src gnome org>]

commit 453faf072860ca48756dd91da2ecd4d971475938
Author: Martin Baulig <baulig suse de>
Date:   Fri Apr 20 13:05:58 2001 +0000

    Put this back. (libbonobo_module_info): Depend of gnome_oaf_module_info;
    
    2001-04-20  Martin Baulig  <baulig suse de>
    
    	* libgnome-init.c (gnome_oaf_module_info): Put this back.
    	(libbonobo_module_info): Depend of gnome_oaf_module_info; moved
    	oaf_popt_options to gnome_oaf_module_info.

 libgnome/ChangeLog    |    6 ++++++
 libgnome/gnome-init.c |   44 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 6b0bbcb..226c618 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-20  Martin Baulig  <baulig suse de>
+
+	* libgnome-init.c (gnome_oaf_module_info): Put this back.
+	(libbonobo_module_info): Depend of gnome_oaf_module_info; moved
+	oaf_popt_options to gnome_oaf_module_info.
+
 2001-04-18  Michael Meeks  <michael ximian com>
 
 	* libgnome-init.c (gnome_oaf_module_info): kill,
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index 95a68ef..722b79e 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -53,6 +53,39 @@ 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
+};
+
+/*****************************************************************************
+ * libbonobo
+ *****************************************************************************/
+
 static void
 libbonobo_post_args_parse (GnomeProgram    *program,
 			   GnomeModuleInfo *mod_info)
@@ -65,10 +98,17 @@ libbonobo_post_args_parse (GnomeProgram    *program,
     bonobo_init (&dumb_argc, dumb_argv);
 }
 
+static GnomeModuleRequirement libbonobo_requirements[] = {
+    {VERSION, &gnome_oaf_module_info},
+    {NULL}
+};
+
 GnomeModuleInfo libbonobo_module_info = {
     "libbonobo", VERSION, N_("Bonobo Support"),
-    NULL, NULL, libbonobo_post_args_parse,
-    oaf_popt_options
+    libbonobo_requirements,
+    NULL, libbonobo_post_args_parse,
+    NULL,
+    NULL, NULL, NULL, NULL
 };
 
 /*****************************************************************************