diff options
| author | monsta <[email protected]> | 2016-11-20 22:24:08 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-11-20 22:24:08 +0300 |
| commit | de1227d4355f56017270f3a7541b8be21fd955af (patch) | |
| tree | 37ad9b1c13c571ed51da2c5649e33cb9a2a9e7fe /plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | |
| parent | c0e9048f916f4141292ca3b107735496e698cac5 (diff) | |
| download | mate-settings-daemon-de1227d4355f56017270f3a7541b8be21fd955af.tar.bz2 mate-settings-daemon-de1227d4355f56017270f3a7541b8be21fd955af.tar.xz | |
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require libmatekbd and libmate-desktop >= 1.17
Diffstat (limited to 'plugins/a11y-keyboard/msd-a11y-keyboard-manager.c')
| -rw-r--r-- | plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c index 88f11dc..a33cf40 100644 --- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c +++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c @@ -180,11 +180,7 @@ get_xkb_desc_rec (MsdA11yKeyboardManager *manager) desc->ctrls = NULL; status = XkbGetControls (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XkbAllControlsMask, desc); } -#if GTK_CHECK_VERSION (3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif g_return_val_if_fail (desc != NULL, NULL); g_return_val_if_fail (desc->ctrls != NULL, NULL); @@ -391,11 +387,7 @@ set_server_from_settings (MsdA11yKeyboardManager *manager) XkbFreeKeyboard (desc, XkbAllComponentsMask, True); XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif mate_settings_profile_end (NULL); } @@ -1074,11 +1066,7 @@ restore_server_xkb_config (MsdA11yKeyboardManager *manager) XkbAllComponentsMask, True); XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE); -#if GTK_CHECK_VERSION (3, 0, 0) gdk_error_trap_pop_ignored (); -#else - gdk_error_trap_pop (); -#endif manager->priv->original_xkb_desc = NULL; } |