gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove ctime and date_permissions

Browse source 
These are unreliable or unset
This commit is contained in:
William Jon McCann 2012-08-01 12:21:15 +02:00
parent 0a8a2781f2
commit 1960b73460
6 changed files with 11 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,7 +79,6 @@ struct NautilusFileDetails
time_t atime; /* 0 is unknown */
time_t mtime; /* 0 is unknown */
time_t ctime; /* 0 is unknown */
char *symlink_name;

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

@ -130,13 +130,9 @@ static GQuark attribute_name_q,
attribute_deep_file_count_q,
attribute_deep_directory_count_q,
attribute_deep_total_count_q,
attribute_date_changed_q,
attribute_date_changed_full_q,
attribute_trashed_on_q,
attribute_trashed_on_full_q,
attribute_trash_orig_path_q,
attribute_date_permissions_q,
attribute_date_permissions_full_q,
attribute_permissions_q,
attribute_selinux_context_q,
attribute_octal_permissions_q,
@ -473,7 +469,6 @@ nautilus_file_clear_info (NautilusFile *file)
file->details->sort_order = 0;
file->details->mtime = 0;
file->details->atime = 0;
file->details->ctime = 0;
file->details->trash_time = 0;
g_free (file->details->symlink_name);
file->details->symlink_name = NULL;
@ -2096,7 +2091,7 @@ update_info_internal (NautilusFile *file,
int uid, gid;
goffset size;
int sort_order;
time_t atime, mtime, ctime;
time_t atime, mtime;
time_t trash_time;
GTimeVal g_trash_time;
const char * time_string;
@ -2377,11 +2372,9 @@ update_info_internal (NautilusFile *file,
file->details->sort_order = sort_order;
atime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_ACCESS);
ctime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CHANGED);
mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
if (file->details->atime != atime ||
file->details->mtime != mtime ||
file->details->ctime != ctime) {
file->details->mtime != mtime) {
if (file->details->thumbnail == NULL) {
file->details->thumbnail_is_up_to_date = FALSE;
}
@ -2389,7 +2382,6 @@ update_info_internal (NautilusFile *file,
changed = TRUE;
}
file->details->atime = atime;
file->details->ctime = ctime;
file->details->mtime = mtime;
if (file->details->thumbnail != NULL &&
@ -4295,11 +4287,10 @@ nautilus_file_get_date (NautilusFile *file,
*date = 0;
}
g_return_val_if_fail (date_type == NAUTILUS_DATE_TYPE_CHANGED
|| date_type == NAUTILUS_DATE_TYPE_ACCESSED
g_return_val_if_fail (date_type == NAUTILUS_DATE_TYPE_ACCESSED
|| date_type == NAUTILUS_DATE_TYPE_MODIFIED
|| date_type == NAUTILUS_DATE_TYPE_TRASHED
|| date_type == NAUTILUS_DATE_TYPE_PERMISSIONS_CHANGED, FALSE);
|| date_type == NAUTILUS_DATE_TYPE_TRASHED,
FALSE);
if (file == NULL) {
return FALSE;
@ -5852,9 +5843,9 @@ nautilus_file_get_deep_directory_count_as_string (NautilusFile *file)
* @file: NautilusFile representing the file in question.
* @attribute_name: The name of the desired attribute. The currently supported
* set includes "name", "type", "mime_type", "size", "deep_size", "deep_directory_count",
* "deep_file_count", "deep_total_count", "date_modified", "date_changed", "date_accessed",
* "date_permissions", "date_modified_full", "date_changed_full", "date_accessed_full",
* "date_permissions_full", "owner", "group", "permissions", "octal_permissions", "uri", "where",
* "deep_file_count", "deep_total_count", "date_modified", "date_accessed",
* "date_modified_full", "date_accessed_full",
* "owner", "group", "permissions", "octal_permissions", "uri", "where",
* "link_target", "volume", "free_space", "selinux_context", "trashed_on", "trashed_on_full", "trashed_orig_path"
*
* Returns: Newly allocated string ready to display to the user, or NULL
@ -5906,16 +5897,6 @@ nautilus_file_get_string_attribute_q (NautilusFile *file, GQuark attribute_q)
NAUTILUS_DATE_TYPE_MODIFIED,
FALSE);
}
if (attribute_q == attribute_date_changed_q) {
return nautilus_file_get_date_as_string (file,
NAUTILUS_DATE_TYPE_CHANGED,
TRUE);
}
if (attribute_q == attribute_date_changed_full_q) {
return nautilus_file_get_date_as_string (file,
NAUTILUS_DATE_TYPE_CHANGED,
FALSE);
}
if (attribute_q == attribute_date_accessed_q) {
return nautilus_file_get_date_as_string (file,
NAUTILUS_DATE_TYPE_ACCESSED,
@ -5936,16 +5917,6 @@ nautilus_file_get_string_attribute_q (NautilusFile *file, GQuark attribute_q)
NAUTILUS_DATE_TYPE_TRASHED,
FALSE);
}
if (attribute_q == attribute_date_permissions_q) {
return nautilus_file_get_date_as_string (file,
NAUTILUS_DATE_TYPE_PERMISSIONS_CHANGED,
TRUE);
}
if (attribute_q == attribute_date_permissions_full_q) {
return nautilus_file_get_date_as_string (file,
NAUTILUS_DATE_TYPE_PERMISSIONS_CHANGED,
FALSE);
}
if (attribute_q == attribute_permissions_q) {
return nautilus_file_get_permissions_as_string (file);
}
@ -6097,12 +6068,8 @@ nautilus_file_is_date_sort_attribute_q (GQuark attribute_q)
attribute_q == attribute_accessed_date_q ||
attribute_q == attribute_date_accessed_q ||
attribute_q == attribute_date_accessed_full_q ||
attribute_q == attribute_date_changed_q ||
attribute_q == attribute_date_changed_full_q ||
attribute_q == attribute_trashed_on_q ||
attribute_q == attribute_trashed_on_full_q ||
attribute_q == attribute_date_permissions_q ||
attribute_q == attribute_date_permissions_full_q) {
attribute_q == attribute_trashed_on_full_q) {
return TRUE;
}
@ -7902,13 +7869,9 @@ nautilus_file_class_init (NautilusFileClass *class)
attribute_deep_file_count_q = g_quark_from_static_string ("deep_file_count");
attribute_deep_directory_count_q = g_quark_from_static_string ("deep_directory_count");
attribute_deep_total_count_q = g_quark_from_static_string ("deep_total_count");
attribute_date_changed_q = g_quark_from_static_string ("date_changed");
attribute_date_changed_full_q = g_quark_from_static_string ("date_changed_full");
attribute_trashed_on_q = g_quark_from_static_string ("trashed_on");
attribute_trashed_on_full_q = g_quark_from_static_string ("trashed_on_full");
attribute_trash_orig_path_q = g_quark_from_static_string ("trash_orig_path");
attribute_date_permissions_q = g_quark_from_static_string ("date_permissions");
attribute_date_permissions_full_q = g_quark_from_static_string ("date_permissions_full");
attribute_permissions_q = g_quark_from_static_string ("permissions");
attribute_selinux_context_q = g_quark_from_static_string ("selinux_context");
attribute_octal_permissions_q = g_quark_from_static_string ("octal_permissions");

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

