From 8075cfd658c72821c21e5898d3650fe88ea36c0c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 8 Dec 2010 23:48:00 -0500
Subject: [PATCH] Move gdk_get_display to common code

---
 gdk/gdkdisplay.c            | 6 ++++++
 gdk/quartz/gdkmain-quartz.c | 6 ------
 gdk/win32/gdkmain-win32.c   | 6 ------
 gdk/x11/gdkmain-x11.c       | 6 ------
 4 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index a6197c28fc..cb8b9c2bcd 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1849,6 +1849,12 @@ gdk_display_get_name (GdkDisplay *display)
   return GDK_DISPLAY_GET_CLASS(display)->get_name (display);
 }
 
+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
 /**
  * gdk_display_get_n_screens:
  * @display: a #GdkDisplay
diff --git a/gdk/quartz/gdkmain-quartz.c b/gdk/quartz/gdkmain-quartz.c
index 6e84756907..dad1e544e7 100644
--- a/gdk/quartz/gdkmain-quartz.c
+++ b/gdk/quartz/gdkmain-quartz.c
@@ -61,12 +61,6 @@ gdk_error_trap_pop_ignored (void)
 {
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 void
 gdk_notify_startup_complete (void)
 {
diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index e48e2bef40..e07c1ca548 100644
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -197,12 +197,6 @@ _gdk_windowing_exit (void)
   _gdk_display_hdc = NULL;
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 void
 gdk_error_trap_push (void)
 {
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 2ce5e34875..91eb83d0f7 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -545,12 +545,6 @@ gdk_error_trap_pop (void)
   return gdk_error_trap_pop_internal (TRUE);
 }
 
-gchar *
-gdk_get_display (void)
-{
-  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
-}
-
 /**
  * _gdk_send_xevent:
  * @display: #GdkDisplay which @window is on