[gtk: 6/6] Merge branch 'startup-vs-xdg-activation' into 'main'

[Carlos Garnacho <carlosg src gnome org>]

commit 68319afd2373128cb83c28cf70869c0be35874d1
Merge: d3acfa8c2b 25f4e597ee
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Feb 28 17:29:09 2022 +0000

    Merge branch 'startup-vs-xdg-activation' into 'main'
    
    Startup tracking with xdg-activation
    
    See merge request GNOME/gtk!3883

 demos/gtk-demo/main.c                 | 2 +-
 demos/print-editor/print-editor.c     | 2 +-
 demos/widget-factory/widget-factory.c | 2 +-
 gdk/wayland/gdkdisplay-wayland.c      | 4 ++++
 gdk/wayland/gdksurface-wayland.c      | 1 +
 gtk/gtkwindow.c                       | 5 +++--
 6 files changed, 11 insertions(+), 5 deletions(-)
---