Formatting tweaks.

	* src/file-manager/fm-directory-view.c: Formatting tweaks.

	* src/file-manager/fm-list-model.c: (remove_link_saving_prev):
	Fix bug where it would skip every other node.

	* src/file-manager/fm-list-view.c: (fm_list_view_select_all): New.
	(fm_list_view_class_init): Add placeholders for things we need to
	implement to satisfy FMDirectoryView. Implement one: select all.

4 files changed, 53 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index b3bce236d..107369173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-03-04  Darin Adler  <darin@bentspoon.com>
+
+	* src/file-manager/fm-directory-view.c: Formatting tweaks.
+
+	* src/file-manager/fm-list-model.c: (remove_link_saving_prev):
+	Fix bug where it would skip every other node.
+
+	* src/file-manager/fm-list-view.c: (fm_list_view_select_all): New.
+	(fm_list_view_class_init): Add placeholders for things we need to
+	implement to satisfy FMDirectoryView. Implement one: select all.
+
 === nautilus 1.1.7 ===
 
 2002-03-04  Darin Adler  <darin@bentspoon.com>
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index d495f53e4..1f2e27813 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -329,19 +329,19 @@ static void     monitor_file_for_open_with                     (FMDirectoryView
 EEL_CLASS_BOILERPLATE (FMDirectoryView, fm_directory_view, GTK_TYPE_SCROLLED_WINDOW)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, add_file)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, bump_zoom_level)
-EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, zoom_to_level)
-EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, restore_default_zoom_level)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_in)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, can_zoom_out)
-EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, clear)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, file_changed)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_background_widget)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selected_icon_locations)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selection)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, is_empty)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, reset_to_defaults)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, restore_default_zoom_level)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, select_all)
 EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, set_selection)
-EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, get_selected_icon_locations)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (fm_directory_view, zoom_to_level)
 
 typedef struct {
 	GnomeVFSMimeApplication *application;
@@ -2089,15 +2089,15 @@ process_old_files (FMDirectoryView *view)
 		for (node = files_added; node != NULL; node = node->next) {
 			file = NAUTILUS_FILE (node->data);
 			g_signal_emit (view,
-					 signals[ADD_FILE], 0, file);
+				       signals[ADD_FILE], 0, file);
 		}
 
 		for (node = files_changed; node != NULL; node = node->next) {
 			file = NAUTILUS_FILE (node->data);
 			g_signal_emit (view,
-					 signals[still_should_show_file (view, file)
-						 ? FILE_CHANGED : REMOVE_FILE], 0,
-					 file);
+				       signals[still_should_show_file (view, file)
+					       ? FILE_CHANGED : REMOVE_FILE], 0,
+				       file);
 		}
 
 		g_signal_emit (view, signals[END_FILE_CHANGES], 0);
diff --git a/src/file-manager/fm-list-model.c b/src/file-manager/fm-list-model.c
index ca51b5057..d195ca636 100644
--- a/src/file-manager/fm-list-model.c
+++ b/src/file-manager/fm-list-model.c
@@ -591,16 +591,16 @@ fm_list_model_is_empty (FMListModel *model)
 	return model->details->length == 0;
 }
 
