gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-13 04:51:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use home icon for homedir. Patch from Anders Carlsson <andersca@gnome.org>

Browse source 
2004-10-11  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-file-utilities.[ch]:
	* libnautilus-private/nautilus-file.[ch]:
	* libnautilus-private/nautilus-icon-factory.c:
	Use home icon for homedir.
	Patch from Anders Carlsson  <andersca@gnome.org>
This commit is contained in:
Alexander Larsson 2004-10-11 12:55:13 +00:00 committed by Alexander Larsson
parent 41570f919b
commit dcb38e46ca
6 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2004-10-11 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-file-utilities.[ch]:
* libnautilus-private/nautilus-file.[ch]:
* libnautilus-private/nautilus-icon-factory.c:
Use home icon for homedir.
Patch from Anders Carlsson <andersca@gnome.org>
2004-10-11 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-list-view.c (fm_list_view_start_renaming_file):

24
libnautilus-private/nautilus-file-utilities.c
View file

@ -235,6 +235,30 @@ update_desktop_dir (void)
gnome_vfs_uri_unref (vfs_uri);
}
gboolean
nautilus_is_home_directory_file_escaped (char *escaped_dirname,
char *escaped_file)
{
static char *escaped_home_dir_dirname = NULL;
static char *escaped_home_dir_filename = NULL;
char *uri;
GnomeVFSURI *vfs_uri;
if (escaped_home_dir_dirname == NULL) {
uri = gnome_vfs_get_uri_from_local_path (g_get_home_dir ());
vfs_uri = gnome_vfs_uri_new (uri);
g_free (uri);
escaped_home_dir_filename = gnome_vfs_uri_extract_short_path_name (vfs_uri);
escaped_home_dir_dirname = gnome_vfs_uri_extract_dirname (vfs_uri);
gnome_vfs_uri_unref (vfs_uri);
}
return (strcmp (escaped_dirname, escaped_home_dir_dirname) == 0 &&
strcmp (escaped_file, escaped_home_dir_filename) == 0);
}
gboolean
nautilus_is_desktop_directory_file_escaped (char *escaped_dirname,
char *escaped_file)

2
libnautilus-private/nautilus-file-utilities.h
View file

@ -40,6 +40,8 @@ char * nautilus_get_desktop_directory_uri (void);
gboolean nautilus_is_desktop_directory_file_escaped (char *escaped_dirname,
char *escaped_filename);
gboolean nautilus_is_desktop_directory_escaped (char *escaped_dir);
gboolean nautilus_is_home_directory_file_escaped (char *escaped_dirname,
char *escaped_file);
char * nautilus_get_gmc_desktop_directory (void);
char * nautilus_get_pixmap_directory (void);

16
libnautilus-private/nautilus-file.c
View file

@ -2406,6 +2406,22 @@ nautilus_file_should_show (NautilusFile *file,
}
gboolean
nautilus_file_is_home (NautilusFile *file)
{
GnomeVFSURI *dir_vfs_uri;
dir_vfs_uri = file->details->directory->details->vfs_uri;
if (dir_vfs_uri == NULL ||
strcmp (dir_vfs_uri->method_string, "file") != 0) {
return FALSE;
}
return nautilus_is_home_directory_file_escaped (dir_vfs_uri->text,
file->details->relative_uri);
}
gboolean
nautilus_file_is_in_desktop (NautilusFile *file)
{

1
libnautilus-private/nautilus-file.h
View file

@ -153,6 +153,7 @@ gboolean nautilus_file_is_executable (Nautilu
gboolean nautilus_file_is_directory (NautilusFile *file);
gboolean nautilus_file_is_in_trash (NautilusFile *file);
gboolean nautilus_file_is_in_desktop (NautilusFile *file);
gboolean nautilus_file_is_home (NautilusFile *file);
GnomeVFSResult nautilus_file_get_file_info_result (NautilusFile *file);
gboolean nautilus_file_get_directory_item_count (NautilusFile *file,
guint *count,

7
libnautilus-private/nautilus-icon-factory.c
View file

@ -70,6 +70,7 @@
#define ICON_NAME_THUMBNAIL_LOADING "gnome-fs-loading-icon"
#define ICON_NAME_TRASH_EMPTY "gnome-fs-trash-empty"
#define ICON_NAME_TRASH_FULL "gnome-fs-trash-full"
#define ICON_NAME_HOME "gnome-fs-home"
#define NAUTILUS_EMBLEM_NAME_PREFIX "emblem-"
@ -835,7 +836,11 @@ nautilus_icon_factory_get_icon_for_file (NautilusFile *file, gboolean embedd_tex
return g_strdup (nautilus_trash_monitor_is_empty ()
? ICON_NAME_TRASH_EMPTY : ICON_NAME_TRASH_FULL);
}
if (nautilus_file_is_home (file)) {
return g_strdup (ICON_NAME_HOME);
}
mime_type = nautilus_file_get_mime_type (file);
file_info = nautilus_file_peek_vfs_file_info (file);