[monkey-bubble: 133/753] New files; provide `gnome_oaf_module_info' to initialize OAF.

[Sven Herzberg <herzi src gnome org>]

commit 0a3a895c9641f1d7c33563ff78bd53a2250106d3
Author: Martin Baulig <baulig suse de>
Date:   Thu Apr 12 21:32:48 2001 +0000

    New files; provide `gnome_oaf_module_info' to initialize OAF.
    
    2001-04-12  Martin Baulig  <baulig suse de>
    
    	* gnome-oaf.[ch]: New files; provide `gnome_oaf_module_info' to
    	initialize OAF.
    
    	* gnome-gconf.[ch]: New files; provide `gnome_gconf_module_info'
    	to initialize GConf.
    
    	* libgnome.h: Added <libgnome/gnome-gconf.h> and
    	<libgnome/gnome-oaf.h>.

 libgnome/ChangeLog       |   10 +++++++---
 libgnome/Makefile.am     |    2 ++
 libgnome/gnome-init.c    |   15 ++++++++-------
 libgnome/libgnome.h      |    1 +
 libgnome/test-libgnome.c |    7 ++++++-
 5 files changed, 24 insertions(+), 11 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 0f46af0..47ca24b 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,9 +1,13 @@
 2001-04-12  Martin Baulig  <baulig suse de>
 
-	* gnome-gconf.[ch]: New files; copied here from
-	libgnomeui-2/libgnomeui.
+	* gnome-oaf.[ch]: New files; provide `gnome_oaf_module_info' to
+	initialize OAF.
 
-	* libgnome.h: Added <libgnome/gnome-gconf.h>.
+	* gnome-gconf.[ch]: New files; provide `gnome_gconf_module_info'
+	to initialize GConf.
+
+	* libgnome.h: Added <libgnome/gnome-gconf.h> and
+	<libgnome/gnome-oaf.h>.
 
 2001-04-12  Martin Baulig  <baulig suse de>
 
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 5c0b0ed..bc2bf01 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -40,6 +40,7 @@ INCLUDES = \
 libgnome_2_la_SOURCES = \
 	gnome-program.c		\
 	gnome-gconf.c		\
+	gnome-oaf.c		\
 	gnome-config.c		\
 	gnome-ditem.c		\
 	gnome-exec.c		\
@@ -58,6 +59,7 @@ libgnome_2_la_SOURCES = \
 libgnome_headers = \
 	gnome-program.h		\
 	gnome-gconf.h		\
+	gnome-oaf.h		\
         gnome-config.h 		\
 	gnome-defs.h   		\
 	gnome-fileconvert.h	\
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index cee7460..a38795f 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -73,16 +73,17 @@ static GnomeModuleInfo gnome_vfs_module_info = {
 };
 
 static GnomeModuleRequirement libgnome_requirements[] = {
-  {"0.3.0", &gnome_vfs_module_info},
-  {NULL}
+    {VERSION, &gnome_gconf_module_info},
+    {"0.3.0", &gnome_vfs_module_info},
+    {NULL}
 };
 
 GnomeModuleInfo libgnome_module_info = {
-  "libgnome", VERSION, "GNOME Library",
-  libgnome_requirements,
-  NULL, libgnome_post_args_parse,
-  gnomelib_options,
-  libgnome_loadinit
+    "libgnome", VERSION, "GNOME Library",
+    libgnome_requirements,
+    NULL, libgnome_post_args_parse,
+    gnomelib_options,
+    libgnome_loadinit
 };
 
 static void
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index 0c4e837..550a76d 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -30,6 +30,7 @@
 #include <libgnome/gnome-defs.h>
 
 #include <libgnome/gnome-program.h>
+#include <libgnome/gnome-oaf.h>
 #include <libgnome/gnome-gconf.h>
 
 #include <libgnome/gnome-config.h>
diff --git a/libgnome/test-libgnome.c b/libgnome/test-libgnome.c
index 6648d6a..90a6af1 100644
--- a/libgnome/test-libgnome.c
+++ b/libgnome/test-libgnome.c
@@ -94,9 +94,14 @@ test_constructor (GType type, guint n_construct_properties,
     g_message (G_STRLOC ": %p - %d", pclass, test_id);
 }
 
+static GnomeModuleRequirement test_requirements[] = {
+    {VERSION, &libgnome_module_info},
+    {NULL}
+};
+
 GnomeModuleInfo test_moduleinfo = {
     "test", VERSION, "Test Application",
-    NULL,
+    test_requirements,
     test_pre_args_parse, test_post_args_parse,
     NULL,
     test_init_pass, test_constructor,