[gtk: 1/2] Correct GdkX11 import path in docs and include guards

[Emmanuele Bassi <ebassi src gnome org>]

commit d32cd210bb3027e1c478d6bbb53d472ebb3117a5
Author: Andy Holmes <andrew g r holmes gmail com>
Date:   Fri Nov 15 13:13:26 2019 -0800

    Correct GdkX11 import path in docs and include guards
    
    Update the include directives in the documentation, as well as the
    include guards in headers, to point to gdk/x11/gdkx.h.
    
    closes #2254

 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(-)
---
diff --git a/docs/reference/gdk/gdk4-sections.txt b/docs/reference/gdk/gdk4-sections.txt
index 7cb4a8aab9..d169a3f981 100644
--- a/docs/reference/gdk/gdk4-sections.txt
+++ b/docs/reference/gdk/gdk4-sections.txt
@@ -789,8 +789,6 @@ gdk_drop_get_type
 </SECTION>
 
 <SECTION>
-<INCLUDE>gdk/gdkx.h</INCLUDE>
-<TITLE>X Window System Interaction</TITLE>
 <FILE>x_interaction</FILE>
 GDK_SURFACE_XID
 GDK_DISPLAY_XDISPLAY
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 0ce77b3048..82dd70011d 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -50,9 +50,10 @@
  * SECTION:x_interaction
  * @Short_description: X backend-specific functions
  * @Title: X Window System Interaction
+ * @Include: gdk/x11/gdkx.h
  *
  * The functions in this section are specific to the GDK X11 backend.
- * To use them, you need to include the `<gdk/gdkx.h>` header and use
+ * To use them, you need to include the `<gdk/x11/gdkx.h>` header and use
  * the X11-specific pkg-config file `gtk4-x11` to build your application.
  *
  * To make your code compile with other GDK backends, guard backend-specific
diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h
index e615a14efd..e2353f85ee 100644
--- a/gdk/x11/gdkx-autocleanups.h
+++ b/gdk/x11/gdkx-autocleanups.h
@@ -16,7 +16,7 @@
  */
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #ifndef __GI_SCANNER__
diff --git a/gdk/x11/gdkx11applaunchcontext.h b/gdk/x11/gdkx11applaunchcontext.h
index e7d02edc07..93a2f8c1da 100644
--- a/gdk/x11/gdkx11applaunchcontext.h
+++ b/gdk/x11/gdkx11applaunchcontext.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_APP_LAUNCH_CONTEXT_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11device.h b/gdk/x11/gdkx11device.h
index 56cb9edb30..cab49734df 100644
--- a/gdk/x11/gdkx11device.h
+++ b/gdk/x11/gdkx11device.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DEVICE_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11devicemanager.h b/gdk/x11/gdkx11devicemanager.h
index e99806c6b2..f3b0815462 100644
--- a/gdk/x11/gdkx11devicemanager.h
+++ b/gdk/x11/gdkx11devicemanager.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DEVICE_MANAGER_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 570d08b0fa..b885357f70 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_DISPLAY_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11dnd.h b/gdk/x11/gdkx11dnd.h
index dfe60500c6..5318983375 100644
--- a/gdk/x11/gdkx11dnd.h
+++ b/gdk/x11/gdkx11dnd.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_DND_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11glcontext.h b/gdk/x11/gdkx11glcontext.h
index 0701869133..29235dcb02 100644
--- a/gdk/x11/gdkx11glcontext.h
+++ b/gdk/x11/gdkx11glcontext.h
@@ -22,7 +22,7 @@
 #define __GDK_X11_GL_CONTEXT_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11keys.h b/gdk/x11/gdkx11keys.h
index a011bb483d..e4575d5927 100644
--- a/gdk/x11/gdkx11keys.h
+++ b/gdk/x11/gdkx11keys.h
@@ -19,7 +19,7 @@
 #define __GDK_X11_KEYS_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11monitor.h b/gdk/x11/gdkx11monitor.h
index d1363437e6..8f7dd86177 100644
--- a/gdk/x11/gdkx11monitor.h
+++ b/gdk/x11/gdkx11monitor.h
@@ -23,7 +23,7 @@
 #define __GDK_X11_MONITOR_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdkmonitor.h>
diff --git a/gdk/x11/gdkx11property.h b/gdk/x11/gdkx11property.h
index 9b3e694319..8fac2b11be 100644
--- a/gdk/x11/gdkx11property.h
+++ b/gdk/x11/gdkx11property.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_PROPERTY_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11screen.h b/gdk/x11/gdkx11screen.h
index 791bb4b6b4..bb82c86979 100644
--- a/gdk/x11/gdkx11screen.h
+++ b/gdk/x11/gdkx11screen.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SCREEN_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
index 9123d473a2..1a91f11595 100644
--- a/gdk/x11/gdkx11selection.h
+++ b/gdk/x11/gdkx11selection.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SELECTION_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index 844a2de9cd..fdd7d8eb95 100644
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_SURFACE_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>
diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
index e5604d13c9..7ed8ca833e 100644
--- a/gdk/x11/gdkx11utils.h
+++ b/gdk/x11/gdkx11utils.h
@@ -26,7 +26,7 @@
 #define __GDK_X11_UTILS_H__
 
 #if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
-#error "Only <gdk/gdkx.h> can be included directly."
+#error "Only <gdk/x11/gdkx.h> can be included directly."
 #endif
 
 #include <gdk/gdk.h>