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

[António Fernandes <antoniof src gnome org>]

commit 204844a4fdf4c915243ca23c7a9e05f9343a5138
Merge: c6b4859a6 e01a8497e
Author: António Fernandes <antoniojpfernandes gmail com>
Date:   Sat Jan 13 21:58:59 2018 +0000

    Merge branch 'my_work' into 'master'
    
    Issue- -Wincompatible-pointer-types warning
    
    Closes #192
    
    See merge request GNOME/nautilus!59

 src/nautilus-file.c                  | 2 +-
 src/nautilus-files-view.c            | 4 ++--
 src/nautilus-progress-info-manager.c | 2 +-
 src/nautilus-properties-window.c     | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
---