[nautilus: 2/2] Merge branch 'issue-331' into 'master'

[Carlos Soriano <csoriano src gnome org>]

commit a34319fe3770cc657ed22d5d76f886aaae197c00
Merge: 85715707b 0793592df
Author: Carlos Soriano <csoriano1618 gmail com>
Date:   Tue Apr 3 11:53:25 2018 +0000

    Merge branch 'issue-331' into 'master'
    
    Don't use eel_show_error_dialog
    
    See merge request GNOME/nautilus!173

 src/nautilus-application.c              |  2 +-
 src/nautilus-error-reporting.c          | 12 ++++++----
 src/nautilus-mime-actions.c             | 16 +++++++------
 src/nautilus-mime-application-chooser.c | 20 ++++++++--------
 src/nautilus-program-choosing.c         | 41 +++++++++++++++------------------
 src/nautilus-properties-window.c        | 29 +++++++++++------------
 6 files changed, 59 insertions(+), 61 deletions(-)
---