gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-10-05 23:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

file: Remove link info attribute

Browse source 
Leftovers from NautilusLink removal.
This commit is contained in:
António Fernandes 2018-05-14 00:17:08 +01:00
parent 857f65bdb3
commit 694e4396c7
12 changed files with 13 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nautilus-directory-private.h
View file

@ -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 * */
};

1
src/nautilus-directory.c
View file

@ -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);

15
src/nautilus-file-attributes.h
View file

@ -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;

2
src/nautilus-file-private.h
View file

@ -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;

48
src/nautilus-file.c
View file

@ -4563,19 +4563,6 @@ get_mount_icon (NautilusFile *file)
return mount_icon;
}
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)
{
@ -4617,26 +4604,6 @@ get_custom_icon (NautilusFile *file)
return icon;
}
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)
{
@ -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);
@ -8482,12 +8449,6 @@ invalidate_file_info (NautilusFile *file)
file->details->file_info_is_up_to_date = FALSE;
}
static void
invalidate_link_info (NautilusFile *file)
{
file->details->link_info_is_up_to_date = FALSE;
}
static void
invalidate_thumbnail (NautilusFile *file)
{
@ -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 |

2
src/nautilus-file.h
View file

@ -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;

2
src/nautilus-files-view.c
View file

@ -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;

3
src/nautilus-mime-actions.c
View file

@ -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 *

3
src/nautilus-properties-window.c
View file

@ -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,

2
src/nautilus-search-directory-file.c
View file

@ -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;

4
src/nautilus-window-slot.c
View file

@ -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",

1
test/automated/display/test-nautilus-directory-async.c
View file

@ -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;