Commit 9ff8e5d6 authored by Robey Pointer's avatar Robey Pointer
Browse files

reviewed by: Eskil Heyn Olsen <eskil@eazel.com>

	* src/nautilus-application.c: (nautilus_application_startup):

	Follow --quit's lead and avoid unref'ing to avoid hanging.

	* src/nautilus-shell.c: (restore_window_states):

	Don't double-free the list elements in the restored window list
	after restart.
parent 82116959
2001-02-12 Robey Pointer <robey@eazel.com>
reviewed by: Eskil Heyn Olsen <eskil@eazel.com>
* src/nautilus-application.c: (nautilus_application_startup):
Follow --quit's lead and avoid unref'ing to avoid hanging.
* src/nautilus-shell.c: (restore_window_states):
Don't double-free the list elements in the restored window list
after restart.
2001-02-12 Robey Pointer <robey@eazel.com>
* components/services/install/lib/eazel-install-protocols.c:
......
......@@ -511,7 +511,7 @@ nautilus_application_startup (NautilusApplication *application,
* no good. We could probably fix this in some fancier way if
* we could figure out a better lifetime rule.
*/
if (!kill_shell) {
if (!(kill_shell || restart_shell)) {
bonobo_object_release_unref (shell, &ev);
}
......
......@@ -452,8 +452,6 @@ restore_window_states (NautilusShell *shell)
gtk_widget_set_uposition (GTK_WIDGET (window), x, y);
gtk_widget_set_usize (GTK_WIDGET (window), width, height);
display_caveat_first_time (shell, window);
g_free (window_info);
}
nautilus_g_list_free_deep (start_state);
nautilus_preferences_set_string_list (START_STATE_CONFIG, NULL);
......
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