diff options
| author | Martin Wehner <martin.wehner@epost.de> | 2004-05-07 20:49:44 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2004-05-07 20:49:44 +0000 |
| commit | 3063c1266c8ed7bcd2bbd1d8b7b11263a1e5c37b (patch) | |
| tree | 467c89ef4bed275285c35f9b7826ac8c615dce22 | |
| parent | aa44c9294aad7f727556912e4f24a8379a47a03f (diff) | |
| download | nautilus-3063c1266c8ed7bcd2bbd1d8b7b11263a1e5c37b.tar.gz | |
Move window destruction into update_files_callback (Fixes #141440).
2004-05-07 Martin Wehner <martin.wehner@epost.de>
* src/file-manager/fm-properties-window.c (properties_window_update),
(update_files_callback):
Move window destruction into update_files_callback (Fixes #141440).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-properties-window.c | 13 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2004-05-07 Martin Wehner <martin.wehner@epost.de> + + * src/file-manager/fm-properties-window.c (properties_window_update), + (update_files_callback): + Move window destruction into update_files_callback (Fixes #141440). + 2004-05-07 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-icon-container.c (button_press_event): diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index dd0e09ded..654ce1fd1 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1053,12 +1053,11 @@ properties_window_update (FMPropertiesWindow *window, changed_file = NAUTILUS_FILE (tmp->data); if (changed_file && nautilus_file_is_gone (changed_file)) { + /* Remove the file from the property dialog */ remove_from_dialog (window, changed_file); changed_file = NULL; - /* Remove the file from the property dialog */ if (window->details->original_files == NULL) { - gtk_widget_destroy (GTK_WIDGET (window)); return; } } @@ -1121,8 +1120,14 @@ update_files_callback (gpointer data) window->details->update_files_timeout_id = 0; properties_window_update (window, window->details->changed_files); - nautilus_file_list_free (window->details->changed_files); - window->details->changed_files = NULL; + + if (window->details->original_files == NULL) { + /* Close the window if no files are left */ + gtk_widget_destroy (GTK_WIDGET (window)); + } else { + nautilus_file_list_free (window->details->changed_files); + window->details->changed_files = NULL; + } return FALSE; } |