diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 01:32:01 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-12-21 12:07:09 -0500 |
| commit | b4802e3042bce7032565966ed2b89499173f7f57 (patch) | |
| tree | bef4a2067fefa20d0a19e325dcc07b662cf88f26 /gdk/x11/gdkdevicemanager-x11.c | |
| parent | 5cddc7ccbb1fe1a9c09f56f6df5b9af83e1f2886 (diff) | |
| download | gtk+-b4802e3042bce7032565966ed2b89499173f7f57.tar.gz | |
Rename x11-specific GdkDevice[Manager] implementations
Make them all fit in the gdk_x11_ prefix, and make the
get_type functions and standard macros available in headers.
Diffstat (limited to 'gdk/x11/gdkdevicemanager-x11.c')
| -rw-r--r-- | gdk/x11/gdkdevicemanager-x11.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c index 026ae769b7..6680e0a455 100644 --- a/gdk/x11/gdkdevicemanager-x11.c +++ b/gdk/x11/gdkdevicemanager-x11.c @@ -21,9 +21,9 @@ #include "gdkx11devicemanager-core.h" #ifdef XINPUT_XFREE -#include "gdkdevicemanager-xi.h" +#include "gdkx11devicemanager-xi.h" #ifdef XINPUT_2 -#include "gdkdevicemanager-xi2.h" +#include "gdkx11devicemanager-xi2.h" #endif #endif #include "gdkinternals.h" @@ -52,11 +52,11 @@ _gdk_x11_device_manager_new (GdkDisplay *display) if (!_gdk_disable_multidevice && XIQueryVersion (xdisplay, &major, &minor) != BadRequest) { - GdkDeviceManagerXI2 *device_manager_xi2; + GdkX11DeviceManagerXI2 *device_manager_xi2; GDK_NOTE (INPUT, g_print ("Creating XI2 device manager\n")); - device_manager_xi2 = g_object_new (GDK_TYPE_DEVICE_MANAGER_XI2, + device_manager_xi2 = g_object_new (GDK_TYPE_X11_DEVICE_MANAGER_XI2, "display", display, NULL); device_manager_xi2->opcode = opcode; @@ -68,7 +68,7 @@ _gdk_x11_device_manager_new (GdkDisplay *display) { GDK_NOTE (INPUT, g_print ("Creating XI device manager\n")); - return g_object_new (GDK_TYPE_DEVICE_MANAGER_XI, + return g_object_new (GDK_TYPE_X11_DEVICE_MANAGER_XI, "display", display, "event-base", firstevent, NULL); |