Remove all traces of former nautilus metadata code

6 files changed, 5 insertions, 10 deletions

diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 129069b78..ee5fde533 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -3190,7 +3190,6 @@ fm_directory_view_add_subdirectory (FMDirectoryView  *view,
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
 		NAUTILUS_FILE_ATTRIBUTE_INFO |
 		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA |
 		NAUTILUS_FILE_ATTRIBUTE_MOUNT |
 		NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
@@ -8940,7 +8939,6 @@ finish_loading (FMDirectoryView *view)
 		NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
 		NAUTILUS_FILE_ATTRIBUTE_INFO |
 		NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
-		NAUTILUS_FILE_ATTRIBUTE_METADATA |
 		NAUTILUS_FILE_ATTRIBUTE_MOUNT |
 		NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index 9e17290d5..c867bc2e2 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -5160,7 +5160,7 @@ create_properties_window (StartupData *startup_data)
 			attributes |= NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS;
 		}
 		
-		attributes |= NAUTILUS_FILE_ATTRIBUTE_METADATA;
+		attributes |= NAUTILUS_FILE_ATTRIBUTE_INFO;
 		nautilus_file_monitor_add (file, &window->details->target_files, attributes);
 	}	
 		
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index a64fbf4a7..6bfb584fc 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -46,7 +46,6 @@
 #include <glib/gi18n.h>
 #include <gio/gdesktopappinfo.h>
 #include <libnautilus-private/nautilus-debug-log.h>
-#include <libnautilus-private/nautilus-directory-metafile.h>
 #include <libnautilus-private/nautilus-global-preferences.h>
 #include <libnautilus-private/nautilus-lib-self-check-functions.h>
 #include <libnautilus-private/nautilus-icon-names.h>
diff --git a/src/nautilus-notes-viewer.c b/src/nautilus-notes-viewer.c
index 894dc2d71..15717f7e5 100644
--- a/src/nautilus-notes-viewer.c
+++ b/src/nautilus-notes-viewer.c
@@ -264,7 +264,7 @@ notes_load_metainfo (NautilusNotesViewer *notes)
 		return;
         }
 
-        attributes = NAUTILUS_FILE_ATTRIBUTE_METADATA;
+        attributes = NAUTILUS_FILE_ATTRIBUTE_INFO;
         nautilus_file_monitor_add (notes->details->file, notes, attributes);
 
 	if (nautilus_file_check_if_ready (notes->details->file, attributes)) {
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 2c9b081bd..57476e65a 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -562,7 +562,7 @@ monitor_add (NautilusSidebarTitle *sidebar_title)
 
 	sidebar_title->details->monitoring_count = item_count_ready (sidebar_title);
 
-	attributes = NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | NAUTILUS_FILE_ATTRIBUTE_METADATA;
+	attributes = NAUTILUS_FILE_ATTRIBUTES_FOR_ICON | NAUTILUS_FILE_ATTRIBUTE_INFO;
 	if (sidebar_title->details->monitoring_count) {
 		attributes |= NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT;
 	}
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 98a95eeed..b84bb1542 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -870,8 +870,7 @@ begin_location_change (NautilusWindowSlot *slot,
 
 	nautilus_file_call_when_ready (slot->determine_view_file,
 				       NAUTILUS_FILE_ATTRIBUTE_INFO |
-				       NAUTILUS_FILE_ATTRIBUTE_MOUNT |
-				       NAUTILUS_FILE_ATTRIBUTE_METADATA,
+				       NAUTILUS_FILE_ATTRIBUTE_MOUNT,
                                        got_file_info_for_view_selection_callback,
 				       slot);
 
@@ -1001,8 +1000,7 @@ mount_not_mounted_callback (GObject *source_object,
 	} else {
 		nautilus_file_invalidate_all_attributes (slot->determine_view_file);
 		nautilus_file_call_when_ready (slot->determine_view_file,
-					       NAUTILUS_FILE_ATTRIBUTE_INFO |
-					       NAUTILUS_FILE_ATTRIBUTE_METADATA,
+					       NAUTILUS_FILE_ATTRIBUTE_INFO,
 					       got_file_info_for_view_selection_callback,
 					       slot);
 	}