summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2003-06-11 17:16:20 +0000
committerAlexander Larsson <alexl@src.gnome.org>2003-06-11 17:16:20 +0000
commit7c421b36a67ca858e07264b02af296735b9a0793 (patch)
treef42a82e364f4d447e401564801f3ca120fb1dd75
parent4d2f067a6d271d5baa5a469c0976d3cb4701701b (diff)
downloadnautilus-7c421b36a67ca858e07264b02af296735b9a0793.tar.gz
Handle the case when the data is alreay ready. This fixes properties on
2003-06-11 Alexander Larsson <alexl@redhat.com> * src/file-manager/fm-properties-window.c (fm_properties_window_present): Handle the case when the data is alreay ready. This fixes properties on the home icon on the desktop.
-rw-r--r--ChangeLog6
-rw-r--r--src/file-manager/fm-properties-window.c5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 71c96abc6..bdca2a03b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2003-06-11 Alexander Larsson <alexl@redhat.com>
+ * src/file-manager/fm-properties-window.c (fm_properties_window_present):
+ Handle the case when the data is alreay ready.
+ This fixes properties on the home icon on the desktop.
+
+2003-06-11 Alexander Larsson <alexl@redhat.com>
+
* src/file-manager/fm-list-view.c (fm_list_view_did_not_drag)
(button_press_callback):
Don't deselect multiple selected files when dragging
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 2d35d1d11..8216f6c96 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -3532,7 +3532,7 @@ void
fm_properties_window_present (GList *original_files,
FMDirectoryView *directory_view)
{
- GList *l;
+ GList *l, *next;
GtkWidget *parent_window;
StartupData *startup_data;
GList *target_files;
@@ -3597,7 +3597,8 @@ fm_properties_window_present (GList *original_files,
parent_window == NULL ? NULL : GTK_WINDOW (parent_window));
- for (l = startup_data->target_files; l != NULL; l = l->next) {
+ for (l = startup_data->target_files; l != NULL; l = next) {
+ next = l->next;
nautilus_file_call_when_ready
(NAUTILUS_FILE (l->data),
NAUTILUS_FILE_ATTRIBUTE_IS_DIRECTORY,