summaryrefslogtreecommitdiff
path: root/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
diff options
context:
space:
mode:
authorPerberos <[email protected]>2011-12-08 14:09:44 -0300
committerPerberos <[email protected]>2011-12-08 14:09:44 -0300
commit283de05cf3b8bed9dcde9e80875b860520de392a (patch)
tree0447d2c7e271ed05493794670fac0d6f05d0d475 /plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
parent81ea15d1ce166e69e7fff11c88e16c42d8db190d (diff)
downloadmate-settings-daemon-283de05cf3b8bed9dcde9e80875b860520de392a.tar.bz2
mate-settings-daemon-283de05cf3b8bed9dcde9e80875b860520de392a.tar.xz
GDK_DISPLAY() is deprecated
Diffstat (limited to 'plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c')
-rw-r--r--plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
index ac75491..668fddc 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
@@ -125,7 +125,7 @@ supports_xinput_devices (void)
{
gint op_code, event, error;
- return XQueryExtension (GDK_DISPLAY (),
+ return XQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
"XInputExtension",
&op_code,
&event,
@@ -166,13 +166,13 @@ xkb_enabled (GsdA11yKeyboardManager *manager)
gboolean have_xkb;
int opcode, errorBase, major, minor;
- have_xkb = XkbQueryExtension (GDK_DISPLAY (),
+ have_xkb = XkbQueryExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
&opcode,
&manager->priv->xkbEventBase,
&errorBase,
&major,
&minor)
- && XkbUseExtension (GDK_DISPLAY (), &major, &minor);
+ && XkbUseExtension (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), &major, &minor);
return have_xkb;
}
@@ -184,10 +184,10 @@ get_xkb_desc_rec (GsdA11yKeyboardManager *manager)
Status status = Success;
gdk_error_trap_push ();
- desc = XkbGetMap (GDK_DISPLAY (), XkbAllMapComponentsMask, XkbUseCoreKbd);
+ desc = XkbGetMap (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XkbAllMapComponentsMask, XkbUseCoreKbd);
if (desc != NULL) {
desc->ctrls = NULL;
- status = XkbGetControls (GDK_DISPLAY (), XkbAllControlsMask, desc);
+ status = XkbGetControls (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XkbAllControlsMask, desc);
}
gdk_error_trap_pop ();
@@ -383,7 +383,7 @@ set_server_from_mateconf (GsdA11yKeyboardManager *manager,
*/
gdk_error_trap_push ();
- XkbSetControls (GDK_DISPLAY (),
+ XkbSetControls (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
XkbSlowKeysMask |
XkbBounceKeysMask |
XkbStickyKeysMask |
@@ -397,7 +397,7 @@ set_server_from_mateconf (GsdA11yKeyboardManager *manager,
XkbFreeKeyboard (desc, XkbAllComponentsMask, True);
- XSync (GDK_DISPLAY (), FALSE);
+ XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE);
gdk_error_trap_pop ();
mate_settings_profile_end (NULL);
@@ -1085,7 +1085,7 @@ start_a11y_keyboard_idle_cb (GsdA11yKeyboardManager *manager)
set_server_from_mateconf (manager, client);
g_object_unref (client);
- XkbSelectEvents (GDK_DISPLAY (),
+ XkbSelectEvents (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
XkbUseCoreKbd,
event_mask,
event_mask);
@@ -1120,7 +1120,7 @@ static void
restore_server_xkb_config (GsdA11yKeyboardManager *manager)
{
gdk_error_trap_push ();
- XkbSetControls (GDK_DISPLAY (),
+ XkbSetControls (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
XkbSlowKeysMask |
XkbBounceKeysMask |
XkbStickyKeysMask |
@@ -1135,7 +1135,7 @@ restore_server_xkb_config (GsdA11yKeyboardManager *manager)
XkbFreeKeyboard (manager->priv->original_xkb_desc,
XkbAllComponentsMask, True);
- XSync (GDK_DISPLAY (), FALSE);
+ XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE);
gdk_error_trap_pop ();
manager->priv->original_xkb_desc = NULL;