From 04d1459fca121dc37c9c8ce63d2f36b06ad968d1 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 20 Dec 2010 15:55:16 +0100
Subject: [PATCH] x11: Move remaining APIs into gdkx11utils.h

Now gdkx.h is a clean header equivalent to gdk.h.
---
 gdk/Makefile.am       |  1 +
 gdk/x11/Makefile.am   |  1 +
 gdk/x11/gdkx.h        | 24 +----------------
 gdk/x11/gdkx11utils.h | 62 +++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 23 deletions(-)
 create mode 100644 gdk/x11/gdkx11utils.h

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 2a460e2924..e96d813cf1 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -221,6 +221,7 @@ x11_introspection_files = 		\
 	x11/gdkx11property.h		\
 	x11/gdkx11screen.h		\
 	x11/gdkx11selection.h		\
+	x11/gdkx11utils.h		\
 	x11/gdkx11visual.h		\
 	x11/gdkx11window.h
 
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index e7522fdbb0..bf33c4adae 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -81,6 +81,7 @@ libgdkx11include_HEADERS = 	\
 	gdkx11property.h	\
 	gdkx11screen.h		\
 	gdkx11selection.h	\
+	gdkx11utils.h		\
 	gdkx11visual.h		\
 	gdkx11window.h
 
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 3f4af1fdbb..20d596b029 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -60,32 +60,10 @@
 #include <gdk/x11/gdkx11property.h>
 #include <gdk/x11/gdkx11screen.h>
 #include <gdk/x11/gdkx11selection.h>
+#include <gdk/x11/gdkx11utils.h>
 #include <gdk/x11/gdkx11visual.h>
 #include <gdk/x11/gdkx11window.h>
 
 #undef __GDKX_H_INSIDE__
 
-G_BEGIN_DECLS
-
-#ifndef GDK_MULTIHEAD_SAFE
-Window   gdk_x11_get_default_root_xwindow (void);
-Display *gdk_x11_get_default_xdisplay     (void);
-#endif
-
-#ifndef GDK_MULTIHEAD_SAFE
-/**
- * GDK_ROOT_WINDOW:
- *
- * Obtains the Xlib window id of the root window of the current screen.
- */
-#define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
-#endif
-
-#ifndef GDK_MULTIHEAD_SAFE
-void          gdk_x11_grab_server    (void);
-void          gdk_x11_ungrab_server  (void);
-#endif
-
-G_END_DECLS
-
 #endif /* __GDK_X_H__ */
diff --git a/gdk/x11/gdkx11utils.h b/gdk/x11/gdkx11utils.h
new file mode 100644
index 0000000000..f00ee5b653
--- /dev/null
+++ b/gdk/x11/gdkx11utils.h
@@ -0,0 +1,62 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
+
+#ifndef __GDK_X11_UTILS_H__
+#define __GDK_X11_UTILS_H__
+
+#include <gdk/gdk.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+#ifndef GDK_MULTIHEAD_SAFE
+Window   gdk_x11_get_default_root_xwindow (void);
+Display *gdk_x11_get_default_xdisplay     (void);
+#endif
+
+#ifndef GDK_MULTIHEAD_SAFE
+/**
+ * GDK_ROOT_WINDOW:
+ *
+ * Obtains the Xlib window id of the root window of the current screen.
+ */
+#define GDK_ROOT_WINDOW()             (gdk_x11_get_default_root_xwindow ())
+#endif
+
+#ifndef GDK_MULTIHEAD_SAFE
+void          gdk_x11_grab_server    (void);
+void          gdk_x11_ungrab_server  (void);
+#endif
+
+G_END_DECLS
+
+#endif /* __GDK_X11_UTILS_H__ */