[gnome-flashback] input-sources: remove almost unused dependency



commit 6b3271d858b3957a76508cf071c21f753e3d8ed7
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Mon Sep 28 03:35:32 2015 +0300

    input-sources: remove almost unused dependency

 configure.ac                                       |    1 -
 .../libinput-sources/gf-keyboard-manager.c         |   10 ++++------
 2 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e3faefb..6c9c5a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,6 @@ PKG_CHECK_MODULES([INPUT_SOURCES], [
   gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
   gtk+-3.0 >= $GTK_REQUIRED
   ibus-1.0 >= $IBUS_REQUIRED
-  xkbcommon-x11
   xkbfile
   xkeyboard-config
 ])
diff --git a/gnome-flashback/libinput-sources/gf-keyboard-manager.c 
b/gnome-flashback/libinput-sources/gf-keyboard-manager.c
index c59049c..bd3d322 100644
--- a/gnome-flashback/libinput-sources/gf-keyboard-manager.c
+++ b/gnome-flashback/libinput-sources/gf-keyboard-manager.c
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include <gdk/gdkx.h>
 #include <libgnome-desktop/gnome-languages.h>
-#include <xkbcommon/xkbcommon-x11.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBrules.h>
 
@@ -445,17 +444,16 @@ gf_keyboard_manager_init (GfKeyboardManager *manager)
   manager->xkb_info = gnome_xkb_info_new ();
   manager->options = g_strdup ("");
 
-  xkb_major = XKB_X11_MIN_MAJOR_XKB_VERSION;
-  xkb_minor = XKB_X11_MIN_MINOR_XKB_VERSION;
+  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))
     {
-      g_warning ("X server doesn't have the XKB extension, "
-                 "version %d.%d or newer", XKB_X11_MIN_MAJOR_XKB_VERSION,
-                 XKB_X11_MIN_MINOR_XKB_VERSION);
+      g_warning ("X server doesn't have the XKB extension, version %d.%d or "
+                 "newer", XkbMajorVersion, XkbMinorVersion);
       manager->have_xkb = FALSE;
     }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]