gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-29 20:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

file: Make get_where_string() non-polymorphic

Browse source 
Similarly to .get_date(), addressed by the previous commit, this has
been added for the sake of NautilusTrashFile[0] for it to say it lives:

   "on the desktop"

We have no desktop anymore. NautilusSearchDirectoryFile is not on
desktop nor in any view, and it doesn't have a parent, so it doesn't
need this either.

[0] commit d23bb1b5be
This commit is contained in:
António Fernandes 2024-05-25 20:50:04 +01:00
parent ce35cd2441
commit 6d47fce9c9
4 changed files with 15 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/nautilus-file.c
View file

@ -990,7 +990,7 @@ nautilus_file_unref (NautilusFile *file)
* and adding trailing slash).
* If the parent is NULL, returns the empty string.
*/
char *
static char *
nautilus_file_get_parent_uri_for_display (NautilusFile *file)
{
g_autoptr (GFile) parent = NULL;
@ -4984,7 +4984,20 @@ nautilus_file_get_where_string (NautilusFile *file)
g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
return NAUTILUS_FILE_CLASS (G_OBJECT_GET_CLASS (file))->get_where_string (file);
g_autoptr (NautilusFile) real_file = NULL;
if (nautilus_file_is_in_recent (file))
{
g_autoptr (GFile) activation_location = nautilus_file_get_activation_location (file);
real_file = nautilus_file_get (activation_location);
}
else
{
real_file = g_object_ref (file);
}
return nautilus_file_get_parent_uri_for_display (real_file);
}
static char *

2
src/nautilus-file.h
View file

@ -163,7 +163,6 @@ char * nautilus_file_get_uri_scheme (Nautilu
NautilusFile * nautilus_file_get_parent (NautilusFile *file);
GFile * nautilus_file_get_parent_location (NautilusFile *file);
char * nautilus_file_get_parent_uri (NautilusFile *file);
char * nautilus_file_get_parent_uri_for_display (NautilusFile *file);
const char * nautilus_file_get_thumbnail_path (NautilusFile *file);
gboolean nautilus_file_can_get_size (NautilusFile *file);
guint64 nautilus_file_get_size (NautilusFile *file);
@ -523,7 +522,6 @@ typedef struct {
guint *file_count,
guint *unreadable_directory_count,
goffset *total_size);
char * (* get_where_string) (NautilusFile *file);
void (* set_metadata) (NautilusFile *file,
const char *key,

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

@ -171,12 +171,6 @@ search_directory_file_get_deep_counts (NautilusFile *file,
return NAUTILUS_REQUEST_DONE;
}
static char *
search_directory_file_get_where_string (NautilusFile *file)
{
return g_strdup (_("Search"));
}
static void
search_directory_file_set_metadata (NautilusFile *file,
const char *key,
@ -303,7 +297,6 @@ nautilus_search_directory_file_class_init (NautilusSearchDirectoryFileClass *kla
file_class->check_if_ready = search_directory_file_check_if_ready;
file_class->get_item_count = search_directory_file_get_item_count;
file_class->get_deep_counts = search_directory_file_get_deep_counts;
file_class->get_where_string = search_directory_file_get_where_string;
file_class->set_metadata = search_directory_file_set_metadata;
file_class->set_metadata_as_list = search_directory_file_set_metadata_as_list;
}

25
src/nautilus-vfs-file.c
View file

@ -223,30 +223,6 @@ vfs_file_set_metadata_as_list (NautilusFile *file,
nautilus_file_ref (file));
}
static char *
vfs_file_get_where_string (NautilusFile *file)
{
GFile *activation_location;
NautilusFile *location;
char *where_string;
if (!nautilus_file_is_in_recent (file))
{
location = nautilus_file_ref (file);
}
else
{
activation_location = nautilus_file_get_activation_location (file);
location = nautilus_file_get (activation_location);
g_object_unref (activation_location);
}
where_string = nautilus_file_get_parent_uri_for_display (location);
nautilus_file_unref (location);
return where_string;
}
static void
vfs_file_mount_callback (GObject *source_object,
GAsyncResult *res,
@ -627,7 +603,6 @@ nautilus_vfs_file_class_init (NautilusVFSFileClass *klass)
file_class->call_when_ready = vfs_file_call_when_ready;
file_class->cancel_call_when_ready = vfs_file_cancel_call_when_ready;
file_class->check_if_ready = vfs_file_check_if_ready;
file_class->get_where_string = vfs_file_get_where_string;
file_class->set_metadata = vfs_file_set_metadata;
file_class->set_metadata_as_list = vfs_file_set_metadata_as_list;
file_class->mount = vfs_file_mount;