From eba45292464da5334cef8d4e36e01bb70256b549 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 20 Dec 2010 19:42:53 +0100
Subject: [PATCH] x11: Export GdkX11Display

---
 gdk/x11/gdkdisplay-x11.c | 10 +++++-----
 gdk/x11/gdkdisplay-x11.h |  9 ---------
 gdk/x11/gdkx11display.h  | 12 +++++++++++-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 01c6aeb589..fdd1038228 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -160,13 +160,13 @@ static const char *const precache_atoms[] = {
 
 static char *gdk_sm_client_id;
 
-G_DEFINE_TYPE_WITH_CODE (GdkX11Display, _gdk_x11_display, GDK_TYPE_DISPLAY,
+G_DEFINE_TYPE_WITH_CODE (GdkX11Display, gdk_x11_display, GDK_TYPE_DISPLAY,
                          G_IMPLEMENT_INTERFACE (GDK_TYPE_EVENT_TRANSLATOR,
                                                 gdk_x11_display_event_translator_init))
 
 
 static void
-_gdk_x11_display_init (GdkX11Display *display)
+gdk_x11_display_init (GdkX11Display *display)
 {
   _gdk_x11_display_manager_add_display (gdk_display_manager_get (),
                                         GDK_DISPLAY (display));
@@ -1737,7 +1737,7 @@ gdk_x11_display_dispose (GObject *object)
       display_x11->event_source = NULL;
     }
 
-  G_OBJECT_CLASS (_gdk_x11_display_parent_class)->dispose (object);
+  G_OBJECT_CLASS (gdk_x11_display_parent_class)->dispose (object);
 }
 
 static void
@@ -1810,7 +1810,7 @@ gdk_x11_display_finalize (GObject *object)
       g_slice_free (GdkErrorTrap, trap);
     }
 
-  G_OBJECT_CLASS (_gdk_x11_display_parent_class)->finalize (object);
+  G_OBJECT_CLASS (gdk_x11_display_parent_class)->finalize (object);
 }
 
 /**
@@ -2714,7 +2714,7 @@ gdk_x11_display_get_keymap (GdkDisplay *display)
 }
 
 static void
-_gdk_x11_display_class_init (GdkX11DisplayClass * class)
+gdk_x11_display_class_init (GdkX11DisplayClass * class)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (class);
   GdkDisplayClass *display_class = GDK_DISPLAY_CLASS (class);
diff --git a/gdk/x11/gdkdisplay-x11.h b/gdk/x11/gdkdisplay-x11.h
index 0075fd1b76..e19c57f3f9 100644
--- a/gdk/x11/gdkdisplay-x11.h
+++ b/gdk/x11/gdkdisplay-x11.h
@@ -35,14 +35,6 @@
 
 G_BEGIN_DECLS
 
-typedef struct _GdkX11Display GdkX11Display;
-typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
-
-#define GDK_TYPE_X11_DISPLAY              (_gdk_x11_display_get_type())
-#define GDK_X11_DISPLAY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY, GdkX11Display))
-#define GDK_X11_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
-#define GDK_IS_X11_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY))
-#define GDK_X11_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
 
 struct _GdkX11Display
 {
@@ -148,7 +140,6 @@ struct _GdkX11DisplayClass
   GdkDisplayClass parent_class;
 };
 
-GType      _gdk_x11_display_get_type            (void);
 GdkScreen *_gdk_x11_display_screen_for_xrootwin (GdkDisplay  *display,
                                                  Window       xrootwin);
 void       _gdk_x11_display_error_event         (GdkDisplay  *display,
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 111f303b7d..70e8a140d5 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -38,7 +38,17 @@
 
 G_BEGIN_DECLS
 
-#define GDK_IS_X11_DISPLAY(object)   (G_TYPE_CHECK_INSTANCE_TYPE ((object), g_type_from_name ("GdkX11Display")))
+typedef struct _GdkX11Display GdkX11Display;
+typedef struct _GdkX11DisplayClass GdkX11DisplayClass;
+
+#define GDK_TYPE_X11_DISPLAY              (gdk_x11_display_get_type())
+#define GDK_X11_DISPLAY(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_X11_DISPLAY, GdkX11Display))
+#define GDK_X11_DISPLAY_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
+#define GDK_IS_X11_DISPLAY(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_X11_DISPLAY))
+#define GDK_IS_X11_DISPLAY_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_X11_DISPLAY))
+#define GDK_X11_DISPLAY_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_X11_DISPLAY, GdkX11DisplayClass))
+
+GType      gdk_x11_display_get_type            (void);
 
 Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);