[nautilus/gnome-3-18] file: fix previous commit
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/gnome-3-18] file: fix previous commit
- Date: Wed, 2 Dec 2015 17:16:36 +0000 (UTC)
commit 8ed0bdb408a316d41afb7e990637c47972a700c9
Author: Carlos Soriano <csoriano gnome org>
Date: Wed Dec 2 18:08:30 2015 +0100
file: fix previous commit
Conflict resolution in commit e6587b86b4c75 went wrong on my part.
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 811251d..075690f 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]