[gtk: 2/2] Merge branch 'gdkx-import-doc' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 1b7c6e5687f278ff76e49102a8dd3e21f030bd22
Merge: e056e4ff58 d32cd210bb
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Sat Nov 16 18:19:26 2019 +0000

    Merge branch 'gdkx-import-doc' into 'master'
    
    Correct GdkX11 import path in docs and include guards
    
    Closes #2254
    
    See merge request GNOME/gtk!1188

 docs/reference/gdk/gdk4-sections.txt | 2 --
 gdk/x11/gdkmain-x11.c                | 3 ++-
 gdk/x11/gdkx-autocleanups.h          | 2 +-
 gdk/x11/gdkx11applaunchcontext.h     | 2 +-
 gdk/x11/gdkx11device.h               | 2 +-
 gdk/x11/gdkx11devicemanager.h        | 2 +-
 gdk/x11/gdkx11display.h              | 2 +-
 gdk/x11/gdkx11dnd.h                  | 2 +-
 gdk/x11/gdkx11glcontext.h            | 2 +-
 gdk/x11/gdkx11keys.h                 | 2 +-
 gdk/x11/gdkx11monitor.h              | 2 +-
 gdk/x11/gdkx11property.h             | 2 +-
 gdk/x11/gdkx11screen.h               | 2 +-
 gdk/x11/gdkx11selection.h            | 2 +-
 gdk/x11/gdkx11surface.h              | 2 +-
 gdk/x11/gdkx11utils.h                | 2 +-
 16 files changed, 16 insertions(+), 17 deletions(-)
---