diff options
| author | Carlos Soriano <csoriano@gnome.org> | 2015-12-02 18:08:30 +0100 |
|---|---|---|
| committer | Carlos Soriano <csoriano@gnome.org> | 2015-12-02 18:16:19 +0100 |
| commit | 8ed0bdb408a316d41afb7e990637c47972a700c9 (patch) | |
| tree | c59e866fc1e0a9d02696aae42dddfbe71fa069f3 | |
| parent | 27e428f6f5e1273972b578d74e8f8be8b6ed78cb (diff) | |
| download | nautilus-8ed0bdb408a316d41afb7e990637c47972a700c9.tar.gz | |
file: fix previous commit
Conflict resolution in commit e6587b86b4c75 went wrong on my part.
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 811251ddc..075690fcf 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -4712,7 +4712,7 @@ nautilus_file_get_date_as_string (NautilusFile *file, g_date_time_get_day_of_month (now), 0, 1, 0); - days_ago = g_date_time_difference (now, file_date) / G_TIME_SPAN_DAY; + days_ago = g_date_time_difference (today_midnight, file_date) / G_TIME_SPAN_DAY; use_24 = g_settings_get_enum (gnome_interface_preferences, "clock-format") == G_DESKTOP_CLOCK_FORMAT_24H; |