[gtk+] gdk: Shuffle code around



commit cb2c47597e3a24b260967b6fd00d3444573a030c
Author: Benjamin Otte <otte redhat com>
Date:   Sun Nov 25 21:09:58 2012 +0100

    gdk: Shuffle code around
    
    Make implementation, header and documentation be at the correct place.

 gdk/gdk.c        |   15 +++++++++++++++
 gdk/gdkdisplay.c |    6 ------
 gdk/gdkmain.h    |    9 ---------
 3 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 31fe065..3e2ef2a 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -326,6 +326,21 @@ gdk_parse_args (int    *argc,
 }
 
 /**
+ * gdk_get_display:
+ *
+ * Gets the name of the display, which usually comes from the
+ * <envar>DISPLAY</envar> environment variable or the
+ * <option>--display</option> command line option.
+ *
+ * Returns: the name of the display.
+ */
+gchar *
+gdk_get_display (void)
+{
+  return g_strdup (gdk_display_get_name (gdk_display_get_default ()));
+}
+
+/**
  * gdk_get_display_arg_name:
  *
  * Gets the display name specified in the command line arguments passed
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 79d162b..f5b4ac2 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -1415,12 +1415,6 @@ 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/gdkmain.h b/gdk/gdkmain.h
index 05b15b9..4fbe7ac 100644
--- a/gdk/gdkmain.h
+++ b/gdk/gdkmain.h
@@ -65,15 +65,6 @@ void                           gdk_error_trap_pop_ignored (void);
 
 const gchar *         gdk_get_display_arg_name (void);
 
-/**
- * gdk_get_display:
- *
- * Gets the name of the display, which usually comes from the
- * <envar>DISPLAY</envar> environment variable or the
- * <option>--display</option> command line option.
- *
- * Returns: the name of the display.
- */
 gchar*        gdk_get_display        (void);
 
 #ifndef GDK_MULTIDEVICE_SAFE


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]