← Back to branch summary

~ubuntu-branches/ubuntu/saucy/filezilla/saucy-proposed

« back to all changes in this revision

Viewing changes to src/interface/filteredit.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Adrien Cunin
  • Date: 2010-12-12 16:11:49 UTC
  • mfrom: (1.1.27 upstream) (3.2.9 sid)
  • Revision ID: james.westby@ubuntu.com-20101212161149-0tsniecmy8o1f6yc
Tags: 3.3.5.1-1ubuntu1
* Merge from Debian unstable. Remaining changes:
   - 02_use-decimal-si-by-default.patch: by default, display file sizes using
     decimal base and SI units instead of just bytes; complies with Ubuntu
     UnitsPolicy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interface/filteredit.cpp
71
71
        if (!Load(parent, _T("ID_EDITFILTER")))
72
72
                return false;
73
73
 
74
 
        int conditions = filter_name | filter_size | filter_path | filter_meta;
 
74
        int conditions = filter_name | filter_size | filter_path | filter_meta | filter_date;
75
75
        if (has_foreign_type)
76
76
                conditions |= filter_foreign;
77
77
        if (!CreateListControl(conditions))