[gnome-flashback] input-sources: remove not needed variable from keyboard manager
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-flashback] input-sources: remove not needed variable from keyboard manager
- Date: Mon, 28 Sep 2015 04:34:15 +0000 (UTC)
commit c938209ba2ec420f1b08a5f0121b3695fed19f92
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Mon Sep 28 03:48:43 2015 +0300
input-sources: remove not needed variable from keyboard manager
.../libinput-sources/gf-keyboard-manager.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/gnome-flashback/libinput-sources/gf-keyboard-manager.c
b/gnome-flashback/libinput-sources/gf-keyboard-manager.c
index bd3d322..ab525c7 100644
--- a/gnome-flashback/libinput-sources/gf-keyboard-manager.c
+++ b/gnome-flashback/libinput-sources/gf-keyboard-manager.c
@@ -52,7 +52,6 @@ struct _GfKeyboardManager
Display *xdisplay;
- gboolean have_xkb;
gint xkb_event_base;
gint xkb_error_base;
@@ -212,7 +211,7 @@ set_keymap (GfKeyboardManager *manager)
XkbRF_VarDefsRec *xkb_var_defs;
XkbRF_RulesRec *xkb_rules;
- if (manager->have_xkb == FALSE)
+ if (manager->xkb_event_base == -1)
return;
if (!manager->layouts || !manager->variants || !manager->options)
@@ -330,7 +329,7 @@ static void
apply_layout_index (GfKeyboardManager *manager,
guint index)
{
- if (manager->have_xkb == FALSE)
+ if (manager->xkb_event_base == -1)
return;
XkbLockGroup (manager->xdisplay, XkbUseCoreKbd, index);
@@ -447,14 +446,14 @@ gf_keyboard_manager_init (GfKeyboardManager *manager)
xkb_major = XkbMajorVersion;
xkb_minor = XkbMinorVersion;
- manager->have_xkb = TRUE;
if (!XkbQueryExtension (manager->xdisplay, &xkb_opcode,
&manager->xkb_event_base, &manager->xkb_error_base,
&xkb_major, &xkb_minor))
{
+ manager->xkb_event_base = -1;
+
g_warning ("X server doesn't have the XKB extension, version %d.%d or "
"newer", XkbMajorVersion, XkbMinorVersion);
- manager->have_xkb = FALSE;
}
g_signal_connect_object (device_manager, "device-added",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]