[nautilus: 2/3] Merge remote-tracking branch 'upstream/master'

[Carlos Soriano <csoriano src gnome org>]

commit 1f4bd55d1b9d5f701f2df8d1be7466df85a8669a
Merge: 77bc49d1d a4c27ad2b
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Mon Apr 23 13:03:21 2018 -0400

    Merge remote-tracking branch 'upstream/master'

 src/nautilus-application.c              |  2 +-
 src/nautilus-error-reporting.c          | 16 +++++++----
 src/nautilus-file-operations.c          | 14 ++++++----
 src/nautilus-file-utilities.c           |  9 +++---
 src/nautilus-files-view-dnd.c           | 23 +++++++++-------
 src/nautilus-files-view.c               | 31 +++++++++++++--------
 src/nautilus-mime-actions.c             | 23 +++++++++++-----
 src/nautilus-mime-application-chooser.c | 21 ++++++++------
 src/nautilus-program-choosing.c         | 39 ++++++++++++++------------
 src/nautilus-properties-window.c        | 28 +++++++++++--------
 src/nautilus-ui-utilities.c             |  9 +++---
 src/nautilus-ui-utilities.h             | 49 +++++++++++++++++----------------
 src/nautilus-window-slot.c              |  2 +-
 src/nautilus-window.c                   |  2 +-
 14 files changed, 155 insertions(+), 113 deletions(-)
---