[nautilus] slot: remove unused cases for NautilusLocationChangeType

[Cosimo Cecchi <cosimoc src gnome org>]

commit 115c960e939a1c1fa6db97a105fe92d0b70ecde8
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jan 9 08:03:35 2012 +0100

    slot: remove unused cases for NautilusLocationChangeType

 src/nautilus-window-manage-views.c |   27 ++++++++++-----------------
 src/nautilus-window-slot.h         |    4 +---
 2 files changed, 11 insertions(+), 20 deletions(-)
---
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index b5bebca..2720ce4 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -356,7 +356,6 @@ update_history (NautilusWindowSlot *slot,
 {
         switch (type) {
         case NAUTILUS_LOCATION_CHANGE_STANDARD:
-        case NAUTILUS_LOCATION_CHANGE_FALLBACK:
 		handle_go_elsewhere (slot, new_location);
                 return;
         case NAUTILUS_LOCATION_CHANGE_RELOAD:
@@ -368,9 +367,6 @@ update_history (NautilusWindowSlot *slot,
         case NAUTILUS_LOCATION_CHANGE_FORWARD:
                 handle_go_forward (slot, new_location);
                 return;
-        case NAUTILUS_LOCATION_CHANGE_REDIRECT:
-                /* for the redirect case, the caller can do the updating */
-                return;
         }
 	g_return_if_fail (FALSE);
 }
@@ -837,19 +833,16 @@ got_file_info_for_view_selection_callback (NautilusFile *file,
 
 		mimetype = nautilus_file_get_mime_type (file);
 
-		/* If fallback, don't use view from metadata */
-		if (slot->location_change_type != NAUTILUS_LOCATION_CHANGE_FALLBACK) {
-			/* Look in metadata for view */
-			view_id = nautilus_file_get_metadata 
-				(file, NAUTILUS_METADATA_KEY_DEFAULT_VIEW, NULL);
-			if (view_id != NULL && 
-			    !nautilus_view_factory_view_supports_uri (view_id,
-								      location,
-								      nautilus_file_get_file_type (file),
-								      mimetype)) {
-				g_free (view_id);
-				view_id = NULL;
-			}
+		/* Look in metadata for view */
+		view_id = nautilus_file_get_metadata 
+			(file, NAUTILUS_METADATA_KEY_DEFAULT_VIEW, NULL);
+		if (view_id != NULL && 
+		    !nautilus_view_factory_view_supports_uri (view_id,
+							      location,
+							      nautilus_file_get_file_type (file),
+							      mimetype)) {
+			g_free (view_id);
+			view_id = NULL;
 		}
 
 		/* Otherwise, use default */
diff --git a/src/nautilus-window-slot.h b/src/nautilus-window-slot.h
index 9d96f15..11faeda 100644
--- a/src/nautilus-window-slot.h
+++ b/src/nautilus-window-slot.h
@@ -40,9 +40,7 @@ typedef enum {
 	NAUTILUS_LOCATION_CHANGE_STANDARD,
 	NAUTILUS_LOCATION_CHANGE_BACK,
 	NAUTILUS_LOCATION_CHANGE_FORWARD,
-	NAUTILUS_LOCATION_CHANGE_RELOAD,
-	NAUTILUS_LOCATION_CHANGE_REDIRECT,
-	NAUTILUS_LOCATION_CHANGE_FALLBACK
+	NAUTILUS_LOCATION_CHANGE_RELOAD
 } NautilusLocationChangeType;
 
 struct NautilusWindowSlotClass {