Commit 7a6cd309 authored by Ramiro Estrugo's avatar Ramiro Estrugo
Browse files

Call nautilus_preferences_init to make sure gconf is in business

before we call it.
parent a7fb6cdb
2000-04-21 Ramiro Estrugo <ramiro@eazel.com>
* components/history/ntl-history-view.c:
Call nautilus_preferences_init to make sure gconf is in business
before we call it.
2000-04-21 Ramiro Estrugo <ramiro@eazel.com>
Switched us to use gconf instead of gnome_config. There is still
......
......@@ -29,6 +29,7 @@
#include <libnautilus/libnautilus.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <nautilus-widgets/nautilus-preferences.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnomevfs/gnome-vfs-uri.h>
......@@ -268,6 +269,11 @@ int main(int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
/* FIXME: Need better error reporting if this fails. BUT, is it too
* early to post a dialog here ? */
g_assert (nautilus_preferences_init (argc, argv));
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
......
......@@ -29,6 +29,7 @@
#include <libnautilus/libnautilus.h>
#include <libnautilus-extensions/nautilus-bookmark.h>
#include <libnautilus-extensions/nautilus-icon-factory.h>
#include <nautilus-widgets/nautilus-preferences.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomevfs/gnome-vfs-init.h>
#include <libgnomevfs/gnome-vfs-uri.h>
......@@ -268,6 +269,11 @@ int main(int argc, char *argv[])
argc, argv,
oaf_popt_options, 0, NULL);
orb = oaf_init (argc, argv);
/* FIXME: Need better error reporting if this fails. BUT, is it too
* early to post a dialog here ? */
g_assert (nautilus_preferences_init (argc, argv));
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
gnome_vfs_init ();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment