file: Remove link info attribute

Leftovers from NautilusLink removal.

12 files changed, 13 insertions, 74 deletions

diff --git a/src/nautilus-directory-private.h b/src/nautilus-directory-private.h
index fa6a4a395..fca16f4fc 100644
--- a/src/nautilus-directory-private.h
+++ b/src/nautilus-directory-private.h
@@ -30,7 +30,6 @@
 #include <nautilus-extension.h>
 #include <libxml/tree.h>
 
-typedef struct LinkInfoReadState LinkInfoReadState;
 typedef struct FileMonitors FileMonitors;
 typedef struct DirectoryLoadState DirectoryLoadState;
 typedef struct DirectoryCountState DirectoryCountState;
@@ -43,7 +42,6 @@ typedef struct MountState MountState;
 typedef struct FilesystemInfoState FilesystemInfoState;
 
 typedef enum {
-	REQUEST_LINK_INFO,
 	REQUEST_DEEP_COUNT,
 	REQUEST_DIRECTORY_COUNT,
 	REQUEST_FILE_INFO,
@@ -124,8 +122,6 @@ struct NautilusDirectoryDetails
 	MountState *mount_state;
 
 	FilesystemInfoState *filesystem_info_state;
-	
-	LinkInfoReadState *link_info_read_state;
 
 	GList *file_operations_in_progress; /* list of FileOperation * */
 };
diff --git a/src/nautilus-directory.c b/src/nautilus-directory.c
index 6ab8d400f..959371fea 100644
--- a/src/nautilus-directory.c
+++ b/src/nautilus-directory.c
@@ -1355,7 +1355,6 @@ nautilus_directory_notify_files_changed (GList *files)
              * a changed signal.
              */
             file->details->file_info_is_up_to_date = FALSE;
-            file->details->link_info_is_up_to_date = FALSE;
             nautilus_file_invalidate_extension_info_internal (file);
 
             hash_table_list_prepend (changed_lists, directory, file);
diff --git a/src/nautilus-file-attributes.h b/src/nautilus-file-attributes.h
index 1cbde777c..2e1047b5c 100644
--- a/src/nautilus-file-attributes.h
+++ b/src/nautilus-file-attributes.h
@@ -27,12 +27,11 @@
 
 typedef enum {
 	NAUTILUS_FILE_ATTRIBUTE_INFO = 1 << 0, /* All standard info */
-	NAUTILUS_FILE_ATTRIBUTE_LINK_INFO = 1 << 1, /* info from desktop links */
-	NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS = 1 << 2,
-	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT = 1 << 3,
-	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES = 1 << 4,
-	NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO = 1 << 5,
-	NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 6,
-	NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 7,
-	NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 8,
+	NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS = 1 << 1,
+	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT = 1 << 2,
+	NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES = 1 << 3,
+	NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO = 1 << 4,
+	NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL = 1 << 5,
+	NAUTILUS_FILE_ATTRIBUTE_MOUNT = 1 << 6,
+	NAUTILUS_FILE_ATTRIBUTE_FILESYSTEM_INFO = 1 << 7,
 } NautilusFileAttributes;
diff --git a/src/nautilus-file-private.h b/src/nautilus-file-private.h
index 9a12560c1..321ff9ac5 100644
--- a/src/nautilus-file-private.h
+++ b/src/nautilus-file-private.h
@@ -161,8 +161,6 @@ struct NautilusFileDetails
 
 	eel_boolean_bit mount_is_up_to_date           : 1;
 	
-	eel_boolean_bit got_link_info                 : 1;
-	eel_boolean_bit link_info_is_up_to_date       : 1;
 	eel_boolean_bit got_custom_display_name       : 1;
 	eel_boolean_bit got_custom_activation_uri     : 1;
 
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index eab7e323c..0ec5e3848 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -4564,19 +4564,6 @@ get_mount_icon (NautilusFile *file)
 }
 
 static GIcon *
