[monkey-bubble: 153/753] Don't compile gnome-gconf.c and oafgnome.c.

[Sven Herzberg <herzi src gnome org>]

commit a55664e6f1917ce8168a967a9c2a7a9a12eeb0df
Author: Martin Baulig <baulig suse de>
Date:   Tue Apr 17 17:21:47 2001 +0000

    Don't compile gnome-gconf.c and oafgnome.c.
    
    2001-04-17  Martin Baulig  <baulig suse de>
    
    	* Makefile.am: Don't compile gnome-gconf.c and oafgnome.c.
    
    	* gnome-app-helper.c (gnome_gconf_get_gnome_libs_settings_relative):
    	#define this to NULL (FIXME).
    
    	* gnome-gconf.h (gnome_gconf_module_info): Removed external declaration; this
    	is in libgnome now.
    	(GNOME_GCONF_INIT): Removed.
    	(gnome_get_gconf_client): Made this a macro which uses
    	gnome_program_get_gconf_client (gnome_program_get ()).

 libgnome/gnome-gconf.h |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/libgnome/gnome-gconf.h b/libgnome/gnome-gconf.h
index dfa31d1..3c4ed10 100644
--- a/libgnome/gnome-gconf.h
+++ b/libgnome/gnome-gconf.h
@@ -33,8 +33,11 @@
 #include <gtk/gtkspinbutton.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtkradiobutton.h>
-#include <libgnomebase/gnome-program.h>
 #include "gnome-color-picker.h"
+
+#include <libgnomebase/gnome-program.h>
+#include <libgnome/libgnome-init.h>
+
 /* GTK Widgets */
 GConfValue *gnome_gconf_gtk_entry_get          (GtkEntry         *entry,
 						GConfValueType    type);
@@ -76,10 +79,7 @@ gchar      *gnome_gconf_get_app_settings_relative        (const gchar *subkey);
    GConf
 */
 
-GConfClient *gnome_get_gconf_client (void);
-
-extern GnomeModuleInfo gnome_gconf_module_info;
-#define GNOME_GCONF_INIT GNOME_PARAM_MODULE,&gnome_gconf_module_info
+#define gnome_get_gconf_client() gnome_program_get_gconf_client (gnome_program_get ())
 
 #endif