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:08:30 +0100 |
| commit | 40bab95c3f8eb329e95e30db9aa65f45c17deb2e (patch) | |
| tree | 24cb29e0b58f589a5df5dc50dc919d68f83647ce | |
| parent | bfd0b4bf02187b4da6ce0eb7c9a36df5d96ca649 (diff) | |
| download | nautilus-40bab95c3f8eb329e95e30db9aa65f45c17deb2e.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; |