[monkey-bubble: 218/753] Removed. This is now in libgnome and using bonobo-conf.

[Sven Herzberg <herzi src gnome org>]

commit b28441252032b40674656ae8b20445c5d63566c1
Author: Martin Baulig <baulig suse de>
Date:   Sun Apr 29 16:01:32 2001 +0000

    Removed. This is now in libgnome and using bonobo-conf.
    
    2001-04-29  Martin Baulig  <baulig suse de>
    
    	* gnome-preferences.[ch]: Removed. This is now in libgnome
    	and using bonobo-conf.

 libgnomeui/ChangeLog           |    5 +
 libgnomeui/Makefile.am         |    2 -
 libgnomeui/gnome-app-helper.c  |    2 +-
 libgnomeui/gnome-app.c         |    3 +-
 libgnomeui/gnome-appbar.c      |    2 +-
 libgnomeui/gnome-mdi.c         |    6 +-
 libgnomeui/gnome-preferences.c |  938 ----------------------------------------
 libgnomeui/gnome-preferences.h |  147 -------
 libgnomeui/gnome-ui-init.c     |    4 +-
 9 files changed, 16 insertions(+), 1093 deletions(-)
---
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index f8924fd..44aa3ef 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,5 +1,10 @@
 2001-04-29  Martin Baulig  <baulig suse de>
 
+	* gnome-preferences.[ch]: Removed. This is now in libgnome
+	and using bonobo-conf.
+
+2001-04-29  Martin Baulig  <baulig suse de>
+
 	* gnome-canvas-init.c (libgnomecanvas_pre_args_parse):
 	There is no libgnomecanvas_init() function anymore.
 
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index b6561e9..aaa70ef 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -84,7 +84,6 @@ libgnomeui_2_la_SOURCES = \
 	gnome-popup-help.c		\
 	gnome-pouch.c			\
 	gnome-pouchP.h			\
-	gnome-preferences.c		\
 	gnome-roo.c			\
         gnome-winhints.c		\
         gnome-paper-selector.c		\
@@ -147,7 +146,6 @@ gnome_headers = \
 	gnome-popup-help.h		\
 	gnome-pouch.h			\
         gnome-paper-selector.h		\
-	gnome-preferences.h		\
 	gnome-pixmap.h			\
 	gnome-roo.h			\
 	gnome-selector.h		\
diff --git a/libgnomeui/gnome-app-helper.c b/libgnomeui/gnome-app-helper.c
index 5bc6dcf..ea9794a 100644
--- a/libgnomeui/gnome-app-helper.c
+++ b/libgnomeui/gnome-app-helper.c
@@ -59,7 +59,7 @@
 #include "gnome-uidefs.h"
 #include "gnome-stock.h"
 #include "gnome-pixmap.h"
-#include "gnome-preferences.h"
+#include <libgnome/gnome-preferences.h>
 #include "gnome-stock.h"
 
 extern const gchar *gnome_user_accels_dir;
diff --git a/libgnomeui/gnome-app.c b/libgnomeui/gnome-app.c
index a729e6a..023e052 100644
--- a/libgnomeui/gnome-app.c
+++ b/libgnomeui/gnome-app.c
@@ -48,8 +48,9 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-config.h>
+#include <libgnome/gnome-preferences.h>
+#include "gnome-app-helper.h"
 #include "gnome-uidefs.h"
-#include "gnome-preferences.h"
 #include "gnome-dock.h"
 #include "gnome-init.h"
 #include "gnome-helpsys.h"
diff --git a/libgnomeui/gnome-appbar.c b/libgnomeui/gnome-appbar.c
index 846a7d7..07d1503 100644
--- a/libgnomeui/gnome-appbar.c
+++ b/libgnomeui/gnome-appbar.c
@@ -35,7 +35,7 @@
 
 #include <libgnome/gnome-util.h>
 #include <libgnome/gnome-i18n.h>
-#include <libgnomeui/gnome-preferences.h>
+#include <libgnome/gnome-preferences.h>
 
 #include "gnome-uidefs.h"
 
diff --git a/libgnomeui/gnome-mdi.c b/libgnomeui/gnome-mdi.c
index 614e3b0..1583dc2 100644
--- a/libgnomeui/gnome-mdi.c
+++ b/libgnomeui/gnome-mdi.c
@@ -33,11 +33,11 @@
 #include <libgnome/gnome-config.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnome/gnome-util.h>
+#include <libgnome/gnome-preferences.h>
 #include "gnome-app.h"
 #include "gnome-cursors.h"
 #include "gnome-dock-layout.h"
 #include "gnome-stock.h"
-#include "gnome-preferences.h"
 #include "gnome-pouch.h"
 #include "gnome-roo.h"
 #include "gnome-macros.h"
@@ -434,8 +434,10 @@ gnome_mdi_init (GnomeMDI *mdi)
 {
 	mdi->priv = g_new0(GnomeMDIPrivate, 1);
 
+#ifdef FIXME
 	mdi->priv->mode = gnome_preferences_get_mdi_mode();
 	mdi->priv->tab_pos = gnome_preferences_get_mdi_tab_pos();
+#endif
 	
 	mdi->priv->signal_id = 0;
 	mdi->priv->in_drag = FALSE;
@@ -2008,8 +2010,10 @@ gnome_mdi_set_mode (GnomeMDI *mdi, GnomeMDIMode mode)
 	g_return_if_fail(mdi != NULL);
 	g_return_if_fail(GNOME_IS_MDI(mdi));
 
+#ifdef FIXME
 	if(mode == GNOME_MDI_DEFAULT_MODE)
 		mode = gnome_preferences_get_mdi_mode();
+#endif
 
 	if(mdi->priv->active_view) {
 		width = mdi->priv->active_view->allocation.width;
diff --git a/libgnomeui/gnome-ui-init.c b/libgnomeui/gnome-ui-init.c
index 397ab2e..4ba3859 100644
--- a/libgnomeui/gnome-ui-init.c
+++ b/libgnomeui/gnome-ui-init.c
@@ -46,7 +46,6 @@
 #include <libgnomeui/gnome-canvas-init.h>
 
 #include "gnome-client.h"
-#include "gnome-preferences.h"
 #include "gnome-init.h"
 #include "gnome-winhints.h"
 #include "gnome-gconf.h"
@@ -57,6 +56,8 @@
 
 #include "libgnomeuiP.h"
 
+#include <gtk/gtkmain.h>
+
 /*****************************************************************************
  * libbonoboui
  *****************************************************************************/
@@ -303,7 +304,6 @@ libgnomeui_post_args_parse(GnomeProgram *program, GnomeModuleInfo *mod_info)
         gnome_type_init();
         gtk_rc_set_image_loader(libgnomeui_pixbuf_image_loader);
         libgnomeui_rc_parse(program_invocation_name);
-        gnome_preferences_load();
 
         libgnomeui_segv_setup(TRUE);