mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-11-05 16:04:31 +00:00
Fix bug 8172 - Nautilus spews GConf error upon repeated clicking of "help"
* components/help/hyperbola-main.c: (main): Fix bug 8172 - Nautilus spews GConf error upon repeated clicking of "help" Intiialize preferences before creating the factory in case code in the factory needs to use prefernces. * src/nautilus-application.c: (nautilus_application_startup): Dont do the GMC migration if we are about to kill the nautilus shell. Fixes criticals when 'nautilus --quit' is used.
This commit is contained in:
parent
169a1047d4
commit
b40912c0a1
3 changed files with 19 additions and 3 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
|||
2001-04-27 Ramiro Estrugo <ramiro@eazel.com>
|
||||
|
||||
* components/help/hyperbola-main.c: (main):
|
||||
Fix bug 8172 - Nautilus spews GConf error upon repeated clicking
|
||||
of "help"
|
||||
|
||||
Intiialize preferences before creating the factory in case code in
|
||||
the factory needs to use prefernces.
|
||||
|
||||
* src/nautilus-application.c: (nautilus_application_startup):
|
||||
Dont do the GMC migration if we are about to kill the nautilus
|
||||
shell. Fixes criticals when 'nautilus --quit' is used.
|
||||
|
||||
2001-04-27 Andy Hertzfeld <andy@eazel.com>
|
||||
|
||||
* components/news/Makefile.am:
|
||||
|
|
|
@ -104,6 +104,8 @@ main (int argc, char *argv[])
|
|||
|
||||
bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
|
||||
|
||||
nautilus_global_preferences_initialize ();
|
||||
|
||||
registration_id =
|
||||
oaf_make_registration_id
|
||||
("OAFIID:hyperbola_factory:02b54c63-101b-4b27-a285-f99ed332ecdb",
|
||||
|
@ -113,7 +115,6 @@ main (int argc, char *argv[])
|
|||
NULL);
|
||||
g_free (registration_id);
|
||||
|
||||
nautilus_global_preferences_initialize ();
|
||||
|
||||
do {
|
||||
bonobo_main ();
|
||||
|
|
|
@ -456,8 +456,10 @@ nautilus_application_startup (NautilusApplication *application,
|
|||
}
|
||||
|
||||
/* Make the desktop work with gmc and old Nautilus. */
|
||||
migrate_gmc_trash ();
|
||||
migrate_old_nautilus_files ();
|
||||
if (!kill_shell) {
|
||||
migrate_gmc_trash ();
|
||||
migrate_old_nautilus_files ();
|
||||
}
|
||||
|
||||
/* initialize the sound machinery */
|
||||
nautilus_sound_initialize ();
|
||||
|
|
Loading…
Reference in a new issue