From 7f486231ac4114acf332c4bf4ade2bd9e0155a6f Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sun, 29 Aug 2010 02:03:19 +0200
Subject: [PATCH] API: Add gdk_window_get_display()

---
 docs/reference/gdk/gdk3-sections.txt |  1 +
 gdk/gdk.symbols                      |  1 +
 gdk/gdkwindow.c                      | 19 +++++++++++++++++++
 gdk/gdkwindow.h                      |  1 +
 4 files changed, 22 insertions(+)

diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index 6ce536daaa..3b12f7ff59 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -360,6 +360,7 @@ GdkWindowAttributesType
 gdk_window_new
 gdk_window_destroy
 gdk_window_get_window_type
+gdk_window_get_display
 gdk_window_get_screen
 gdk_window_get_visual
 gdk_window_at_pointer
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index a776771268..bd4b477f72 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -571,6 +571,7 @@ gdk_window_get_accept_focus
 gdk_window_get_background_pattern
 gdk_window_get_composited
 gdk_window_get_cursor
+gdk_window_get_display
 gdk_window_get_focus_on_map
 gdk_window_get_geometry
 gdk_window_get_modal_hint
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index a63dd539c3..9dc21bcc58 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -2206,6 +2206,25 @@ gdk_window_get_screen (GdkWindow *window)
   return gdk_visual_get_screen (private->visual);
 }
 
+/**
+ * gdk_window_get_display:
+ * @window: a #GdkWindow
+ * 
+ * Gets the #GdkDisplay associated with a #GdkWindow.
+ * 
+ * Return value: the #GdkDisplay associated with @window
+ **/
+GdkDisplay *
+gdk_window_get_display (GdkWindow *window)
+{
+  GdkWindowObject *private;
+
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+
+  private = (GdkWindowObject *) window;
+
+  return gdk_screen_get_display (gdk_visual_get_screen (private->visual));
+}
 /**
  * gdk_window_is_destroyed:
  * @window: a #GdkWindow
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 74667ca917..b99af205e6 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -507,6 +507,7 @@ gboolean      gdk_window_is_destroyed          (GdkWindow     *window);
 
 GdkVisual *   gdk_window_get_visual            (GdkWindow     *window);
 GdkScreen *   gdk_window_get_screen            (GdkWindow     *window);
+GdkDisplay *  gdk_window_get_display           (GdkWindow     *window);
 #ifndef GDK_MULTIDEVICE_SAFE
 GdkWindow*    gdk_window_at_pointer            (gint          *win_x,
                                                 gint          *win_y);