diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-list.c | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-list.c | 9 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 2 | ||||
| -rw-r--r-- | src/file-manager/fm-list-view.c | 2 |
5 files changed, 22 insertions, 14 deletions
@@ -1,3 +1,17 @@ +2000-10-25 Michael Engber <engber@eazel.com> + + * libnautilus-extensions/nautilus-list.c: + (nautilus_list_set_selection): + nautilus_list_set_selection used to pass a bogus NautilusCListRow* + to row_set_selected + + * src/file-manager/fm-directory-view.c: + (fm_directory_view_new_folder): + whitespace change + + * src/file-manager/fm-list-view.c: + comment corrected + 2000-10-25 Darin Adler <darin@eazel.com> * components/adapter/bonobo-stream-vfs.c: (vfs_get_info), diff --git a/libnautilus-extensions/nautilus-list.c b/libnautilus-extensions/nautilus-list.c index 812afa3dc..64e1993b4 100644 --- a/libnautilus-extensions/nautilus-list.c +++ b/libnautilus-extensions/nautilus-list.c @@ -3313,7 +3313,6 @@ nautilus_list_set_selection (NautilusList *list, GList *selection) GList *p; int i; NautilusCListRow *row; - gpointer row_data; g_return_if_fail (NAUTILUS_IS_LIST (list)); @@ -3323,14 +3322,12 @@ nautilus_list_set_selection (NautilusList *list, GList *selection) for (p = selection; p != NULL; p = p->next) { g_hash_table_insert (hash, p->data, p->data); } + for (p = NAUTILUS_CLIST (list)->row_list, i = 0; p != NULL; p = p->next, i++) { row = p->data; - row_data = row->data; - - selection_changed |= row_set_selected - (list, i, row_data, - g_hash_table_lookup (hash, row_data) != NULL); + selection_changed |= row_set_selected (list, i, row, g_hash_table_lookup (hash, row->data) != NULL); } + g_hash_table_destroy (hash); if (selection_changed) { diff --git a/libnautilus-private/nautilus-list.c b/libnautilus-private/nautilus-list.c index 812afa3dc..64e1993b4 100644 --- a/libnautilus-private/nautilus-list.c +++ b/libnautilus-private/nautilus-list.c @@ -3313,7 +3313,6 @@ nautilus_list_set_selection (NautilusList *list, GList *selection) GList *p; int i; NautilusCListRow *row; - gpointer row_data; g_return_if_fail (NAUTILUS_IS_LIST (list)); @@ -3323,14 +3322,12 @@ nautilus_list_set_selection (NautilusList *list, GList *selection) for (p = selection; p != NULL; p = p->next) { g_hash_table_insert (hash, p->data, p->data); } + for (p = NAUTILUS_CLIST (list)->row_list, i = 0; p != NULL; p = p->next, i++) { row = p->data; - row_data = row->data; - - selection_changed |= row_set_selected - (list, i, row_data, - g_hash_table_lookup (hash, row_data) != NULL); + selection_changed |= row_set_selected (list, i, row, g_hash_table_lookup (hash, row->data) != NULL); } + g_hash_table_destroy (hash); if (selection_changed) { diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 0f9052814..caeb5d6f4 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -2658,7 +2658,7 @@ fm_directory_view_new_folder (FMDirectoryView *directory_view) char *parent_uri; parent_uri = fm_directory_view_get_uri (directory_view); - nautilus_file_operations_new_folder (GTK_WIDGET(directory_view), parent_uri, new_folder_done, directory_view); + nautilus_file_operations_new_folder (GTK_WIDGET (directory_view), parent_uri, new_folder_done, directory_view); g_free (parent_uri); } diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index b976b1d25..546c40b58 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1400,7 +1400,7 @@ fm_list_view_select_all (FMDirectoryView *view) nautilus_clist_select_all (clist); } -/* select all of the items in the view */ +/* select items in the view */ static void fm_list_view_set_selection (FMDirectoryView *view, GList *selection) { |