← Back to branch summary

~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1

« back to all changes in this revision

Viewing changes to libcore/FileUtils.vala

  • Committer: Jeremy Wootten
  • Date: 2017-01-13 13:31:06 UTC
  • mfrom: (2412.1.32 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20170113133106-v9l164ms13lh3p0a
Merge trunk to r2444 and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
libcore/FileUtils.vala
1
1
/***
2
 
    Copyright (c) 2015-2016 elementary LLC (http://launchpad.net/elementary)
 
2
    Copyright (c) 2015-2017 elementary LLC (http://launchpad.net/elementary)
3
3
 
4
4
    This program is free software: you can redistribute it and/or modify it
5
5
    under the terms of the GNU Lesser General Public License version 3, as published
423
423
        int now_day = now.get_day_of_year ();
424
424
        int disp_day = dt.get_day_of_year ();
425
425
 
426
 
        if (disp_day < now_day - 7) {
 
426
        if (disp_day < now_day - 6) {
427
427
            return dt.format (default_date_format);
428
428
        }
429
429