@ -472,9 +472,7 @@ struct NautilusFile {
*/
typedef enum {
NAUTILUS_DATE_TYPE_MODIFIED,
NAUTILUS_DATE_TYPE_CHANGED,
NAUTILUS_DATE_TYPE_ACCESSED,
NAUTILUS_DATE_TYPE_PERMISSIONS_CHANGED,
NAUTILUS_DATE_TYPE_TRASHED
} NautilusDateType;

26
libnautilus-private/nautilus-vfs-file.c
View file

@ -277,15 +277,6 @@ vfs_file_get_date (NautilusFile *file,
time_t *date)
{
switch (date_type) {
case NAUTILUS_DATE_TYPE_CHANGED:
/* Before we have info on a file, the date is unknown. */
if (file->details->ctime == 0) {
return FALSE;
}
if (date != NULL) {
*date = file->details->ctime;
}
return TRUE;
case NAUTILUS_DATE_TYPE_ACCESSED:
/* Before we have info on a file, the date is unknown. */
if (file->details->atime == 0) {
@ -313,23 +304,6 @@ vfs_file_get_date (NautilusFile *file,
*date = file->details->trash_time;
}
return TRUE;
case NAUTILUS_DATE_TYPE_PERMISSIONS_CHANGED:
/* Before we have info on a file, the date is unknown. */
if (file->details->mtime == 0 || file->details->ctime == 0) {
return FALSE;
}
/* mtime is when the contents changed; ctime is when the
* contents or the permissions (inc. owner/group) changed.
* So we can only know when the permissions changed if mtime
* and ctime are different.
*/
if (file->details->mtime == file->details->ctime) {
return FALSE;
}
if (date != NULL) {
*date = file->details->ctime;
}
return TRUE;
}
return FALSE;
}

2
libnautilus-private/org.gnome.nautilus.gschema.xml.in
View file

@ -189,7 +189,7 @@
<_description>A list of captions below an icon in the icon view and
the desktop. The actual number of captions shown depends on
the zoom level. Some possible values are:
"size", "type", "date_modified", "date_changed", "owner",
"size", "type", "date_modified", "owner",
"group", "permissions", "octal_permissions" and "mime_type".</_description>
</key>
<key name="default-zoom-level" enum="org.gnome.nautilus.ZoomLevel">

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

@ -4507,11 +4507,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
"selinux_context", INCONSISTENT_STATE_STRING,
FALSE);
#endif
append_title_value_pair
(window, page_grid, _("Last changed:"),
"date_permissions", INCONSISTENT_STATE_STRING,
FALSE);
if (window->details->has_recursive_apply) {
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (hbox);