[gtk: 5/5] Merge branch 'fix-app-id' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 877fffdd5efd55dc1067cd6e2b3a715197879f08
Merge: 8669d31c30 8fb8303ba0
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Aug 3 02:09:09 2018 +0000

    Merge branch 'fix-app-id' into 'master'
    
    Make xdg-shell's app_id match GApplication's application-id property
    
    Closes #653
    
    See merge request GNOME/gtk!284

 build-aux/flatpak/org.gtk.Demo.json                      |  1 -
 build-aux/flatpak/org.gtk.WidgetFactory.json             |  1 -
 demos/gtk-demo/meson.build                               |  2 +-
 .../gtk-demo/{gtk4-demo.desktop => org.gtk.Demo.desktop} |  0
 demos/icon-browser/meson.build                           |  2 +-
 ...-icon-browser.desktop => org.gtk.IconBrowser.desktop} |  0
 demos/widget-factory/meson.build                         |  2 +-
 ...get-factory.desktop => org.gtk.WidgetFactory.desktop} |  0
 docs/reference/gtk/getting_started.xml                   |  2 +-
 docs/reference/gtk/migrating-3to4.xml                    | 16 ++++++++++++++++
 examples/application1/README                             |  4 ++--
 .../{exampleapp.desktop => org.gtk.exampleapp.desktop}   |  0
 gdk/wayland/gdksurface-wayland.c                         |  4 +++-
 13 files changed, 25 insertions(+), 9 deletions(-)
---