-static GSList*
+static GSList *
 remove_link_saving_prev (GSList *list, GSList *link, GSList **prevp)
 {
-	GSList *tmp;
+	GSList *node;
 	GSList *prev;
 	
 	prev = NULL;
 
-	for (tmp = list; tmp; tmp = tmp->next) {
-		if (tmp == link) {
+	for (node = list; node; node = node->next) {
+		if (node == link) {
 			if (prev != NULL) {
 				prev->next = link->next;
 			}
@@ -613,8 +613,7 @@ remove_link_saving_prev (GSList *list, GSList *link, GSList **prevp)
 			break;
 		}
 
-		prev = tmp;
-		tmp = tmp->next;
+		prev = node;
 	}
 
 	*prevp = prev;
@@ -628,15 +627,13 @@ fm_list_model_remove (FMListModel *model, GtkTreeIter *iter)
 	GtkTreePath *path;
 	GSList *prev;
 
-	prev = NULL;
-
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), iter);
 	nautilus_file_unref (NAUTILUS_FILE (G_SLIST (iter->user_data)->data));
 	
+	prev = NULL;
 	model->details->files = remove_link_saving_prev (model->details->files,
 							 iter->user_data,
 							 &prev);
-
 	model->details->length -= 1;
 
 	if (iter->user_data == model->details->tail) {
@@ -658,8 +655,7 @@ fm_list_model_remove_file (FMListModel *model, NautilusFile *file)
 	gboolean found;
 
 	found = fm_list_model_get_tree_iter_from_file (model, file, &iter);
-
-	if (found == FALSE) {
+	if (!found) {
 		g_warning ("trying to remove NautilusFile that isn't there");
 		return;
 	}
@@ -672,7 +668,6 @@ fm_list_model_clear (FMListModel *model)
 {
 	GtkTreeIter iter;
 
-	/* FIXME: Is this too slow? */
 	while (model->details->files != NULL) {
 		iter.stamp = model->details->stamp;
 		iter.user_data = model->details->files;
diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c
index 5fe93a9ea..a4a806e46 100644
--- a/src/file-manager/fm-list-view.c
+++ b/src/file-manager/fm-list-view.c
@@ -284,23 +284,30 @@ fm_list_view_remove_file (FMDirectoryView *view, NautilusFile *file)
 static void
 fm_list_view_set_selection (FMDirectoryView *view, GList *selection)
 {
-	GList *list;
-	GtkTreeIter iter;
 	FMListView *list_view;
+	GtkTreeSelection *tree_selection;
+	GList *node;
+	GtkTreeIter iter;
 	NautilusFile *file;
 	
 	list_view = FM_LIST_VIEW (view);
+	tree_selection = gtk_tree_view_get_selection (list_view->details->tree_view);
 
-	gtk_tree_selection_unselect_all (gtk_tree_view_get_selection (list_view->details->tree_view));
-
-	for (list = selection; list; list = list->next) {
-		file = list->data;
+	gtk_tree_selection_unselect_all (tree_selection);
+	for (node = selection; node != NULL; node = node->next) {
+		file = node->data;
 		if (fm_list_model_get_tree_iter_from_file (list_view->details->model, file, &iter)) {
-			gtk_tree_selection_select_iter (gtk_tree_view_get_selection (list_view->details->tree_view), &iter);
+			gtk_tree_selection_select_iter (tree_selection, &iter);
 		}
 	}
 }
 
+static void
+fm_list_view_select_all (FMDirectoryView *view)
+{
+	gtk_tree_selection_select_all (gtk_tree_view_get_selection (FM_LIST_VIEW (view)->details->tree_view));
+}
+
 #if 0
 
 static char *
@@ -367,12 +374,25 @@ fm_list_view_class_init (FMListViewClass *klass)
 	
 	fm_directory_view_class->add_file = fm_list_view_add_file;
 	fm_directory_view_class->begin_loading = fm_list_view_begin_loading;
+#if GNOME2_CONVERSION_COMPLETE
+	fm_directory_view_class->bump_zoom_level = xxx;
+	fm_directory_view_class->can_zoom_in = xxx;
+	fm_directory_view_class->can_zoom_out = xxx;
+#endif
 	fm_directory_view_class->clear = fm_list_view_clear;
 	fm_directory_view_class->file_changed = fm_list_view_file_changed;
 	fm_directory_view_class->get_background_widget = fm_list_view_get_background_widget;
+#if GNOME2_CONVERSION_COMPLETE
+	fm_directory_view_class->get_selected_icon_locations = xxx;
+#endif
 	fm_directory_view_class->get_selection = fm_list_view_get_selection;
 	fm_directory_view_class->is_empty = fm_list_view_is_empty;
+#if GNOME2_CONVERSION_COMPLETE
+	fm_directory_view_class->reset_to_defaults = xxx;
+	fm_directory_view_class->restore_default_zoom_level = xxx;
+#endif
 	fm_directory_view_class->remove_file = fm_list_view_remove_file;
+	fm_directory_view_class->select_all = fm_list_view_select_all;
 	fm_directory_view_class->set_selection = fm_list_view_set_selection;
 	fm_directory_view_class->sort_directories_first_changed = fm_list_view_sort_directories_first_changed;