-get_link_icon (NautilusFile *file)
-{
-    GIcon *icon = NULL;
-
-    if (file->details->got_link_info && file->details->custom_icon != NULL)
-    {
-        icon = g_object_ref (file->details->custom_icon);
-    }
-
-    return icon;
-}
-
-static GIcon *
 get_custom_icon (NautilusFile *file)
 {
     char *custom_icon_uri, *custom_icon_name;
@@ -4618,26 +4605,6 @@ get_custom_icon (NautilusFile *file)
 }
 
 static GIcon *
-get_custom_or_link_icon (NautilusFile *file)
-{
-    GIcon *icon;
-
-    icon = get_custom_icon (file);
-    if (icon != NULL)
-    {
-        return icon;
-    }
-
-    icon = get_link_icon (file);
-    if (icon != NULL)
-    {
-        return icon;
-    }
-
-    return NULL;
-}
-
-static GIcon *
 get_default_file_icon (void)
 {
     static GIcon *fallback_icon = NULL;
@@ -5017,7 +4984,7 @@ nautilus_file_get_gicon (NautilusFile          *file,
         return NULL;
     }
 
-    icon = get_custom_or_link_icon (file);
+    icon = get_custom_icon (file);
     if (icon != NULL)
     {
         return icon;
@@ -5275,7 +5242,7 @@ nautilus_file_get_icon (NautilusFile          *file,
         goto out;
     }
 
-    gicon = get_custom_or_link_icon (file);
+    gicon = get_custom_icon (file);
     if (gicon != NULL)
     {
         icon = nautilus_icon_info_lookup (gicon, size, scale);
@@ -8483,12 +8450,6 @@ invalidate_file_info (NautilusFile *file)
 }
 
 static void
-invalidate_link_info (NautilusFile *file)
-{
-    file->details->link_info_is_up_to_date = FALSE;
-}
-
-static void
 invalidate_thumbnail (NautilusFile *file)
 {
     file->details->thumbnail_is_up_to_date = FALSE;
@@ -8541,10 +8502,6 @@ nautilus_file_invalidate_attributes_internal (NautilusFile           *file,
     {
         invalidate_file_info (file);
     }
-    if (REQUEST_WANTS_TYPE (request, REQUEST_LINK_INFO))
-    {
-        invalidate_link_info (file);
-    }
     if (REQUEST_WANTS_TYPE (request, REQUEST_EXTENSION_INFO))
     {
         nautilus_file_invalidate_extension_info_internal (file);
@@ -8609,7 +8566,6 @@ NautilusFileAttributes
 nautilus_file_get_all_attributes (void)
 {
     return NAUTILUS_FILE_ATTRIBUTE_INFO |
-           NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
            NAUTILUS_FILE_ATTRIBUTE_DEEP_COUNTS |
            NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
            NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_MIME_TYPES |
diff --git a/src/nautilus-file.h b/src/nautilus-file.h
index 075a8e8c2..0e22efd0e 100644
--- a/src/nautilus-file.h
+++ b/src/nautilus-file.h
@@ -122,7 +122,7 @@ typedef void (*NautilusFileOperationCallback) (NautilusFile  *file,
 					       gpointer       callback_data);
 
 
-#define NAUTILUS_FILE_ATTRIBUTES_FOR_ICON (NAUTILUS_FILE_ATTRIBUTE_INFO | NAUTILUS_FILE_ATTRIBUTE_LINK_INFO | NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL)
+#define NAUTILUS_FILE_ATTRIBUTES_FOR_ICON (NAUTILUS_FILE_ATTRIBUTE_INFO | NAUTILUS_FILE_ATTRIBUTE_THUMBNAIL)
 
 typedef void NautilusFileListHandle;
 
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 968a2fed0..5b6aae8ff 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -4526,7 +4526,6 @@ nautilus_files_view_add_subdirectory (NautilusFilesView *view,
         NAUTILUS_FILE_ATTRIBUTES_FOR_ICON |
         NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
         NAUTILUS_FILE_ATTRIBUTE_INFO |
-        NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
         NAUTILUS_FILE_ATTRIBUTE_MOUNT |
         NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
@@ -8425,7 +8424,6 @@ finish_loading (NautilusFilesView *view)
         NAUTILUS_FILE_ATTRIBUTES_FOR_ICON |
         NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
         NAUTILUS_FILE_ATTRIBUTE_INFO |
-        NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
         NAUTILUS_FILE_ATTRIBUTE_MOUNT |
         NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;
 
diff --git a/src/nautilus-mime-actions.c b/src/nautilus-mime-actions.c
index 203635070..f83253e95 100644
--- a/src/nautilus-mime-actions.c
+++ b/src/nautilus-mime-actions.c
@@ -372,8 +372,7 @@ nautilus_mime_actions_check_if_required_attributes_ready (NautilusFile *file)
 NautilusFileAttributes
 nautilus_mime_actions_get_required_file_attributes (void)
 {
-    return NAUTILUS_FILE_ATTRIBUTE_INFO |
-           NAUTILUS_FILE_ATTRIBUTE_LINK_INFO;
+    return NAUTILUS_FILE_ATTRIBUTE_INFO;
 }
 
 GAppInfo *
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 6d75e69c3..08348fd68 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -5027,8 +5027,7 @@ create_properties_window (StartupData *startup_data)
 
         attributes =
             NAUTILUS_FILE_ATTRIBUTES_FOR_ICON |
-            NAUTILUS_FILE_ATTRIBUTE_INFO |
-            NAUTILUS_FILE_ATTRIBUTE_LINK_INFO;
+            NAUTILUS_FILE_ATTRIBUTE_INFO;
 
         nautilus_file_monitor_add (file,
                                    &window->details->original_files,
diff --git a/src/nautilus-search-directory-file.c b/src/nautilus-search-directory-file.c
index 7f517843c..48b74dec6 100644
--- a/src/nautilus-search-directory-file.c
+++ b/src/nautilus-search-directory-file.c
@@ -265,8 +265,6 @@ nautilus_search_directory_file_init (NautilusSearchDirectoryFile *search_file)
 
     file->details->custom_icon = NULL;
     file->details->activation_uri = NULL;
-    file->details->got_link_info = TRUE;
-    file->details->link_info_is_up_to_date = TRUE;
 
     file->details->directory_count = 0;
     file->details->got_directory_count = TRUE;
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 511043551..1b5dd1a90 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -1386,9 +1386,7 @@ nautilus_window_slot_set_viewed_file (NautilusWindowSlot *self,
 
     if (file != NULL)
     {
-        attributes =
-            NAUTILUS_FILE_ATTRIBUTE_INFO |
-            NAUTILUS_FILE_ATTRIBUTE_LINK_INFO;
+        attributes = NAUTILUS_FILE_ATTRIBUTE_INFO;
         nautilus_file_monitor_add (file, self, attributes);
 
         g_signal_connect_object (file, "changed",
diff --git a/test/automated/display/test-nautilus-directory-async.c b/test/automated/display/test-nautilus-directory-async.c
index 804c443cc..281dccc32 100644
--- a/test/automated/display/test-nautilus-directory-async.c
+++ b/test/automated/display/test-nautilus-directory-async.c
@@ -85,7 +85,6 @@ main (int    argc,
         NAUTILUS_FILE_ATTRIBUTES_FOR_ICON |
         NAUTILUS_FILE_ATTRIBUTE_DIRECTORY_ITEM_COUNT |
         NAUTILUS_FILE_ATTRIBUTE_INFO |
-        NAUTILUS_FILE_ATTRIBUTE_LINK_INFO |
         NAUTILUS_FILE_ATTRIBUTE_MOUNT |
         NAUTILUS_FILE_ATTRIBUTE_EXTENSION_INFO;