Commit c06f72b9 authored by Ramiro Estrugo's avatar Ramiro Estrugo

reviewed by: Pavel Cisler <pavel@eazel.com>

	Fix bug 5914 - First run of Nautilus on clean system crashes.

	* src/nautilus-application.c: (nautilus_application_initialize),
	(nautilus_application_destroy), (nautilus_application_startup):
	Add the preference callback for show_desktop much later in the
	initialization of the Nautilus Application.  Otherwise, the first
	time druid triggers prefernece changes that cause the desktop to
	turn on in the middle of the first time druid being presented to
	the user.
parent 957bc539
2001-01-22 Ramiro Estrugo <ramiro@eazel.com>
reviewed by: Pavel Cisler <pavel@eazel.com>
Fix bug 5914 - First run of Nautilus on clean system crashes.
* src/nautilus-application.c: (nautilus_application_initialize),
(nautilus_application_destroy), (nautilus_application_startup):
Add the preference callback for show_desktop much later in the
initialization of the Nautilus Application. Otherwise, the first
time druid triggers prefernece changes that cause the desktop to
turn on in the middle of the first time druid being presented to
the user.
2001-01-22 Rebecca Schulman <rebecka@eazel.com>
* libnautilus-extensions/nautilus-search-uri.c:
......
......@@ -199,11 +199,6 @@ nautilus_application_initialize (NautilusApplication *application)
"volume_unmounted",
volume_unmounted_callback,
application);
/* monitor the desktop preference */
nautilus_preferences_add_callback (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
desktop_changed_callback,
application);
}
NautilusApplication *
......@@ -221,10 +216,6 @@ nautilus_application_destroy (GtkObject *object)
nautilus_bookmarks_exiting ();
nautilus_preferences_remove_callback (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
desktop_changed_callback,
application);
bonobo_object_unref (BONOBO_OBJECT (application->undo_manager));
NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object));
......@@ -462,6 +453,12 @@ nautilus_application_startup (NautilusApplication *application,
if (start_desktop) {
Nautilus_Shell_start_desktop (shell, &ev);
}
/* Monitor the preference to show or hide the desktop */
nautilus_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_DESKTOP,
desktop_changed_callback,
application,
GTK_OBJECT (application));
/* CORBA C mapping doesn't allow NULL to be passed
for string parameters */
......
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