search: use a separate view setting for search

So we can select what type of view do we want for search independently
of what we normally use.

This is needed since we default to switch to list view for search, but
we would like to allow users to select a different view. However,
instead of adding a preference in the preference dialog, we can do it
more straightforward and change the setting when we are in search.

On the way, rework all the enums and views id for a saner code...

1 files changed, 2 insertions, 2 deletions

diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index 1d498e04d..a5de12a6a 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -1811,10 +1811,10 @@ canvas_view_scroll_to_file (NautilusFilesView *view,
 	}
 }
 
-static const char *
+static guint
 nautilus_canvas_view_get_id (NautilusFilesView *view)
 {
-	return NAUTILUS_CANVAS_VIEW_ID;
+	return NAUTILUS_VIEW_GRID_ID;
 }
 
 static void