[gtk+/xi2-for-master] Tweak the previous commit

[Matthias Clasen <matthiasc src gnome org>]

commit 94cb2fda765faff75fec6f6235cc632354cc2dec
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon May 24 17:58:56 2010 -0400

    Tweak the previous commit
    
    Turns out that GtkPlug uses some of the private device api

 gdk/gdk.symbols                 |   27 +++++++++++++++++++++++++++
 gdk/x11/gdkdevicemanager-core.c |    4 ++++
 gdk/x11/gdkdevicemanager-core.h |    1 -
 gdk/x11/gdkdevicemanager-xi2.c  |    4 ++++
 gdk/x11/gdkdevicemanager-xi2.h  |    1 -
 gdk/x11/gdkeventtranslator.c    |    6 ++++++
 gdk/x11/gdkeventtranslator.h    |    4 ----
 7 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index dc887b7..65e53a1 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -68,6 +68,33 @@ gdk_events_pending
 #endif
 #endif
 
+#if IN_HEADER(__GDK_EVENT_TRANSLATOR_H__)
+#if IN_FILE(__GDK_EVENT_TRANSLATOR_C__)
+#ifdef GDK_WINDOWING_X11
+gdk_event_translator_get_type G_GNUC_CONST
+gdk_event_translator_translate
+gdk_event_translator_get_handled_events
+gdk_event_translator_select_window_events
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GDK_DEVICE_MANAGER_CORE_H__)
+#if IN_FILE(__GDK_DEVICE_MANAGER_CORE_C__)
+#ifdef GDK_WINDOWING_X11
+gdk_device_manager_core_get_type
+#endif
+#endif
+#endif
+
+#if IN_HEADER(__GDK_DEVICE_MANAGER_XI2_H__)
+#if IN_FILE(__GDK_DEVICE_MANAGER_XI2_C__)
+#ifdef GDK_WINDOWING_X11
+gdk_device_manager_xi2_get_type
+#endif
+#endif
+#endif
+
 #if IN_HEADER(__GDK_H__)
 #if IN_FILE(__GDK_MAIN_X11_C__)
 gdk_error_trap_pop
diff --git a/gdk/x11/gdkdevicemanager-core.c b/gdk/x11/gdkdevicemanager-core.c
index ceea658..0e7b8c3 100644
--- a/gdk/x11/gdkdevicemanager-core.c
+++ b/gdk/x11/gdkdevicemanager-core.c
@@ -27,6 +27,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
+#include "gdkalias.h"
 
 #ifdef HAVE_XKB
 #include <X11/XKBlib.h>
@@ -898,3 +899,6 @@ gdk_device_manager_core_list_devices (GdkDeviceManager *device_manager,
 
   return devices;
 }
+
+#define __GDK_DEVICE_MANAGER_CORE_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkdevicemanager-core.h b/gdk/x11/gdkdevicemanager-core.h
index e2f2382..0a337fc 100644
--- a/gdk/x11/gdkdevicemanager-core.h
+++ b/gdk/x11/gdkdevicemanager-core.h
@@ -46,7 +46,6 @@ struct _GdkDeviceManagerCoreClass
   GdkDeviceManagerClass parent_class;
 };
 
-G_GNUC_INTERNAL
 GType gdk_device_manager_core_get_type (void) G_GNUC_CONST;
 
 
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index a1e8736..9915a3a 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -28,6 +28,7 @@
 #include "gdkkeysyms.h"
 #include "gdkprivate-x11.h"
 #include "gdkx.h"
+#include "gdkalias.h"
 
 #define HAS_FOCUS(toplevel) ((toplevel)->has_focus || (toplevel)->has_pointer_focus)
 
@@ -1140,3 +1141,6 @@ gdk_device_manager_xi2_select_window_events (GdkEventTranslator *translator,
   _gdk_device_manager_xi2_select_events (device_manager, window, &event_mask);
   g_free (event_mask.mask);
 }
+
+#define __GDK_DEVICE_MANAGER_XI2_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkdevicemanager-xi2.h b/gdk/x11/gdkdevicemanager-xi2.h
index f28e62c..d47bcdb 100644
--- a/gdk/x11/gdkdevicemanager-xi2.h
+++ b/gdk/x11/gdkdevicemanager-xi2.h
@@ -53,7 +53,6 @@ struct _GdkDeviceManagerXI2Class
   GdkDeviceManagerClass parent_class;
 };
 
-G_GNUC_INTERNAL
 GType gdk_device_manager_xi2_get_type (void) G_GNUC_CONST;
 
 
diff --git a/gdk/x11/gdkeventtranslator.c b/gdk/x11/gdkeventtranslator.c
index d41d7c3..753dfc8 100644
--- a/gdk/x11/gdkeventtranslator.c
+++ b/gdk/x11/gdkeventtranslator.c
@@ -17,7 +17,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "gdkeventtranslator.h"
+#include "gdkalias.h"
 
 GType
 gdk_event_translator_get_type (void)
@@ -92,3 +95,6 @@ gdk_event_translator_select_window_events (GdkEventTranslator *translator,
   if (iface->select_window_events)
     iface->select_window_events (translator, window, event_mask);
 }
+
+#define __GDK_EVENT_TRANSLATOR_C__
+#include "gdkaliasdef.c"
diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index e0c28fe..62c99e3 100644
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -50,16 +50,12 @@ struct _GdkEventTranslatorIface
                                          GdkEventMask        event_mask);
 };
 
-G_GNUC_INTERNAL
 GType      gdk_event_translator_get_type (void) G_GNUC_CONST;
 
-G_GNUC_INTERNAL
 GdkEvent * gdk_event_translator_translate (GdkEventTranslator *translator,
                                            GdkDisplay         *display,
                                            XEvent             *xevent);
-G_GNUC_INTERNAL
 GdkEventMask gdk_event_translator_get_handled_events   (GdkEventTranslator *translator);
-G_GNUC_INTERNAL
 void         gdk_event_translator_select_window_events (GdkEventTranslator *translator,
                                                         Window              window,
                                                         GdkEventMask        event_mask);