[monkey-bubble: 134/753] Hmm, gnome-gconf.[ch] and gconf-oaf.[ch] were a bad idea, reverted.

[Sven Herzberg <herzi src gnome org>]

commit 4454864317d58eb2180235665c6389168789a176
Author: Martin Baulig <martin src gnome org>
Date:   Fri Apr 13 16:55:15 2001 +0000

    Hmm, gnome-gconf.[ch] and gconf-oaf.[ch] were a bad idea, reverted.

 libgnome/ChangeLog  |   11 -----------
 libgnome/libgnome.h |    5 +++--
 2 files changed, 3 insertions(+), 13 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index 47ca24b..d1153a0 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,16 +1,5 @@
 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>.
-
-2001-04-12  Martin Baulig  <baulig suse de>
-
 	* gnome-program.h (GnomeModuleHook): The `GnomeModuleInfo' argument
 	is deep-copied, so you can actually modify it.
 
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index 550a76d..8f092ec 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -30,8 +30,6 @@
 #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>
 #include <libgnome/gnome-exec.h>
@@ -46,6 +44,9 @@
 #include <libgnome/gnome-url.h>
 #include <libgnome/gnome-ditem.h>
 
+extern GnomeModuleInfo gnome_oaf_module_info;
+extern GnomeModuleInfo gnome_gconf_module_info;
+extern GnomeModuleInfo gnome_vfs_module_info;
 extern GnomeModuleInfo libgnome_module_info;
 
 #ifdef COMPAT_1_0