[gtk+/gdk-backend: 11/91] Move gdk_get_display to common code
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend: 11/91] Move gdk_get_display to common code
- Date: Sat, 18 Dec 2010 01:06:45 +0000 (UTC)
commit 42a254a60e60f3604b3f18a5c58de326f5bc1f88
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Dec 8 23:48:00 2010 -0500
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 6b58e03..8a3200a 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1847,6 +1847,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 6e84756..dad1e54 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 e48e2be..e07c1ca 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 2ce5e34..91eb83d 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]