drop libxklavier dependency

Keyboard handling is now done without libxklavier, everywhere
else in gnome. Drop the dependency here, too.

We may have to add a patch to gnome-shell to give preference to
latin layouts at the login screen.

7 files changed, 0 insertions, 74 deletions

diff --git a/configure.ac b/configure.ac
index ba1a3c12..27c63eda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,6 @@ GTK_REQUIRED_VERSION=2.91.1
 PANGO_REQUIRED_VERSION=1.3.0
 SCROLLKEEPER_REQUIRED_VERSION=0.1.4
 GNOME_PANEL_REQUIRED_VERSION=2.0.0
-LIBXKLAVIER_REQUIRED_VERSION=4.0
 LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
 #FONTCONFIG_REQUIRED_VERSION=2.6.0
 FONTCONFIG_REQUIRED_VERSION=2.5.0
@@ -149,18 +148,6 @@ SIMPLE_GREETER_LIBS="$SIMPLE_GREETER_LIBS -lm"
 AC_SUBST(SIMPLE_GREETER_CFLAGS)
 AC_SUBST(SIMPLE_GREETER_LIBS)
 
-PKG_CHECK_MODULES(LIBXKLAVIER,
-        libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
-        have_libxklavier=yes,
-        have_libxklavier=no)
-if test "x$have_libxklavier" = "xyes" ; then
-  AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
-fi
-AM_CONDITIONAL(HAVE_LIBXKLAVIER, test x$have_libxklavier = xyes)
-AC_SUBST(HAVE_LIBXKLAVIER)
-AC_SUBST(LIBXKLAVIER_CFLAGS)
-AC_SUBST(LIBXKLAVIER_LIBS)
-
 PKG_CHECK_MODULES(SIMPLE_CHOOSER,
         gtk+-3.0 >= $GTK_REQUIRED_VERSION
 )
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index dae7f132..8d0cf5e6 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -196,7 +196,6 @@ gdm_simple_slave_LDADD = 			\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
-	$(LIBXKLAVIER_LIBS)			\
 	$(SYSTEMD_LIBS) 			\
 	$(NULL)
 
@@ -241,7 +240,6 @@ gdm_xdmcp_chooser_slave_LDADD = 		\
 	$(XLIB_LIBS)				\
 	$(DAEMON_LIBS)				\
 	$(EXTRA_DAEMON_LIBS)                    \
-	$(LIBXKLAVIER_LIBS)			\
 	$(SYSTEMD_LIBS) 			\
 	$(top_builddir)/common/libgdmcommon.la	\
 	$(NULL)
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 04bc3664..ba8e742d 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -43,11 +43,6 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#ifdef HAVE_LIBXKLAVIER
-#include <libxklavier/xklavier.h>
-#include <X11/Xlib.h> /* for Display */
-#endif
-
 #include "gdm-session.h"
 #include "gdm-session-glue.h"
 #include "gdm-dbus-util.h"
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 4fc9ac3f..36b93a49 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -933,8 +933,6 @@ setup_server (GdmSimpleSlave *slave)
         /* Set the busy cursor */
         gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
 
-        /* Set the initial keyboard layout to something reasonable */
-        gdm_slave_set_initial_keyboard_layout (GDM_SLAVE (slave));
         /* The root window has a background that may be useful
          * to cross fade or transition from when setting the
          * login screen background.  We read it here, and stuff
diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
index d2d9fa5b..18138e57 100644
--- a/daemon/gdm-slave.c
+++ b/daemon/gdm-slave.c
@@ -44,10 +44,6 @@
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 
-#ifdef HAVE_LIBXKLAVIER
-#include <libxklavier/xklavier.h>
-#endif
-
 #ifdef WITH_SYSTEMD
 #include <systemd/sd-login.h>
 #include <systemd/sd-daemon.h>
@@ -450,51 +446,6 @@ gdm_slave_save_root_windows (GdmSlave *slave)
         XSync (slave->priv->server_display, False);
 }
 
-void
-gdm_slave_set_initial_keyboard_layout (GdmSlave *slave)
-{
-#ifdef HAVE_LIBXKLAVIER
-        XklEngine    *engine;
-        XklConfigRec *config;
-
-        engine = xkl_engine_get_instance (slave->priv->server_display);
-        config = xkl_config_rec_new ();
-
-        if (xkl_config_rec_get_from_server (config, engine)) {
-                int i;
-
-                for (i = 1; config->layouts[i] != NULL; i++) {
-                        /* put us at the front of the list, since usernames and
-                         * passwords are usually ascii
-                         */
-                        if (strcmp (config->layouts[i], "us") == 0) {
-                                char *temp_layout;
-                                char *temp_variant = NULL;
-                                char *temp_options = NULL;
-
-                                temp_layout = config->layouts[0];
-                                config->layouts[0] = config->layouts[i];
-                                config->layouts[i] = temp_layout;
-
-                                if (config->variants != NULL) {
-                                        temp_variant = config->variants[0];
-                                        config->variants[0] = config->variants[i];
-                                        config->variants[i] = temp_variant;
-                                }
-
-                                if (config->options != NULL) {
-                                        temp_options = config->options[0];
-                                        config->options[0] = config->options[i];
-                                        config->options[i] = temp_options;
-                                }
-                                break;
-                        }
-                }
-                xkl_config_rec_activate (config, engine);
-        }
-#endif
-}
-
 static void
 determine_initial_cursor_position (GdmSlave *slave,
                                    int      *x,
diff --git a/daemon/gdm-slave.h b/daemon/gdm-slave.h
index dc046775..c9a40029 100644
--- a/daemon/gdm-slave.h
+++ b/daemon/gdm-slave.h
@@ -103,7 +103,6 @@ gboolean            gdm_slave_switch_to_user_session (GdmSlave   *slave,
 
 gboolean            gdm_slave_connect_to_x11_display (GdmSlave   *slave);
 
-void                gdm_slave_set_initial_keyboard_layout (GdmSlave *slave);
 void                gdm_slave_set_initial_cursor_position (GdmSlave *slave);
 
 void                gdm_slave_set_busy_cursor        (GdmSlave   *slave);
diff --git a/gui/simple-greeter/Makefile.am b/gui/simple-greeter/Makefile.am
index fdd80051..138114ba 100644
--- a/gui/simple-greeter/Makefile.am
+++ b/gui/simple-greeter/Makefile.am
@@ -117,7 +117,6 @@ test_greeter_panel_LDADD =	\
 	$(top_builddir)/gui/simple-greeter/libgdmsimplegreeter/libgdmsimplegreeter.la	\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(GTK_LIBS)			\
-	$(LIBXKLAVIER_LIBS)		\
 	$(UPOWER_LIBS)		\
 	$(NULL)
 
@@ -226,7 +225,6 @@ gdm_simple_greeter_LDADD = 		\
 	$(EXTRA_GREETER_LIBS)   	\
 	$(SIMPLE_GREETER_LIBS)		\
 	$(RBAC_LIBS)			\
-	$(LIBXKLAVIER_LIBS)		\
 	$(UPOWER_LIBS)		\
 	$(NULL)