[gtk: 4/4] Merge branch 'wip/settings-portal' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 5028cb35bc0506b3606e6d1bc567a39966c9d123
Merge: 833442e1e2 48b569eae0
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Nov 4 20:57:26 2018 +0000

    Merge branch 'wip/settings-portal' into 'master'
    
    settings portal
    
    See merge request GNOME/gtk!403

 gdk/gdk-private.h                |   1 +
 gdk/gdk.c                        |  25 ++-
 gdk/wayland/gdkdisplay-wayland.c | 350 ++++++++++++++++++++++++++++++++++-----
 gdk/wayland/gdkdisplay-wayland.h |   1 +
 gtk/gtkapplication-dbus.c        |   2 +-
 gtk/gtkcolorpickerportal.c       |   2 +-
 gtk/gtkfilechoosernativeportal.c |   2 +-
 gtk/gtkprintoperation-unix.c     |   6 +-
 gtk/gtkprivate.c                 |  24 ---
 gtk/gtkprivate.h                 |   2 +-
 10 files changed, 338 insertions(+), 77 deletions(-)
---