← Back to branch summary

~jeremywootten/pantheon-files/fix-hang-on-large-copy

« back to all changes in this revision

Viewing changes to src/View/PropertiesWindow.vala

  • Committer: Jeremy Wootten
  • Date: 2016-11-13 14:53:43 UTC
  • mfrom: (2367.1.10 pantheon-files)
  • Revision ID: jeremy@elementaryos.org-20161113145343-3wt1dmlgtbxe11zm
Merge trunk to r2377

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/View/PropertiesWindow.vala
516
516
        int n = 4;
517
517
 
518
518
        if (count == 1) {
519
 
            var time_created = file.get_formated_time (FileAttribute.TIME_CREATED);
520
 
            if (time_created != null) {
 
519
            var time_created = PF.FileUtils.get_formatted_time_attribute_from_info (file.info, FileAttribute.TIME_CREATED);
 
520
            if (time_created != "") {
521
521
                var key_label = new KeyLabel (_("Created:"));
522
522
                var value_label = new ValueLabel (time_created);
523
523
                info_grid.attach (key_label, 0, n, 1, 1);
525
525
                n++;
526
526
            }
527
527
 
528
 
            if (file.formated_modified != null) {
 
528
            var time_modified = PF.FileUtils.get_formatted_time_attribute_from_info (file.info, FileAttribute.TIME_MODIFIED);
 
529
            if (time_modified != "") {
529
530
                var key_label = new KeyLabel (_("Modified:"));
530
 
                var value_label = new ValueLabel (file.formated_modified);
531
 
                info_grid.attach (key_label, 0, n, 1, 1);
532
 
                info_grid.attach_next_to (value_label, key_label, Gtk.PositionType.RIGHT, 3, 1);
533
 
                n++;
534
 
            }
535
 
 
536
 
            var time_last_access = file.get_formated_time (FileAttribute.TIME_ACCESS);
537
 
            if (time_last_access != null) {
538
 
                var key_label = new KeyLabel (_("Last Access:"));
539
 
                var value_label = new ValueLabel (time_last_access);
 
531
                var value_label = new ValueLabel (time_modified);
540
532
                info_grid.attach (key_label, 0, n, 1, 1);
541
533
                info_grid.attach_next_to (value_label, key_label, Gtk.PositionType.RIGHT, 3, 1);
542
534
                n++;
544
536
        }
545
537
 
546
538
        if (count == 1 && file.is_trashed ()) {
547
 
            var deletion_date = file.info.get_attribute_as_string ("trash::deletion-date");
548
 
            if (deletion_date != null) {
 
539
            var deletion_date = PF.FileUtils.get_formatted_time_attribute_from_info (file.info, FileAttribute.TRASH_DELETION_DATE);
 
540
            if (deletion_date != "") {
549
541
                var key_label = new KeyLabel (_("Deleted:"));
550
542
                var value_label = new ValueLabel (deletion_date);
551
543
                info_grid.attach (key_label, 0, n, 1, 1);