summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkdisplay-x11.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2010-12-16 11:33:43 -0500
committerMatthias Clasen <mclasen@redhat.com>2010-12-21 12:07:02 -0500
commitfdabc9585d4d8616926c4acf09f114f8e00c383b (patch)
tree951827ba8bcaf82b8fd88cf4728d734aa924525f /gdk/x11/gdkdisplay-x11.c
parent2211e52ec5facb192cd07d06bf8175ed1ba26c2d (diff)
downloadgtk+-fdabc9585d4d8616926c4acf09f114f8e00c383b.tar.gz
Drop g[dt]k_set_locale
These functions were essentially just calling setlocale anyway. The X11 version was also setting a gdk_use_mb variable that is not used anywhere.
Diffstat (limited to 'gdk/x11/gdkdisplay-x11.c')
-rw-r--r--gdk/x11/gdkdisplay-x11.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index f24614a516..7bcb5dec74 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -1117,7 +1117,7 @@ gdk_event_init (GdkDisplay *display)
}
static void
-gdk_input_init (GdkDisplay *display)
+gdk_x11_display_init_input (GdkDisplay *display)
{
GdkDisplayX11 *display_x11;
GdkDeviceManager *device_manager;
@@ -1446,8 +1446,8 @@ _gdk_x11_display_open (const gchar *display_name)
}
#endif
- gdk_input_init (display);
- _gdk_x11_dnd_init (display);
+ gdk_x11_display_init_input (display);
+ _gdk_x11_display_init_dnd (display);
for (i = 0; i < ScreenCount (display_x11->xdisplay); i++)
_gdk_x11_screen_setup (display_x11->screens[i]);