[nautilus: 2/2] Merge branch 'master' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit 68ff94bb4a1d8e5c5c8347bcff80d271717e42e9
Merge: 82beadcce e874ae706
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Wed Jan 24 17:33:31 2018 +0000

    Merge branch 'master' into 'master'
    
    Add longpress gesture to open context menu
    
    See merge request GNOME/nautilus!40

 src/nautilus-canvas-container.c     |  6 ++---
 src/nautilus-canvas-view.c          | 45 +++++++++++++++++++++++++++++++++----
 src/nautilus-files-view.c           | 15 ++++++++-----
 src/nautilus-files-view.h           |  4 ++--
 src/nautilus-list-view.c            | 38 ++++++++++++++++++++++++++++---
 src/nautilus-pathbar.c              |  4 ++--
 src/nautilus-ui-utilities.c         |  4 ++--
 src/nautilus-ui-utilities.h         |  2 +-
 src/nautilus-view-icon-controller.c |  4 ++--
 9 files changed, 98 insertions(+), 24 deletions(-)
---