moving from https://github.com/perberos/mate-desktop-environment

20 files changed, 3476 insertions, 0 deletions

diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
new file mode 100644
index 0000000..fdad2a8
--- /dev/null
+++ b/plugins/keyboard/Makefile.am
@@ -0,0 +1,73 @@
+NULL =
+
+plugin_LTLIBRARIES = \
+	libkeyboard.la		\
+	$(NULL)
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 64x64
+context = devices
+
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+	  kbd-capslock-off.png kbd-numlock-off.png kbd-scrolllock-off.png \
+	  kbd-capslock-on.png kbd-numlock-on.png kbd-scrolllock-on.png
+
+uidir   = $(pkgdatadir)
+ui_DATA = modmap-dialog.ui
+
+libkeyboard_la_SOURCES = 	\
+	gsd-keyboard-plugin.h	\
+	gsd-keyboard-plugin.c	\
+	gsd-keyboard-manager.h	\
+	gsd-keyboard-manager.c	\
+	gsd-keyboard-xkb.h	\
+	gsd-keyboard-xkb.c	\
+	gsd-xmodmap.h		\
+	gsd-xmodmap.c		\
+	delayed-dialog.h	\
+	delayed-dialog.c	\
+	$(NULL)
+
+libkeyboard_la_CPPFLAGS = \
+	-I$(top_srcdir)/mate-settings-daemon		\
+	-DDATADIR=\""$(pkgdatadir)"\"	\
+	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libkeyboard_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(LIBMATEKBDUI_CFLAGS)		\
+	$(AM_CFLAGS)
+
+libkeyboard_la_LDFLAGS = 	\
+	$(GSD_PLUGIN_LDFLAGS)	\
+	$(NULL)
+
+libkeyboard_la_LIBADD  = 	\
+	$(SETTINGS_PLUGIN_LIBS)	\
+	$(XF86MISC_LIBS)	\
+	$(LIBMATEKBDUI_LIBS)	\
+	$(NULL)
+
+plugin_in_files = 		\
+	keyboard.mate-settings-plugin.in	\
+	$(NULL)
+
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+
+EXTRA_DIST = 			\
+	$(icons_DATA)		\
+	$(plugin_in_files)	\
+	$(ui_DATA)		\
+	$(NULL)
+
+CLEANFILES = 			\
+	$(plugin_DATA)		\
+	$(NULL)
+
+DISTCLEANFILES =		\
+	$(plugin_DATA)		\
+	$(NULL)
+
+@GSD_INTLTOOL_PLUGIN_RULE@
diff --git a/plugins/keyboard/Makefile.in b/plugins/keyboard/Makefile.in
new file mode 100644
index 0000000..021ac11
--- /dev/null
+++ b/plugins/keyboard/Makefile.in
@@ -0,0 +1,771 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = plugins/keyboard
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(iconsdir)" \
+	"$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"
+LTLIBRARIES = $(plugin_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+libkeyboard_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
+am__objects_1 =
+am_libkeyboard_la_OBJECTS = libkeyboard_la-gsd-keyboard-plugin.lo \
+	libkeyboard_la-gsd-keyboard-manager.lo \
+	libkeyboard_la-gsd-keyboard-xkb.lo \
+	libkeyboard_la-gsd-xmodmap.lo libkeyboard_la-delayed-dialog.lo \
+	$(am__objects_1)
+libkeyboard_la_OBJECTS = $(am_libkeyboard_la_OBJECTS)
+libkeyboard_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libkeyboard_la_CFLAGS) \
+	$(CFLAGS) $(libkeyboard_la_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+SOURCES = $(libkeyboard_la_SOURCES)
+DIST_SOURCES = $(libkeyboard_la_SOURCES)
+DATA = $(icons_DATA) $(plugin_DATA) $(ui_DATA)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DBUS_SYS_DIR = @DBUS_SYS_DIR@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
+FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GIOUNIX_CFLAGS = @GIOUNIX_CFLAGS@
+GIOUNIX_LIBS = @GIOUNIX_LIBS@
+GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+GSD_INTLTOOL_PLUGIN_RULE = @GSD_INTLTOOL_PLUGIN_RULE@
+GSD_PLUGIN_LDFLAGS = @GSD_PLUGIN_LDFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBEXECDIR = @LIBEXECDIR@
+LIBMATEKBDUI_CFLAGS = @LIBMATEKBDUI_CFLAGS@
+LIBMATEKBDUI_LIBS = @LIBMATEKBDUI_LIBS@
+LIBMATENOTIFY_CFLAGS = @LIBMATENOTIFY_CFLAGS@
+LIBMATENOTIFY_LIBS = @LIBMATENOTIFY_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MATECONFTOOL = @MATECONFTOOL@
+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
+MATE_KEYBINDINGS_KEYSDIR = @MATE_KEYBINDINGS_KEYSDIR@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+MSGMERGE = @MSGMERGE@
+NM = @NM@
+NMEDIT = @NMEDIT@
+NSS_CFLAGS = @NSS_CFLAGS@
+NSS_DATABASE = @NSS_DATABASE@
+NSS_LIBS = @NSS_LIBS@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+POFILES = @POFILES@
+POLKIT_CFLAGS = @POLKIT_CFLAGS@
+POLKIT_LIBS = @POLKIT_LIBS@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+PULSE_CFLAGS = @PULSE_CFLAGS@
+PULSE_LIBS = @PULSE_LIBS@
+RANLIB = @RANLIB@
+SED = @SED@
+SETTINGS_DAEMON_CFLAGS = @SETTINGS_DAEMON_CFLAGS@
+SETTINGS_DAEMON_LIBS = @SETTINGS_DAEMON_LIBS@
+SETTINGS_PLUGIN_CFLAGS = @SETTINGS_PLUGIN_CFLAGS@
+SETTINGS_PLUGIN_LIBS = @SETTINGS_PLUGIN_LIBS@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+X11_LIBS = @X11_LIBS@
+XF86MISC_LIBS = @XF86MISC_LIBS@
+XGETTEXT = @XGETTEXT@
+XINPUT_LIBS = @XINPUT_LIBS@
+XMKMF = @XMKMF@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+plugindir = @plugindir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+NULL = 
+plugin_LTLIBRARIES = \
+	libkeyboard.la		\
+	$(NULL)
+
+themedir = $(pkgdatadir)/icons/hicolor
+size = 64x64
+context = devices
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+	  kbd-capslock-off.png kbd-numlock-off.png kbd-scrolllock-off.png \
+	  kbd-capslock-on.png kbd-numlock-on.png kbd-scrolllock-on.png
+
+uidir = $(pkgdatadir)
+ui_DATA = modmap-dialog.ui
+libkeyboard_la_SOURCES = \
+	gsd-keyboard-plugin.h	\
+	gsd-keyboard-plugin.c	\
+	gsd-keyboard-manager.h	\
+	gsd-keyboard-manager.c	\
+	gsd-keyboard-xkb.h	\
+	gsd-keyboard-xkb.c	\
+	gsd-xmodmap.h		\
+	gsd-xmodmap.c		\
+	delayed-dialog.h	\
+	delayed-dialog.c	\
+	$(NULL)
+
+libkeyboard_la_CPPFLAGS = \
+	-I$(top_srcdir)/mate-settings-daemon		\
+	-DDATADIR=\""$(pkgdatadir)"\"	\
+	-DMATE_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+	$(AM_CPPFLAGS)
+
+libkeyboard_la_CFLAGS = \
+	$(SETTINGS_PLUGIN_CFLAGS)	\
+	$(LIBMATEKBDUI_CFLAGS)		\
+	$(AM_CFLAGS)
+
+libkeyboard_la_LDFLAGS = \
+	$(GSD_PLUGIN_LDFLAGS)	\
+	$(NULL)
+
+libkeyboard_la_LIBADD = \
+	$(SETTINGS_PLUGIN_LIBS)	\
+	$(XF86MISC_LIBS)	\
+	$(LIBMATEKBDUI_LIBS)	\
+	$(NULL)
+
+plugin_in_files = \
+	keyboard.mate-settings-plugin.in	\
+	$(NULL)
+
+plugin_DATA = $(plugin_in_files:.mate-settings-plugin.in=.mate-settings-plugin)
+EXTRA_DIST = \
+	$(icons_DATA)		\
+	$(plugin_in_files)	\
+	$(ui_DATA)		\
+	$(NULL)
+
+CLEANFILES = \
+	$(plugin_DATA)		\
+	$(NULL)
+
+DISTCLEANFILES = \
+	$(plugin_DATA)		\
+	$(NULL)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plugins/keyboard/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plugins/keyboard/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
+	}
+
+uninstall-pluginLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \
+	done
+
+clean-pluginLTLIBRARIES:
+	-test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES)
+	@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+	  test "$$dir" != "$$p" || dir=.; \
+	  echo "rm -f \"$${dir}/so_locations\""; \
+	  rm -f "$${dir}/so_locations"; \
+	done
+libkeyboard.la: $(libkeyboard_la_OBJECTS) $(libkeyboard_la_DEPENDENCIES) 
+	$(libkeyboard_la_LINK) -rpath $(plugindir) $(libkeyboard_la_OBJECTS) $(libkeyboard_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-delayed-dialog.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-gsd-keyboard-manager.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-gsd-keyboard-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-gsd-keyboard-xkb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libkeyboard_la-gsd-xmodmap.Plo@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+
+libkeyboard_la-gsd-keyboard-plugin.lo: gsd-keyboard-plugin.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-gsd-keyboard-plugin.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-gsd-keyboard-plugin.Tpo -c -o libkeyboard_la-gsd-keyboard-plugin.lo `test -f 'gsd-keyboard-plugin.c' || echo '$(srcdir)/'`gsd-keyboard-plugin.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libkeyboard_la-gsd-keyboard-plugin.Tpo $(DEPDIR)/libkeyboard_la-gsd-keyboard-plugin.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsd-keyboard-plugin.c' object='libkeyboard_la-gsd-keyboard-plugin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-gsd-keyboard-plugin.lo `test -f 'gsd-keyboard-plugin.c' || echo '$(srcdir)/'`gsd-keyboard-plugin.c
+
+libkeyboard_la-gsd-keyboard-manager.lo: gsd-keyboard-manager.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-gsd-keyboard-manager.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-gsd-keyboard-manager.Tpo -c -o libkeyboard_la-gsd-keyboard-manager.lo `test -f 'gsd-keyboard-manager.c' || echo '$(srcdir)/'`gsd-keyboard-manager.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libkeyboard_la-gsd-keyboard-manager.Tpo $(DEPDIR)/libkeyboard_la-gsd-keyboard-manager.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsd-keyboard-manager.c' object='libkeyboard_la-gsd-keyboard-manager.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-gsd-keyboard-manager.lo `test -f 'gsd-keyboard-manager.c' || echo '$(srcdir)/'`gsd-keyboard-manager.c
+
+libkeyboard_la-gsd-keyboard-xkb.lo: gsd-keyboard-xkb.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-gsd-keyboard-xkb.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-gsd-keyboard-xkb.Tpo -c -o libkeyboard_la-gsd-keyboard-xkb.lo `test -f 'gsd-keyboard-xkb.c' || echo '$(srcdir)/'`gsd-keyboard-xkb.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libkeyboard_la-gsd-keyboard-xkb.Tpo $(DEPDIR)/libkeyboard_la-gsd-keyboard-xkb.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsd-keyboard-xkb.c' object='libkeyboard_la-gsd-keyboard-xkb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-gsd-keyboard-xkb.lo `test -f 'gsd-keyboard-xkb.c' || echo '$(srcdir)/'`gsd-keyboard-xkb.c
+
+libkeyboard_la-gsd-xmodmap.lo: gsd-xmodmap.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-gsd-xmodmap.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-gsd-xmodmap.Tpo -c -o libkeyboard_la-gsd-xmodmap.lo `test -f 'gsd-xmodmap.c' || echo '$(srcdir)/'`gsd-xmodmap.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libkeyboard_la-gsd-xmodmap.Tpo $(DEPDIR)/libkeyboard_la-gsd-xmodmap.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gsd-xmodmap.c' object='libkeyboard_la-gsd-xmodmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-gsd-xmodmap.lo `test -f 'gsd-xmodmap.c' || echo '$(srcdir)/'`gsd-xmodmap.c
+
+libkeyboard_la-delayed-dialog.lo: delayed-dialog.c
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -MT libkeyboard_la-delayed-dialog.lo -MD -MP -MF $(DEPDIR)/libkeyboard_la-delayed-dialog.Tpo -c -o libkeyboard_la-delayed-dialog.lo `test -f 'delayed-dialog.c' || echo '$(srcdir)/'`delayed-dialog.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libkeyboard_la-delayed-dialog.Tpo $(DEPDIR)/libkeyboard_la-delayed-dialog.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='delayed-dialog.c' object='libkeyboard_la-delayed-dialog.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libkeyboard_la_CPPFLAGS) $(CPPFLAGS) $(libkeyboard_la_CFLAGS) $(CFLAGS) -c -o libkeyboard_la-delayed-dialog.lo `test -f 'delayed-dialog.c' || echo '$(srcdir)/'`delayed-dialog.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-iconsDATA: $(icons_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
+	done
+
+uninstall-iconsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(icons_DATA)'; test -n "$(iconsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
+install-pluginDATA: $(plugin_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(plugindir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(plugindir)" || exit $$?; \
+	done
+
+uninstall-pluginDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(plugindir)" && rm -f $$files
+install-uiDATA: $(ui_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
+	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
+	done
+
+uninstall-uiDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(ui_DATA)'; test -n "$(uidir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(uidir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES) $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(uidir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pluginLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA install-pluginDATA \
+	install-pluginLTLIBRARIES install-uiDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-uiDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-iconsDATA install-info install-info-am \
+	install-man install-pdf install-pdf-am install-pluginDATA \
+	install-pluginLTLIBRARIES install-ps install-ps-am \
+	install-strip install-uiDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-iconsDATA uninstall-pluginDATA \
+	uninstall-pluginLTLIBRARIES uninstall-uiDATA
+
+
+@GSD_INTLTOOL_PLUGIN_RULE@
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/plugins/keyboard/delayed-dialog.c b/plugins/keyboard/delayed-dialog.c
new file mode 100644
index 0000000..1aa13e1
--- /dev/null
+++ b/plugins/keyboard/delayed-dialog.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+
+#include "delayed-dialog.h"
+
+static gboolean        delayed_show_timeout (gpointer   data);
+static GdkFilterReturn message_filter       (GdkXEvent *xevent,
+                                             GdkEvent  *event,
+                                             gpointer   data);
+
+static GSList *dialogs = NULL;
+
+/**
+ * gsd_delayed_show_dialog:
+ * @dialog: the dialog
+ *
+ * Shows the dialog as with gtk_widget_show(), unless a window manager
+ * hasn't been started yet, in which case it will wait up to 5 seconds
+ * for that to happen before showing the dialog.
+ **/
+void
+gsd_delayed_show_dialog (GtkWidget *dialog)
+{
+        GdkDisplay *display = gtk_widget_get_display (dialog);
+        Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+        GdkScreen *screen = gtk_widget_get_screen (dialog);
+        GdkAtom manager_atom;
+        char selection_name[10];
+        Atom selection_atom;
+
+        /* We can't use gdk_selection_owner_get() for this, because
+         * it's an unknown out-of-process window.
+         */
+        snprintf (selection_name, sizeof (selection_name), "WM_S%d",
+                  gdk_screen_get_number (screen));
+        selection_atom = XInternAtom (xdisplay, selection_name, True);
+        if (selection_atom &&
+            XGetSelectionOwner (xdisplay, selection_atom) != None) {
+                gtk_widget_show (dialog);
+                return;
+        }
+
+        dialogs = g_slist_prepend (dialogs, dialog);
+
+        manager_atom = gdk_atom_intern ("MANAGER", FALSE);
+        gdk_display_add_client_message_filter (display, manager_atom,
+                                               message_filter, NULL);
+
+        g_timeout_add (5000, delayed_show_timeout, NULL);
+}
+
+static gboolean
+delayed_show_timeout (gpointer data)
+{
+        GSList *l;
+
+        for (l = dialogs; l; l = l->next)
+                gtk_widget_show (l->data);
+        g_slist_free (dialogs);
+        dialogs = NULL;
+
+        /* FIXME: There's no gdk_display_remove_client_message_filter */
+
+        return FALSE;
+}
+
+static GdkFilterReturn
+message_filter (GdkXEvent *xevent, GdkEvent *event, gpointer data)
+{
+        XClientMessageEvent *evt = (XClientMessageEvent *)xevent;
+        char *selection_name = XGetAtomName (evt->display, evt->data.l[1]);
+        int screen;
+        GSList *l, *next;
+
+        if (!dialogs)
+                return GDK_FILTER_CONTINUE;
+
+        if (strncmp (selection_name, "WM_S", 4) != 0) {
+                XFree (selection_name);
+                return GDK_FILTER_CONTINUE;
+        }
+
+        screen = atoi (selection_name + 4);
+
+        for (l = dialogs; l; l = next) {
+                GtkWidget *dialog = l->data;
+                next = l->next;
+
+                if (gdk_screen_get_number (gtk_widget_get_screen (dialog)) == screen) {
+                        gtk_widget_show (dialog);
+                        dialogs = g_slist_remove (dialogs, dialog);
+                }
+        }
+
+        if (!dialogs) {
+                /* FIXME: There's no gdk_display_remove_client_message_filter */
+        }
+
+        return GDK_FILTER_CONTINUE;
+}
diff --git a/plugins/keyboard/delayed-dialog.h b/plugins/keyboard/delayed-dialog.h
new file mode 100644
index 0000000..353dbe6
--- /dev/null
+++ b/plugins/keyboard/delayed-dialog.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+
+#ifndef __DELAYED_DIALOG_H
+#define __DELAYED_DIALOG_H
+
+#include <gtk/gtk.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void            gsd_delayed_show_dialog (GtkWidget *dialog);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
new file mode 100644
index 0000000..343706d
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-manager.c
@@ -0,0 +1,570 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright © 2001 Ximian, Inc.
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+
+#include <locale.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
+#  include <X11/extensions/xf86misc.h>
+#endif
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+#include <X11/XKBlib.h>
+#include <X11/keysym.h>
+#endif
+
+#include "mate-settings-profile.h"
+#include "gsd-keyboard-manager.h"
+
+#include "gsd-keyboard-xkb.h"
+#include "gsd-xmodmap.h"
+
+#define GSD_KEYBOARD_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerPrivate))
+
+#ifndef HOST_NAME_MAX
+#  define HOST_NAME_MAX 255
+#endif
+
+#define GSD_KEYBOARD_KEY "/desktop/mate/peripherals/keyboard"
+
+#define KEY_REPEAT        GSD_KEYBOARD_KEY "/repeat"
+#define KEY_CLICK         GSD_KEYBOARD_KEY "/click"
+#define KEY_RATE          GSD_KEYBOARD_KEY "/rate"
+#define KEY_DELAY         GSD_KEYBOARD_KEY "/delay"
+#define KEY_CLICK_VOLUME  GSD_KEYBOARD_KEY "/click_volume"
+
+#define KEY_BELL_VOLUME   GSD_KEYBOARD_KEY "/bell_volume"
+#define KEY_BELL_PITCH    GSD_KEYBOARD_KEY "/bell_pitch"
+#define KEY_BELL_DURATION GSD_KEYBOARD_KEY "/bell_duration"
+#define KEY_BELL_MODE     GSD_KEYBOARD_KEY "/bell_mode"
+
+struct GsdKeyboardManagerPrivate
+{
+        gboolean have_xkb;
+        gint     xkb_event_base;
+        guint    notify;
+};
+
+static void     gsd_keyboard_manager_class_init  (GsdKeyboardManagerClass *klass);
+static void     gsd_keyboard_manager_init        (GsdKeyboardManager      *keyboard_manager);
+static void     gsd_keyboard_manager_finalize    (GObject                 *object);
+
+G_DEFINE_TYPE (GsdKeyboardManager, gsd_keyboard_manager, G_TYPE_OBJECT)
+
+static gpointer manager_object = NULL;
+
+
+#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
+static gboolean
+xfree86_set_keyboard_autorepeat_rate (int delay, int rate)
+{
+        gboolean res = FALSE;
+        int      event_base_return;
+        int      error_base_return;
+
+        if (XF86MiscQueryExtension (GDK_DISPLAY (),
+                                    &event_base_return,
+                                    &error_base_return) == True) {
+                /* load the current settings */
+                XF86MiscKbdSettings kbdsettings;
+                XF86MiscGetKbdSettings (GDK_DISPLAY (), &kbdsettings);
+
+                /* assign the new values */
+                kbdsettings.delay = delay;
+                kbdsettings.rate = rate;
+                XF86MiscSetKbdSettings (GDK_DISPLAY (), &kbdsettings);
+                res = TRUE;
+        }
+
+        return res;
+}
+#endif /* HAVE_X11_EXTENSIONS_XF86MISC_H */
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+static gboolean
+xkb_set_keyboard_autorepeat_rate (int delay, int rate)
+{
+        int interval = (rate <= 0) ? 1000000 : 1000/rate;
+        if (delay <= 0)
+                delay = 1;
+        return XkbSetAutoRepeatRate (GDK_DISPLAY (),
+                                     XkbUseCoreKbd,
+                                     delay,
+                                     interval);
+}
+#endif
+
+static char *
+gsd_keyboard_get_hostname_key (const char *subkey)
+{
+        char hostname[HOST_NAME_MAX + 1];
+
+        if (gethostname (hostname, sizeof (hostname)) == 0 &&
+            strcmp (hostname, "localhost") != 0 &&
+            strcmp (hostname, "localhost.localdomain") != 0) {
+                char *escaped;
+                char *key;
+
+                escaped = mateconf_escape_key (hostname, -1);
+                key = g_strconcat (GSD_KEYBOARD_KEY
+                                   "/host-",
+                                   escaped,
+                                   "/0/",
+                                   subkey,
+                                   NULL);
+                g_free (escaped);
+                return key;
+        } else
+                return NULL;
+}
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+
+typedef enum {
+        NUMLOCK_STATE_OFF = 0,
+        NUMLOCK_STATE_ON = 1,
+        NUMLOCK_STATE_UNKNOWN = 2
+} NumLockState;
+
+static void
+numlock_xkb_init (GsdKeyboardManager *manager)
+{
+        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+        gboolean have_xkb;
+        int opcode, error_base, major, minor;
+
+        have_xkb = XkbQueryExtension (dpy,
+                                      &opcode,
+                                      &manager->priv->xkb_event_base,
+                                      &error_base,
+                                      &major,
+                                      &minor)
+                && XkbUseExtension (dpy, &major, &minor);
+
+        if (have_xkb) {
+                XkbSelectEventDetails (dpy,
+                                       XkbUseCoreKbd,
+                                       XkbStateNotifyMask,
+                                       XkbModifierLockMask,
+                                       XkbModifierLockMask);
+        } else {
+                g_warning ("XKB extension not available");
+        }
+
+        manager->priv->have_xkb = have_xkb;
+}
+
+static unsigned
+numlock_NumLock_modifier_mask (void)
+{
+        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+        return XkbKeysymToModifiers (dpy, XK_Num_Lock);
+}
+
+static void
+numlock_set_xkb_state (NumLockState new_state)
+{
+        unsigned int num_mask;
+        Display *dpy = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+        if (new_state != NUMLOCK_STATE_ON && new_state != NUMLOCK_STATE_OFF)
+                return;
+        num_mask = numlock_NumLock_modifier_mask ();
+        XkbLockModifiers (dpy, XkbUseCoreKbd, num_mask, new_state ? num_mask : 0);
+}
+
+static char *
+numlock_mateconf_state_key (void)
+{
+        char *key = gsd_keyboard_get_hostname_key ("numlock_on");
+        if (!key) {
+                g_message ("NumLock remembering disabled because hostname is set to \"localhost\"");
+        }
+        return key;
+}
+
+static NumLockState
+numlock_get_mateconf_state (MateConfClient *client)
+{
+        int          curr_state;
+        GError      *err = NULL;
+        char        *key = numlock_mateconf_state_key ();
+
+        if (!key) {
+                return NUMLOCK_STATE_UNKNOWN;
+        }
+
+        curr_state = mateconf_client_get_bool (client, key, &err);
+        if (err) {
+                curr_state = NUMLOCK_STATE_UNKNOWN;
+                g_error_free (err);
+        }
+
+        g_free (key);
+        return curr_state;
+}
+
+static void
+numlock_set_mateconf_state (MateConfClient *client,
+                         NumLockState new_state)
+{
+        char *key;
+
+        if (new_state != NUMLOCK_STATE_ON && new_state != NUMLOCK_STATE_OFF) {
+                return;
+        }
+
+        key = numlock_mateconf_state_key ();
+        if (key) {
+                mateconf_client_set_bool (client, key, new_state, NULL);
+                g_free (key);
+        }
+}
+
+static GdkFilterReturn
+numlock_xkb_callback (GdkXEvent *xev_,
+                      GdkEvent *gdkev_,
+                      gpointer xkb_event_code)
+{
+        XEvent *xev = (XEvent *) xev_;
+
+        if (xev->type == GPOINTER_TO_INT (xkb_event_code)) {
+                XkbEvent *xkbev = (XkbEvent *)xev;
+                if (xkbev->any.xkb_type == XkbStateNotify)
+                if (xkbev->state.changed & XkbModifierLockMask) {
+                        unsigned num_mask = numlock_NumLock_modifier_mask ();
+                        unsigned locked_mods = xkbev->state.locked_mods;
+                        int numlock_state = !! (num_mask & locked_mods);
+                        MateConfClient *client = mateconf_client_get_default ();
+                        numlock_set_mateconf_state (client, numlock_state);
+                        g_object_unref (client);
+                }
+        }
+        return GDK_FILTER_CONTINUE;
+}
+
+static void
+numlock_install_xkb_callback (GsdKeyboardManager *manager)
+{
+        if (!manager->priv->have_xkb)
+                return;
+
+        gdk_window_add_filter (NULL,
+                               numlock_xkb_callback,
+                               GINT_TO_POINTER (manager->priv->xkb_event_base));
+}
+
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+static void
+apply_settings (MateConfClient        *client,
+                guint               cnxn_id,
+                MateConfEntry         *entry,
+                GsdKeyboardManager *manager)
+{
+        XKeyboardControl kbdcontrol;
+        gboolean         repeat;
+        gboolean         click;
+        int              rate;
+        int              delay;
+        int              click_volume;
+        int              bell_volume;
+        int              bell_pitch;
+        int              bell_duration;
+        char            *volume_string;
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+        gboolean         rnumlock;
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        repeat        = mateconf_client_get_bool  (client, KEY_REPEAT, NULL);
+        click         = mateconf_client_get_bool  (client, KEY_CLICK, NULL);
+        rate          = mateconf_client_get_int   (client, KEY_RATE, NULL);
+        delay         = mateconf_client_get_int   (client, KEY_DELAY, NULL);
+        click_volume  = mateconf_client_get_int   (client, KEY_CLICK_VOLUME, NULL);
+#if 0
+        bell_volume   = mateconf_client_get_int   (client, KEY_BELL_VOLUME, NULL);
+#endif
+        bell_pitch    = mateconf_client_get_int   (client, KEY_BELL_PITCH, NULL);
+        bell_duration = mateconf_client_get_int   (client, KEY_BELL_DURATION, NULL);
+
+        volume_string = mateconf_client_get_string (client, KEY_BELL_MODE, NULL);
+        bell_volume   = (volume_string && !strcmp (volume_string, "on")) ? 50 : 0;
+        g_free (volume_string);
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+        rnumlock      = mateconf_client_get_bool  (client, GSD_KEYBOARD_KEY "/remember_numlock_state", NULL);
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        gdk_error_trap_push ();
+        if (repeat) {
+                gboolean rate_set = FALSE;
+
+                XAutoRepeatOn (GDK_DISPLAY ());
+                /* Use XKB in preference */
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+                rate_set = xkb_set_keyboard_autorepeat_rate (delay, rate);
+#endif
+#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
+                if (!rate_set)
+                        rate_set = xfree86_set_keyboard_autorepeat_rate (delay, rate);
+#endif
+                if (!rate_set)
+                        g_warning ("Neither XKeyboard not Xfree86's keyboard extensions are available,\n"
+                                   "no way to support keyboard autorepeat rate settings");
+        } else {
+                XAutoRepeatOff (GDK_DISPLAY ());
+        }
+
+        /* as percentage from 0..100 inclusive */
+        if (click_volume < 0) {
+                click_volume = 0;
+        } else if (click_volume > 100) {
+                click_volume = 100;
+        }
+        kbdcontrol.key_click_percent = click ? click_volume : 0;
+        kbdcontrol.bell_percent = bell_volume;
+        kbdcontrol.bell_pitch = bell_pitch;
+        kbdcontrol.bell_duration = bell_duration;
+        XChangeKeyboardControl (GDK_DISPLAY (),
+                                KBKeyClickPercent | KBBellPercent | KBBellPitch | KBBellDuration,
+                                &kbdcontrol);
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+        if (manager->priv->have_xkb && rnumlock) {
+                numlock_set_xkb_state (numlock_get_mateconf_state (client));
+        }
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        XSync (GDK_DISPLAY (), FALSE);
+        gdk_error_trap_pop ();
+}
+
+void
+gsd_keyboard_manager_apply_settings (GsdKeyboardManager *manager)
+{
+        MateConfClient *client;
+
+        client = mateconf_client_get_default ();
+        apply_settings (client, 0, NULL, manager);
+        g_object_unref (client);
+}
+
+static gboolean
+start_keyboard_idle_cb (GsdKeyboardManager *manager)
+{
+        MateConfClient *client;
+
+        mate_settings_profile_start (NULL);
+
+        g_debug ("Starting keyboard manager");
+
+        manager->priv->have_xkb = 0;
+        client = mateconf_client_get_default ();
+
+        mateconf_client_add_dir (client, GSD_KEYBOARD_KEY, MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL);
+
+        /* Essential - xkb initialization should happen before */
+        gsd_keyboard_xkb_set_post_activation_callback ((PostActivationCallback) gsd_load_modmap_files, NULL);
+        gsd_keyboard_xkb_init (client, manager);
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+        numlock_xkb_init (manager);
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        /* apply current settings before we install the callback */
+        gsd_keyboard_manager_apply_settings (manager);
+
+        manager->priv->notify = mateconf_client_notify_add (client, GSD_KEYBOARD_KEY,
+                                                         (MateConfClientNotifyFunc) apply_settings, manager,
+                                                         NULL, NULL);
+
+        g_object_unref (client);
+
+#ifdef HAVE_X11_EXTENSIONS_XKB_H
+        numlock_install_xkb_callback (manager);
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        mate_settings_profile_end (NULL);
+
+        return FALSE;
+}
+
+gboolean
+gsd_keyboard_manager_start (GsdKeyboardManager *manager,
+                            GError            **error)
+{
+        mate_settings_profile_start (NULL);
+
+        g_idle_add ((GSourceFunc) start_keyboard_idle_cb, manager);
+
+        mate_settings_profile_end (NULL);
+
+        return TRUE;
+}
+
+void
+gsd_keyboard_manager_stop (GsdKeyboardManager *manager)
+{
+        GsdKeyboardManagerPrivate *p = manager->priv;
+
+        g_debug ("Stopping keyboard manager");
+
+        if (p->notify != 0) {
+                MateConfClient *client = mateconf_client_get_default ();
+                mateconf_client_remove_dir (client, GSD_KEYBOARD_KEY, NULL);
+                mateconf_client_notify_remove (client, p->notify);
+                g_object_unref (client);
+                p->notify = 0;
+        }
+
+#if HAVE_X11_EXTENSIONS_XKB_H
+        if (p->have_xkb) {
+                gdk_window_remove_filter (NULL,
+                                          numlock_xkb_callback,
+                                          GINT_TO_POINTER (p->xkb_event_base));
+        }
+#endif /* HAVE_X11_EXTENSIONS_XKB_H */
+
+        gsd_keyboard_xkb_shutdown ();
+}
+
+static void
+gsd_keyboard_manager_set_property (GObject        *object,
+                                   guint           prop_id,
+                                   const GValue   *value,
+                                   GParamSpec     *pspec)
+{
+        GsdKeyboardManager *self;
+
+        self = GSD_KEYBOARD_MANAGER (object);
+
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static void
+gsd_keyboard_manager_get_property (GObject        *object,
+                                   guint           prop_id,
+                                   GValue         *value,
+                                   GParamSpec     *pspec)
+{
+        GsdKeyboardManager *self;
+
+        self = GSD_KEYBOARD_MANAGER (object);
+
+        switch (prop_id) {
+        default:
+                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+                break;
+        }
+}
+
+static GObject *
+gsd_keyboard_manager_constructor (GType                  type,
+                                  guint                  n_construct_properties,
+                                  GObjectConstructParam *construct_properties)
+{
+        GsdKeyboardManager      *keyboard_manager;
+        GsdKeyboardManagerClass *klass;
+
+        klass = GSD_KEYBOARD_MANAGER_CLASS (g_type_class_peek (GSD_TYPE_KEYBOARD_MANAGER));
+
+        keyboard_manager = GSD_KEYBOARD_MANAGER (G_OBJECT_CLASS (gsd_keyboard_manager_parent_class)->constructor (type,
+                                                                                                      n_construct_properties,
+                                                                                                      construct_properties));
+
+        return G_OBJECT (keyboard_manager);
+}
+
+static void
+gsd_keyboard_manager_dispose (GObject *object)
+{
+        GsdKeyboardManager *keyboard_manager;
+
+        keyboard_manager = GSD_KEYBOARD_MANAGER (object);
+
+        G_OBJECT_CLASS (gsd_keyboard_manager_parent_class)->dispose (object);
+}
+
+static void
+gsd_keyboard_manager_class_init (GsdKeyboardManagerClass *klass)
+{
+        GObjectClass   *object_class = G_OBJECT_CLASS (klass);
+
+        object_class->get_property = gsd_keyboard_manager_get_property;
+        object_class->set_property = gsd_keyboard_manager_set_property;
+        object_class->constructor = gsd_keyboard_manager_constructor;
+        object_class->dispose = gsd_keyboard_manager_dispose;
+        object_class->finalize = gsd_keyboard_manager_finalize;
+
+        g_type_class_add_private (klass, sizeof (GsdKeyboardManagerPrivate));
+}
+
+static void
+gsd_keyboard_manager_init (GsdKeyboardManager *manager)
+{
+        manager->priv = GSD_KEYBOARD_MANAGER_GET_PRIVATE (manager);
+}
+
+static void
+gsd_keyboard_manager_finalize (GObject *object)
+{
+        GsdKeyboardManager *keyboard_manager;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GSD_IS_KEYBOARD_MANAGER (object));
+
+        keyboard_manager = GSD_KEYBOARD_MANAGER (object);
+
+        g_return_if_fail (keyboard_manager->priv != NULL);
+
+        G_OBJECT_CLASS (gsd_keyboard_manager_parent_class)->finalize (object);
+}
+
+GsdKeyboardManager *
+gsd_keyboard_manager_new (void)
+{
+        if (manager_object != NULL) {
+                g_object_ref (manager_object);
+        } else {
+                manager_object = g_object_new (GSD_TYPE_KEYBOARD_MANAGER, NULL);
+                g_object_add_weak_pointer (manager_object,
+                                           (gpointer *) &manager_object);
+        }
+
+        return GSD_KEYBOARD_MANAGER (manager_object);
+}
diff --git a/plugins/keyboard/gsd-keyboard-manager.h b/plugins/keyboard/gsd-keyboard-manager.h
new file mode 100644
index 0000000..a518e9a
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-manager.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __GSD_KEYBOARD_MANAGER_H
+#define __GSD_KEYBOARD_MANAGER_H
+
+#include <glib-object.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GSD_TYPE_KEYBOARD_MANAGER         (gsd_keyboard_manager_get_type ())
+#define GSD_KEYBOARD_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManager))
+#define GSD_KEYBOARD_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerClass))
+#define GSD_IS_KEYBOARD_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_KEYBOARD_MANAGER))
+#define GSD_IS_KEYBOARD_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_KEYBOARD_MANAGER))
+#define GSD_KEYBOARD_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_KEYBOARD_MANAGER, GsdKeyboardManagerClass))
+
+typedef struct GsdKeyboardManagerPrivate GsdKeyboardManagerPrivate;
+
+typedef struct
+{
+        GObject                     parent;
+        GsdKeyboardManagerPrivate *priv;
+} GsdKeyboardManager;
+
+typedef struct
+{
+        GObjectClass   parent_class;
+} GsdKeyboardManagerClass;
+
+GType                   gsd_keyboard_manager_get_type            (void);
+
+GsdKeyboardManager *       gsd_keyboard_manager_new                 (void);
+gboolean                gsd_keyboard_manager_start               (GsdKeyboardManager *manager,
+                                                               GError         **error);
+void                    gsd_keyboard_manager_stop                (GsdKeyboardManager *manager);
+void                    gsd_keyboard_manager_apply_settings      (GsdKeyboardManager *manager);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GSD_KEYBOARD_MANAGER_H */
diff --git a/plugins/keyboard/gsd-keyboard-plugin.c b/plugins/keyboard/gsd-keyboard-plugin.c
new file mode 100644
index 0000000..b501d80
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-plugin.c
@@ -0,0 +1,104 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include <glib/gi18n-lib.h>
+#include <gmodule.h>
+
+#include "mate-settings-plugin.h"
+#include "gsd-keyboard-plugin.h"
+#include "gsd-keyboard-manager.h"
+
+struct GsdKeyboardPluginPrivate {
+        GsdKeyboardManager *manager;
+};
+
+#define GSD_KEYBOARD_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_KEYBOARD_PLUGIN, GsdKeyboardPluginPrivate))
+
+MATE_SETTINGS_PLUGIN_REGISTER (GsdKeyboardPlugin, gsd_keyboard_plugin)
+
+static void
+gsd_keyboard_plugin_init (GsdKeyboardPlugin *plugin)
+{
+        plugin->priv = GSD_KEYBOARD_PLUGIN_GET_PRIVATE (plugin);
+
+        g_debug ("GsdKeyboardPlugin initializing");
+
+        plugin->priv->manager = gsd_keyboard_manager_new ();
+}
+
+static void
+gsd_keyboard_plugin_finalize (GObject *object)
+{
+        GsdKeyboardPlugin *plugin;
+
+        g_return_if_fail (object != NULL);
+        g_return_if_fail (GSD_IS_KEYBOARD_PLUGIN (object));
+
+        g_debug ("GsdKeyboardPlugin finalizing");
+
+        plugin = GSD_KEYBOARD_PLUGIN (object);
+
+        g_return_if_fail (plugin->priv != NULL);
+
+        if (plugin->priv->manager != NULL) {
+                g_object_unref (plugin->priv->manager);
+        }
+
+        G_OBJECT_CLASS (gsd_keyboard_plugin_parent_class)->finalize (object);
+}
+
+static void
+impl_activate (MateSettingsPlugin *plugin)
+{
+        gboolean res;
+        GError  *error;
+
+        g_debug ("Activating keyboard plugin");
+
+        error = NULL;
+        res = gsd_keyboard_manager_start (GSD_KEYBOARD_PLUGIN (plugin)->priv->manager, &error);
+        if (! res) {
+                g_warning ("Unable to start keyboard manager: %s", error->message);
+                g_error_free (error);
+        }
+}
+
+static void
+impl_deactivate (MateSettingsPlugin *plugin)
+{
+        g_debug ("Deactivating keyboard plugin");
+        gsd_keyboard_manager_stop (GSD_KEYBOARD_PLUGIN (plugin)->priv->manager);
+}
+
+static void
+gsd_keyboard_plugin_class_init (GsdKeyboardPluginClass *klass)
+{
+        GObjectClass           *object_class = G_OBJECT_CLASS (klass);
+        MateSettingsPluginClass *plugin_class = MATE_SETTINGS_PLUGIN_CLASS (klass);
+
+        object_class->finalize = gsd_keyboard_plugin_finalize;
+
+        plugin_class->activate = impl_activate;
+        plugin_class->deactivate = impl_deactivate;
+
+        g_type_class_add_private (klass, sizeof (GsdKeyboardPluginPrivate));
+}
diff --git a/plugins/keyboard/gsd-keyboard-plugin.h b/plugins/keyboard/gsd-keyboard-plugin.h
new file mode 100644
index 0000000..3d25861
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-plugin.h
@@ -0,0 +1,63 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2007 William Jon McCann <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#ifndef __GSD_KEYBOARD_PLUGIN_H__
+#define __GSD_KEYBOARD_PLUGIN_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include <gmodule.h>
+
+#include "mate-settings-plugin.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define GSD_TYPE_KEYBOARD_PLUGIN                (gsd_keyboard_plugin_get_type ())
+#define GSD_KEYBOARD_PLUGIN(o)                  (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_KEYBOARD_PLUGIN, GsdKeyboardPlugin))
+#define GSD_KEYBOARD_PLUGIN_CLASS(k)            (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_KEYBOARD_PLUGIN, GsdKeyboardPluginClass))
+#define GSD_IS_KEYBOARD_PLUGIN(o)               (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_KEYBOARD_PLUGIN))
+#define GSD_IS_KEYBOARD_PLUGIN_CLASS(k)         (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_KEYBOARD_PLUGIN))
+#define GSD_KEYBOARD_PLUGIN_GET_CLASS(o)        (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_KEYBOARD_PLUGIN, GsdKeyboardPluginClass))
+
+typedef struct GsdKeyboardPluginPrivate GsdKeyboardPluginPrivate;
+
+typedef struct
+{
+        MateSettingsPlugin    parent;
+        GsdKeyboardPluginPrivate *priv;
+} GsdKeyboardPlugin;
+
+typedef struct
+{
+        MateSettingsPluginClass parent_class;
+} GsdKeyboardPluginClass;
+
+GType   gsd_keyboard_plugin_get_type            (void) G_GNUC_CONST;
+
+/* All the plugins must implement this function */
+G_MODULE_EXPORT GType register_mate_settings_plugin (GTypeModule *module);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __GSD_KEYBOARD_PLUGIN_H__ */
diff --git a/plugins/keyboard/gsd-keyboard-xkb.c b/plugins/keyboard/gsd-keyboard-xkb.c
new file mode 100644
index 0000000..681c665
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-xkb.c
@@ -0,0 +1,924 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2001 Udaltsoft
+ *
+ * Written by Sergey V. Oudaltsov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <time.h>
+
+#include <glib/gi18n.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+#include <mateconf/mateconf-client.h>
+
+#include <libmatekbd/matekbd-status.h>
+#include <libmatekbd/matekbd-keyboard-drawing.h>
+#include <libmatekbd/matekbd-desktop-config.h>
+#include <libmatekbd/matekbd-keyboard-config.h>
+#include <libmatekbd/matekbd-util.h>
+
+#include "gsd-xmodmap.h"
+#include "gsd-keyboard-xkb.h"
+#include "delayed-dialog.h"
+#include "mate-settings-profile.h"
+
+#define GTK_RESPONSE_PRINT 2
+
+static GsdKeyboardManager *manager = NULL;
+
+static XklEngine *xkl_engine;
+static XklConfigRegistry *xkl_registry = NULL;
+
+static MatekbdDesktopConfig current_config;
+static MatekbdKeyboardConfig current_kbd_config;
+
+/* never terminated */
+static MatekbdKeyboardConfig initial_sys_kbd_config;
+
+static gboolean inited_ok = FALSE;
+
+static guint notify_desktop = 0;
+static guint notify_keyboard = 0;
+
+static PostActivationCallback pa_callback = NULL;
+static void *pa_callback_user_data = NULL;
+
+static const char KNOWN_FILES_KEY[] =
+    "/desktop/mate/peripherals/keyboard/general/known_file_list";
+
+static const char DISABLE_INDICATOR_KEY[] =
+    "/desktop/mate/peripherals/keyboard/general/disable_indicator";
+
+static const char DUPLICATE_LEDS_KEY[] =
+    "/desktop/mate/peripherals/keyboard/general/duplicate_leds";
+
+static const char *mdm_keyboard_layout = NULL;
+
+static GtkStatusIcon *icon = NULL;
+
+static GHashTable *preview_dialogs = NULL;
+
+static Atom caps_lock;
+static Atom num_lock;
+static Atom scroll_lock;
+
+static GtkStatusIcon *indicator_icons[3];
+static const gchar *indicator_on_icon_names[] = {
+	"kbd-scrolllock-on",
+	"kbd-numlock-on",
+	"kbd-capslock-on"
+};
+
+static const gchar *indicator_off_icon_names[] = {
+	"kbd-scrolllock-off",
+	"kbd-numlock-off",
+	"kbd-capslock-off"
+};
+
+#define noGSDKX
+
+#ifdef GSDKX
+static FILE *logfile;
+
+static void
+gsd_keyboard_log_appender (const char file[],
+			   const char function[],
+			   int level, const char format[], va_list args)
+{
+	time_t now = time (NULL);
+	fprintf (logfile, "[%08ld,%03d,%s:%s/] \t", now,
+		 level, file, function);
+	vfprintf (logfile, format, args);
+	fflush (logfile);
+}
+#endif
+
+static void
+activation_error (void)
+{
+	char const *vendor = ServerVendor (GDK_DISPLAY ());
+	int release = VendorRelease (GDK_DISPLAY ());
+	GtkWidget *dialog;
+	gboolean badXFree430Release;
+
+	badXFree430Release = (vendor != NULL)
+	    && (0 == strcmp (vendor, "The XFree86 Project, Inc"))
+	    && (release / 100000 == 403);
+
+	/* VNC viewers will not work, do not barrage them with warnings */
+	if (NULL != vendor && NULL != strstr (vendor, "VNC"))
+		return;
+
+	dialog = gtk_message_dialog_new_with_markup (NULL,
+						     0,
+						     GTK_MESSAGE_ERROR,
+						     GTK_BUTTONS_CLOSE,
+						     _
+						     ("Error activating XKB configuration.\n"
+						      "It can happen under various circumstances:\n"
+						      " • a bug in libxklavier library\n"
+						      " • a bug in X server (xkbcomp, xmodmap utilities)\n"
+						      " • X server with incompatible libxkbfile implementation\n\n"
+						      "X server version data:\n%s\n%d\n%s\n"
+						      "If you report this situation as a bug, please include:\n"
+						      " • The result of <b>%s</b>\n"
+						      " • The result of <b>%s</b>"),
+						     vendor,
+						     release,
+						     badXFree430Release
+						     ?
+						     _
+						     ("You are using XFree 4.3.0.\n"
+						      "There are known problems with complex XKB configurations.\n"
+						      "Try using a simpler configuration or using a later version of the XFree software.")
+						     : "",
+						     "xprop -root | grep XKB",
+						     "mateconftool-2 -R /desktop/mate/peripherals/keyboard/kbd");
+	g_signal_connect (dialog, "response",
+			  G_CALLBACK (gtk_widget_destroy), NULL);
+	gsd_delayed_show_dialog (dialog);
+}
+
+static void
+apply_desktop_settings (void)
+{
+	MateConfClient *conf_client;
+	gboolean show_leds;
+	int i;
+	if (!inited_ok)
+		return;
+
+	gsd_keyboard_manager_apply_settings (manager);
+	matekbd_desktop_config_load_from_mateconf (&current_config);
+	/* again, probably it would be nice to compare things
+	   before activating them */
+	matekbd_desktop_config_activate (&current_config);
+
+	conf_client = mateconf_client_get_default ();
+	show_leds =
+	    mateconf_client_get_bool (conf_client, DUPLICATE_LEDS_KEY, NULL);
+	g_object_unref (conf_client);
+	for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]);
+	     --i >= 0;) {
+		gtk_status_icon_set_visible (indicator_icons[i],
+					     show_leds);
+	}
+}
+
+static void
+popup_menu_launch_capplet ()
+{
+	GError *error = NULL;
+
+	gdk_spawn_command_line_on_screen (gdk_screen_get_default (),
+					  "mate-keyboard-properties",
+					  &error);
+
+	if (error != NULL) {
+		g_warning
+		    ("Could not execute keyboard properties capplet: [%s]\n",
+		     error->message);
+		g_error_free (error);
+	}
+}
+
+static void
+show_layout_destroy (GtkWidget * dialog, gint group)
+{
+	g_hash_table_remove (preview_dialogs, GINT_TO_POINTER (group));
+}
+
+static void
+popup_menu_show_layout ()
+{
+	GtkWidget *dialog;
+	XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY ());
+	XklState *xkl_state = xkl_engine_get_current_state (engine);
+	gpointer p = g_hash_table_lookup (preview_dialogs,
+					  GINT_TO_POINTER
+					  (xkl_state->group));
+	gchar **group_names = matekbd_status_get_group_names ();
+
+	if (xkl_state->group < 0
+	    || xkl_state->group >= g_strv_length (group_names)) {
+		return;
+	}
+
+	if (p != NULL) {
+		/* existing window */
+		gtk_window_present (GTK_WINDOW (p));
+		return;
+	}
+
+	dialog =
+	    matekbd_keyboard_drawing_new_dialog (xkl_state->group,
+					      group_names
+					      [xkl_state->group]);
+	g_signal_connect (GTK_OBJECT (dialog), "destroy",
+			  G_CALLBACK (show_layout_destroy),
+			  GINT_TO_POINTER (xkl_state->group));
+	g_hash_table_insert (preview_dialogs,
+			     GINT_TO_POINTER (xkl_state->group), dialog);
+}
+
+static void
+popup_menu_set_group (GtkMenuItem * item, gpointer param)
+{
+	gint group_number = GPOINTER_TO_INT (param);
+	XklEngine *engine = matekbd_status_get_xkl_engine ();
+	XklState st;
+	Window cur;
+
+	st.group = group_number;
+	xkl_engine_allow_one_switch_to_secondary_group (engine);
+	cur = xkl_engine_get_current_window (engine);
+	if (cur != (Window) NULL) {
+		xkl_debug (150, "Enforcing the state %d for window %lx\n",
+			   st.group, cur);
+		xkl_engine_save_state (engine,
+				       xkl_engine_get_current_window
+				       (engine), &st);
+/*    XSetInputFocus( GDK_DISPLAY(), cur, RevertToNone, CurrentTime );*/
+	} else {
+		xkl_debug (150,
+			   "??? Enforcing the state %d for unknown window\n",
+			   st.group);
+		/* strange situation - bad things can happen */
+	}
+	xkl_engine_lock_group (engine, st.group);
+}
+
+static void
+status_icon_popup_menu_cb (GtkStatusIcon * icon, guint button, guint time)
+{
+	GtkMenu *popup_menu = GTK_MENU (gtk_menu_new ());
+	GtkMenu *groups_menu = GTK_MENU (gtk_menu_new ());
+	int i = 0;
+	gchar **current_name = matekbd_status_get_group_names ();
+
+	GtkWidget *item = gtk_menu_item_new_with_mnemonic (_("_Layouts"));
+	gtk_widget_show (item);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item),
+				   GTK_WIDGET (groups_menu));
+
+	item =
+	    gtk_menu_item_new_with_mnemonic (_("Keyboard _Preferences"));
+	gtk_widget_show (item);
+	g_signal_connect (item, "activate", popup_menu_launch_capplet,
+			  NULL);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+
+	item = gtk_menu_item_new_with_mnemonic (_("Show _Current Layout"));
+	gtk_widget_show (item);
+	g_signal_connect (item, "activate", popup_menu_show_layout, NULL);
+	gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item);
+
+	for (i = 0; *current_name; i++, current_name++) {
+		gchar *image_file = matekbd_status_get_image_filename (i);
+
+		if (image_file == NULL) {
+			item =
+			    gtk_menu_item_new_with_label (*current_name);
+		} else {
+			GdkPixbuf *pixbuf =
+			    gdk_pixbuf_new_from_file_at_size (image_file,
+							      24, 24,
+							      NULL);
+			GtkWidget *img =
+			    gtk_image_new_from_pixbuf (pixbuf);
+			item =
+			    gtk_image_menu_item_new_with_label
+			    (*current_name);
+			gtk_widget_show (img);
+			gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM
+						       (item), img);
+			gtk_image_menu_item_set_always_show_image
+			    (GTK_IMAGE_MENU_ITEM (item), TRUE);
+			g_free (image_file);
+		}
+		gtk_widget_show (item);
+		gtk_menu_shell_append (GTK_MENU_SHELL (groups_menu), item);
+		g_signal_connect (item, "activate",
+				  G_CALLBACK (popup_menu_set_group),
+				  GINT_TO_POINTER (i));
+	}
+
+	gtk_menu_popup (popup_menu, NULL, NULL,
+			gtk_status_icon_position_menu,
+			(gpointer) icon, button, time);
+}
+
+static void
+show_hide_icon ()
+{
+	if (g_slist_length (current_kbd_config.layouts_variants) > 1) {
+		if (icon == NULL) {
+			MateConfClient *conf_client =
+			    mateconf_client_get_default ();
+			gboolean disable =
+			    mateconf_client_get_bool (conf_client,
+						   DISABLE_INDICATOR_KEY,
+						   NULL);
+			g_object_unref (conf_client);
+			if (disable)
+				return;
+
+			xkl_debug (150, "Creating new icon\n");
+			icon = matekbd_status_new ();
+			g_signal_connect (icon, "popup-menu",
+					  G_CALLBACK
+					  (status_icon_popup_menu_cb),
+					  NULL);
+
+		}
+	} else {
+		if (icon != NULL) {
+			xkl_debug (150, "Destroying icon\n");
+			g_object_unref (icon);
+			icon = NULL;
+		}
+	}
+}
+
+static gboolean
+try_activating_xkb_config_if_new (MatekbdKeyboardConfig *
+				  current_sys_kbd_config)
+{
+	/* Activate - only if different! */
+	if (!matekbd_keyboard_config_equals
+	    (&current_kbd_config, current_sys_kbd_config)) {
+		if (matekbd_keyboard_config_activate (&current_kbd_config)) {
+			if (pa_callback != NULL) {
+				(*pa_callback) (pa_callback_user_data);
+				return TRUE;
+			}
+		} else {
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+static gboolean
+filter_xkb_config (void)
+{
+	XklConfigItem *item;
+	gchar *lname;
+	gchar *vname;
+	GSList *lv;
+	GSList *filtered;
+	gboolean any_change = FALSE;
+
+	xkl_debug (100, "Filtering configuration against the registry\n");
+	if (!xkl_registry) {
+		xkl_registry =
+		    xkl_config_registry_get_instance (xkl_engine);
+		/* load all materials, unconditionally! */
+		if (!xkl_config_registry_load (xkl_registry, TRUE)) {
+			g_object_unref (xkl_registry);
+			xkl_registry = NULL;
+			return FALSE;
+		}
+	}
+	lv = current_kbd_config.layouts_variants;
+	item = xkl_config_item_new ();
+	while (lv) {
+		xkl_debug (100, "Checking [%s]\n", lv->data);
+		if (matekbd_keyboard_config_split_items
+		    (lv->data, &lname, &vname)) {
+			g_snprintf (item->name, sizeof (item->name), "%s",
+				    lname);
+			if (!xkl_config_registry_find_layout
+			    (xkl_registry, item)) {
+				xkl_debug (100, "Bad layout [%s]\n",
+					   lname);
+				filtered = lv;
+				lv = lv->next;
+				g_free (filtered->data);
+				current_kbd_config.layouts_variants =
+				    g_slist_delete_link
+				    (current_kbd_config.layouts_variants,
+				     filtered);
+				any_change = TRUE;
+				continue;
+			}
+			if (vname) {
+				g_snprintf (item->name,
+					    sizeof (item->name), "%s",
+					    vname);
+				if (!xkl_config_registry_find_variant
+				    (xkl_registry, lname, item)) {
+					xkl_debug (100,
+						   "Bad variant [%s(%s)]\n",
+						   lname, vname);
+					filtered = lv;
+					lv = lv->next;
+					g_free (filtered->data);
+					current_kbd_config.layouts_variants
+					    =
+					    g_slist_delete_link
+					    (current_kbd_config.layouts_variants,
+					     filtered);
+					any_change = TRUE;
+					continue;
+				}
+			}
+		}
+		lv = lv->next;
+	}
+	g_object_unref (item);
+	return any_change;
+}
+
+static void
+apply_xkb_settings (void)
+{
+	MateConfClient *conf_client;
+	MatekbdKeyboardConfig current_sys_kbd_config;
+	int group_to_activate = -1;
+	char *mdm_layout;
+	char *s;
+
+	if (!inited_ok)
+		return;
+
+	conf_client = mateconf_client_get_default ();
+
+	/* With MDM the user can already set a layout from the login
+	 * screen. Try to keep that setting.
+	 * We clear mdm_keyboard_layout early, so we don't risk
+	 * recursion from mateconf notification.
+	 */
+	mdm_layout = g_strdup (mdm_keyboard_layout);
+	mdm_keyboard_layout = NULL;
+
+	/* mdm's configuration and $MDM_KEYBOARD_LAYOUT separates layout and
+	 * variant with a space, but mateconf uses tabs; so convert to be robust
+	 * with both */
+	for (s = mdm_layout; s && *s; ++s) {
+		if (*s == ' ') {
+			*s = '\t';
+		}
+	}
+
+	if (mdm_layout != NULL) {
+		GSList *layouts;
+		GSList *found_node;
+		int max_groups;
+
+		max_groups =
+		    MAX (xkl_engine_get_max_num_groups (xkl_engine), 1);
+		layouts =
+		    mateconf_client_get_list (conf_client,
+					   MATEKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
+					   MATECONF_VALUE_STRING, NULL);
+
+		/* Use system layouts as a default if we do not have
+		 * user configuration */
+		if (layouts == NULL) {
+			GSList *i;
+			int len;
+
+			for (i = initial_sys_kbd_config.layouts_variants;
+			     i; i = g_slist_next (i)) {
+				s = g_strdup (i->data);
+
+				/* chop off empty variants to avoid duplicates */
+				len = strlen (s);
+				if (s[len - 1] == '\t')
+					s[len - 1] = '\0';
+				layouts = g_slist_append (layouts, s);
+			}
+		}
+
+		/* Add the layout if it doesn't already exist. XKB limits the
+		 * total number of layouts. If we already have the maximum
+		 * number of layouts configured, we replace the last one. This
+		 * prevents the list from becoming full if the user has a habit
+		 * of selecting many different keyboard layouts in MDM. */
+
+		found_node =
+		    g_slist_find_custom (layouts, mdm_layout,
+					 (GCompareFunc) g_strcmp0);
+
+		if (!found_node) {
+			/* Insert at the last valid place, or at the end of
+			 * list, whichever comes first */
+			layouts =
+			    g_slist_insert (layouts, g_strdup (mdm_layout),
+					    max_groups - 1);
+			if (g_slist_length (layouts) > max_groups) {
+				GSList *last;
+				GSList *free_layouts;
+
+				last =
+				    g_slist_nth (layouts, max_groups - 1);
+				free_layouts = last->next;
+				last->next = NULL;
+
+				g_slist_foreach (free_layouts,
+						 (GFunc) g_free, NULL);
+				g_slist_free (free_layouts);
+			}
+
+			mateconf_client_set_list (conf_client,
+					       MATEKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
+					       MATECONF_VALUE_STRING, layouts,
+					       NULL);
+		}
+
+		g_slist_foreach (layouts, (GFunc) g_free, NULL);
+		g_slist_free (layouts);
+	}
+
+	matekbd_keyboard_config_init (&current_sys_kbd_config,
+				   conf_client, xkl_engine);
+
+	matekbd_keyboard_config_load_from_mateconf (&current_kbd_config,
+					      &initial_sys_kbd_config);
+
+	matekbd_keyboard_config_load_from_x_current (&current_sys_kbd_config,
+						  NULL);
+
+	if (!try_activating_xkb_config_if_new (&current_sys_kbd_config)) {
+		if (filter_xkb_config ()) {
+			if (!try_activating_xkb_config_if_new
+			    (&current_sys_kbd_config)) {
+				g_warning
+				    ("Could not activate the filtered XKB configuration");
+				activation_error ();
+			}
+		} else {
+			g_warning
+			    ("Could not activate the XKB configuration");
+			activation_error ();
+		}
+	} else
+		xkl_debug (100,
+			   "Actual KBD configuration was not changed: redundant notification\n");
+
+	if (mdm_layout != NULL) {
+		/* If there are multiple layouts,
+		 * try to find the one closest to the mdm layout
+		 */
+		GSList *l;
+		int i;
+		size_t len = strlen (mdm_layout);
+		for (i = 0, l = current_kbd_config.layouts_variants; l;
+		     i++, l = l->next) {
+			char *lv = l->data;
+			if (strncmp (lv, mdm_layout, len) == 0
+			    && (lv[len] == '\0' || lv[len] == '\t')) {
+				group_to_activate = i;
+				break;
+			}
+		}
+	}
+
+	g_free (mdm_layout);
+
+	if (group_to_activate != -1)
+		xkl_engine_lock_group (current_config.engine,
+				       group_to_activate);
+	matekbd_keyboard_config_term (&current_sys_kbd_config);
+	show_hide_icon ();
+}
+
+static void
+gsd_keyboard_xkb_analyze_sysconfig (void)
+{
+	MateConfClient *conf_client;
+
+	if (!inited_ok)
+		return;
+
+	conf_client = mateconf_client_get_default ();
+	matekbd_keyboard_config_init (&initial_sys_kbd_config,
+				   conf_client, xkl_engine);
+	matekbd_keyboard_config_load_from_x_initial (&initial_sys_kbd_config,
+						  NULL);
+	g_object_unref (conf_client);
+}
+
+static gboolean
+gsd_chk_file_list (void)
+{
+	GDir *home_dir;
+	const char *fname;
+	GSList *file_list = NULL;
+	GSList *last_login_file_list = NULL;
+	GSList *tmp = NULL;
+	GSList *tmp_l = NULL;
+	gboolean new_file_exist = FALSE;
+	MateConfClient *conf_client;
+
+	home_dir = g_dir_open (g_get_home_dir (), 0, NULL);
+	while ((fname = g_dir_read_name (home_dir)) != NULL) {
+		if (g_strrstr (fname, "modmap")) {
+			file_list =
+			    g_slist_append (file_list, g_strdup (fname));
+		}
+	}
+	g_dir_close (home_dir);
+
+	conf_client = mateconf_client_get_default ();
+
+	last_login_file_list = mateconf_client_get_list (conf_client,
+						      KNOWN_FILES_KEY,
+						      MATECONF_VALUE_STRING,
+						      NULL);
+
+	/* Compare between the two file list, currently available modmap files
+	   and the files available in the last log in */
+	tmp = file_list;
+	while (tmp != NULL) {
+		tmp_l = last_login_file_list;
+		new_file_exist = TRUE;
+		while (tmp_l != NULL) {
+			if (strcmp (tmp->data, tmp_l->data) == 0) {
+				new_file_exist = FALSE;
+				break;
+			} else {
+				tmp_l = tmp_l->next;
+			}
+		}
+		if (new_file_exist) {
+			break;
+		} else {
+			tmp = tmp->next;
+		}
+	}
+
+	if (new_file_exist) {
+		mateconf_client_set_list (conf_client,
+				       KNOWN_FILES_KEY,
+				       MATECONF_VALUE_STRING,
+				       file_list, NULL);
+	}
+
+	g_object_unref (conf_client);
+
+	g_slist_foreach (file_list, (GFunc) g_free, NULL);
+	g_slist_free (file_list);
+
+	g_slist_foreach (last_login_file_list, (GFunc) g_free, NULL);
+	g_slist_free (last_login_file_list);
+
+	return new_file_exist;
+
+}
+
+static void
+gsd_keyboard_xkb_chk_lcl_xmm (void)
+{
+	if (gsd_chk_file_list ()) {
+		gsd_modmap_dialog_call ();
+	}
+	gsd_load_modmap_files ();
+}
+
+void
+gsd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
+					       void *user_data)
+{
+	pa_callback = fun;
+	pa_callback_user_data = user_data;
+}
+
+static GdkFilterReturn
+gsd_keyboard_xkb_evt_filter (GdkXEvent * xev, GdkEvent * event)
+{
+	XEvent *xevent = (XEvent *) xev;
+	xkl_engine_filter_events (xkl_engine, xevent);
+	return GDK_FILTER_CONTINUE;
+}
+
+static guint
+register_config_callback (MateConfClient * client,
+			  const char *path, MateConfClientNotifyFunc func)
+{
+	mateconf_client_add_dir (client, path, MATECONF_CLIENT_PRELOAD_ONELEVEL,
+			      NULL);
+	return mateconf_client_notify_add (client, path, func, NULL, NULL,
+					NULL);
+}
+
+/* When new Keyboard is plugged in - reload the settings */
+static void
+gsd_keyboard_new_device (XklEngine * engine)
+{
+	apply_desktop_settings ();
+	apply_xkb_settings ();
+}
+
+static void
+gsd_keyboard_update_indicator_icons ()
+{
+	Bool state;
+	int new_state, i;
+	Display *display = GDK_DISPLAY ();
+	XkbGetNamedIndicator (display, caps_lock, NULL, &state,
+			      NULL, NULL);
+	new_state = state ? 1 : 0;
+	XkbGetNamedIndicator (display, num_lock, NULL, &state, NULL, NULL);
+	new_state <<= 1;
+	new_state |= (state ? 1 : 0);
+	XkbGetNamedIndicator (display, scroll_lock, NULL, &state,
+			      NULL, NULL);
+	new_state <<= 1;
+	new_state |= (state ? 1 : 0);
+	xkl_debug (160, "Indicators state: %d\n", new_state);
+
+
+	for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]);
+	     --i >= 0;) {
+		gtk_status_icon_set_from_icon_name (indicator_icons[i],
+						    (new_state & (1 << i))
+						    ?
+						    indicator_on_icon_names
+						    [i] :
+						    indicator_off_icon_names
+						    [i]);
+	}
+}
+
+static void
+gsd_keyboard_state_changed (XklEngine * engine, XklEngineStateChange type,
+			    gint new_group, gboolean restore)
+{
+	xkl_debug (160,
+		   "State changed: type %d, new group: %d, restore: %d.\n",
+		   type, new_group, restore);
+	if (type == INDICATORS_CHANGED) {
+		gsd_keyboard_update_indicator_icons ();
+	}
+}
+
+void
+gsd_keyboard_xkb_init (MateConfClient * client,
+		       GsdKeyboardManager * kbd_manager)
+{
+	int i;
+	Display *display = GDK_DISPLAY ();
+	mate_settings_profile_start (NULL);
+
+	gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
+					   DATADIR G_DIR_SEPARATOR_S
+					   "icons");
+
+	caps_lock = XInternAtom (display, "Caps Lock", False);
+	num_lock = XInternAtom (display, "Num Lock", False);
+	scroll_lock = XInternAtom (display, "Scroll Lock", False);
+
+	for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]);
+	     --i >= 0;) {
+		indicator_icons[i] =
+		    gtk_status_icon_new_from_icon_name
+		    (indicator_off_icon_names[i]);
+	}
+
+	gsd_keyboard_update_indicator_icons ();
+
+#ifdef GSDKX
+	xkl_set_debug_level (200);
+	logfile = fopen ("/tmp/gsdkx.log", "a");
+	xkl_set_log_appender (gsd_keyboard_log_appender);
+#endif
+	manager = kbd_manager;
+	mate_settings_profile_start ("xkl_engine_get_instance");
+	xkl_engine = xkl_engine_get_instance (display);
+	mate_settings_profile_end ("xkl_engine_get_instance");
+	if (xkl_engine) {
+		inited_ok = TRUE;
+
+		mdm_keyboard_layout = g_getenv ("MDM_KEYBOARD_LAYOUT");
+
+		matekbd_desktop_config_init (&current_config,
+					  client, xkl_engine);
+		matekbd_keyboard_config_init (&current_kbd_config,
+					   client, xkl_engine);
+		xkl_engine_backup_names_prop (xkl_engine);
+		gsd_keyboard_xkb_analyze_sysconfig ();
+		mate_settings_profile_start
+		    ("gsd_keyboard_xkb_chk_lcl_xmm");
+		gsd_keyboard_xkb_chk_lcl_xmm ();
+		mate_settings_profile_end
+		    ("gsd_keyboard_xkb_chk_lcl_xmm");
+
+		notify_desktop =
+		    register_config_callback (client,
+					      MATEKBD_DESKTOP_CONFIG_DIR,
+					      (MateConfClientNotifyFunc)
+					      apply_desktop_settings);
+
+		notify_keyboard =
+		    register_config_callback (client,
+					      MATEKBD_KEYBOARD_CONFIG_DIR,
+					      (MateConfClientNotifyFunc)
+					      apply_xkb_settings);
+
+		gdk_window_add_filter (NULL, (GdkFilterFunc)
+				       gsd_keyboard_xkb_evt_filter, NULL);
+
+		if (xkl_engine_get_features (xkl_engine) &
+		    XKLF_DEVICE_DISCOVERY)
+			g_signal_connect (xkl_engine, "X-new-device",
+					  G_CALLBACK
+					  (gsd_keyboard_new_device), NULL);
+		g_signal_connect (xkl_engine, "X-state-changed",
+				  G_CALLBACK
+				  (gsd_keyboard_state_changed), NULL);
+
+		mate_settings_profile_start ("xkl_engine_start_listen");
+		xkl_engine_start_listen (xkl_engine,
+					 XKLL_MANAGE_LAYOUTS |
+					 XKLL_MANAGE_WINDOW_STATES);
+		mate_settings_profile_end ("xkl_engine_start_listen");
+
+		mate_settings_profile_start ("apply_desktop_settings");
+		apply_desktop_settings ();
+		mate_settings_profile_end ("apply_desktop_settings");
+		mate_settings_profile_start ("apply_xkb_settings");
+		apply_xkb_settings ();
+		mate_settings_profile_end ("apply_xkb_settings");
+	}
+	preview_dialogs = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+	mate_settings_profile_end (NULL);
+}
+
+void
+gsd_keyboard_xkb_shutdown (void)
+{
+	MateConfClient *client;
+	int i;
+
+	pa_callback = NULL;
+	pa_callback_user_data = NULL;
+	manager = NULL;
+
+	for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]);
+	     --i >= 0;) {
+		g_object_unref (G_OBJECT (indicator_icons[i]));
+		indicator_icons[i] = NULL;
+	}
+
+	g_hash_table_destroy (preview_dialogs);
+
+	if (!inited_ok)
+		return;
+
+	xkl_engine_stop_listen (xkl_engine,
+				XKLL_MANAGE_LAYOUTS |
+				XKLL_MANAGE_WINDOW_STATES);
+
+	gdk_window_remove_filter (NULL, (GdkFilterFunc)
+				  gsd_keyboard_xkb_evt_filter, NULL);
+
+	client = mateconf_client_get_default ();
+
+	if (notify_desktop != 0) {
+		mateconf_client_remove_dir (client, MATEKBD_DESKTOP_CONFIG_DIR,
+					 NULL);
+		mateconf_client_notify_remove (client, notify_desktop);
+		notify_desktop = 0;
+	}
+
+	if (notify_keyboard != 0) {
+		mateconf_client_remove_dir (client, MATEKBD_KEYBOARD_CONFIG_DIR,
+					 NULL);
+		mateconf_client_notify_remove (client, notify_keyboard);
+		notify_keyboard = 0;
+	}
+
+	if (xkl_registry) {
+		g_object_unref (xkl_registry);
+	}
+
+	g_object_unref (client);
+	g_object_unref (xkl_engine);
+
+	xkl_engine = NULL;
+	inited_ok = FALSE;
+}
diff --git a/plugins/keyboard/gsd-keyboard-xkb.h b/plugins/keyboard/gsd-keyboard-xkb.h
new file mode 100644
index 0000000..12b2846
--- /dev/null
+++ b/plugins/keyboard/gsd-keyboard-xkb.h
@@ -0,0 +1,42 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * mate-settings-keyboard-xkb.h
+ *
+ * Copyright (C) 2001 Udaltsoft
+ *
+ * Written by Sergey V. Oudaltsov <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __GSD_KEYBOARD_XKB_H
+#define __GSD_KEYBOARD_XKB_H
+
+#include <mateconf/mateconf.h>
+#include <mateconf/mateconf-client.h>
+
+#include <libxklavier/xklavier.h>
+#include "gsd-keyboard-manager.h"
+
+void gsd_keyboard_xkb_init (MateConfClient *client, GsdKeyboardManager *manager);
+void gsd_keyboard_xkb_shutdown (void);
+
+typedef void (*PostActivationCallback) (void *userData);
+
+void
+gsd_keyboard_xkb_set_post_activation_callback (PostActivationCallback fun,
+                                               void                  *userData);
+
+#endif
diff --git a/plugins/keyboard/gsd-xmodmap.c b/plugins/keyboard/gsd-xmodmap.c
new file mode 100644
index 0000000..b9ffc9c
--- /dev/null
+++ b/plugins/keyboard/gsd-xmodmap.c
@@ -0,0 +1,399 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright © 2005 Novell Inc.
+ *
+ * Written by Shakti Sen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <mateconf/mateconf-client.h>
+
+#include "gsd-xmodmap.h"
+
+static const char DISABLE_XMM_WARNING_KEY[] =
+    "/desktop/mate/peripherals/keyboard/disable_xmm_and_xkb_warning";
+
+static const char LOADED_FILES_KEY[] =
+    "/desktop/mate/peripherals/keyboard/general/update_handlers";
+
+
+static void
+check_button_callback (GtkWidget *chk_button,
+                       gpointer   data)
+{
+        MateConfClient *client;
+
+        client = mateconf_client_get_default ();
+
+        mateconf_client_set_bool (client,
+                               DISABLE_XMM_WARNING_KEY,
+                               gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (chk_button)),
+                               NULL);
+
+        g_object_unref (client);
+}
+
+void
+gsd_load_modmap_files (void)
+{
+        MateConfClient *client;
+        GSList      *tmp;
+        GSList      *loaded_file_list;
+
+        client = mateconf_client_get_default ();
+
+        loaded_file_list = mateconf_client_get_list (client, LOADED_FILES_KEY, MATECONF_VALUE_STRING, NULL);
+
+        for (tmp = loaded_file_list; tmp != NULL; tmp = tmp->next) {
+                gchar *file;
+                gchar *command;
+
+                file = g_build_filename (g_get_home_dir (), (gchar *) tmp->data, NULL);
+                command = g_strconcat ("xmodmap ", file, NULL);
+                g_free (file);
+
+                g_spawn_command_line_async (command, NULL);
+
+                g_free (command);
+                g_free (tmp->data);
+        }
+
+        g_slist_free (loaded_file_list);
+        g_object_unref (client);
+}
+
+static void
+response_callback (GtkWidget *dialog,
+                   int        id,
+                   void      *data)
+{
+        if (id == GTK_RESPONSE_OK) {
+                GtkWidget *chk_button = g_object_get_data (G_OBJECT (dialog), "check_button");
+                check_button_callback (chk_button, NULL);
+                gsd_load_modmap_files ();
+        }
+        gtk_widget_destroy (dialog);
+}
+
+static void
+get_selected_files_func (GtkTreeModel      *model,
+                         GtkTreePath       *path,
+                         GtkTreeIter       *iter,
+                         gpointer           data)
+{
+        GSList **list = data;
+        gchar *filename;
+
+        filename = NULL;
+        gtk_tree_model_get (model,
+                            iter,
+                            0,
+                            &filename,
+                            -1);
+
+        *list = g_slist_prepend (*list, filename);
+}
+
+static GSList*
+remove_string_from_list (GSList     *list,
+                         const char *str)
+{
+        GSList *tmp;
+
+        for (tmp = list; tmp != NULL; tmp = tmp->next) {
+                if (strcmp (tmp->data, str) == 0) {
+                        g_free (tmp->data);
+                        list = g_slist_delete_link (list, tmp);
+                        break;
+                }
+        }
+
+        return list;
+}
+
+
+static void
+remove_button_clicked_callback (GtkWidget *button,
+                                void      *data)
+{
+        GtkWidget        *dialog;
+        GtkListStore     *tree = NULL;
+        GtkTreeSelection *selection;
+        GtkWidget        *treeview;
+        MateConfClient      *client;
+        GSList           *filenames = NULL;
+        GSList           *tmp = NULL;
+        GSList           *loaded_files = NULL;
+
+        dialog = data;
+
+        treeview = g_object_get_data (G_OBJECT (dialog), "treeview1");
+
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+        gtk_tree_selection_selected_foreach (selection,
+                                             get_selected_files_func,
+                                             &filenames);
+
+        if (!filenames)
+                return;
+
+        /* Remove the selected file */
+
+        client = mateconf_client_get_default ();
+
+        loaded_files = mateconf_client_get_list (client,
+                                              LOADED_FILES_KEY,
+                                              MATECONF_VALUE_STRING,
+                                              NULL);
+        loaded_files = remove_string_from_list (loaded_files, (char *)filenames->data);
+
+        mateconf_client_set_list (client,
+                               LOADED_FILES_KEY,
+                               MATECONF_VALUE_STRING,
+                               loaded_files,
+                               NULL);
+        g_object_unref (client);
+
+        tree = g_object_get_data (G_OBJECT (dialog), "tree");
+
+        gtk_list_store_clear (tree);
+        for (tmp = loaded_files; tmp != NULL; tmp = tmp->next) {
+                GtkTreeIter iter;
+                gtk_list_store_append (tree, &iter);
+                gtk_list_store_set (tree, &iter,
+                                    0,
+                                    tmp->data,
+                                    -1);
+        }
+
+        g_slist_foreach (loaded_files, (GFunc) g_free, NULL);
+        g_slist_free (loaded_files);
+}
+
+static void
+load_button_clicked_callback (GtkWidget *button,
+                              void      *data)
+{
+        GtkWidget        *dialog;
+        GtkListStore     *tree = NULL;
+        GtkTreeSelection *selection;
+        GtkWidget        *treeview;
+        GSList           *filenames = NULL;
+        GSList           *tmp = NULL;
+        GSList           *loaded_files = NULL;
+        MateConfClient      *client;
+
+        dialog = data;
+
+        treeview = g_object_get_data (G_OBJECT (dialog),
+                                      "loaded-treeview");
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+        gtk_tree_selection_selected_foreach (selection,
+                                             get_selected_files_func,
+                                             &filenames);
+
+        if (!filenames)
+                return;
+
+        /* Add the files to left-tree-view */
+        client = mateconf_client_get_default ();
+
+        loaded_files = mateconf_client_get_list (client,
+                                              LOADED_FILES_KEY,
+                                              MATECONF_VALUE_STRING,
+                                              NULL);
+
+        if (g_slist_find_custom (loaded_files, filenames->data, (GCompareFunc) strcmp)) {
+                g_free (filenames->data);
+                g_slist_free (filenames);
+                goto out;
+        }
+
+        loaded_files = g_slist_append (loaded_files, filenames->data);
+        mateconf_client_set_list (client,
+                               LOADED_FILES_KEY,
+                               MATECONF_VALUE_STRING,
+                               loaded_files,
+                               NULL);
+
+
+        tree = g_object_get_data (G_OBJECT (dialog), "tree");
+
+        gtk_list_store_clear (tree);
+        for (tmp = loaded_files; tmp != NULL; tmp = tmp->next) {
+                GtkTreeIter iter;
+                gtk_list_store_append (tree, &iter);
+                gtk_list_store_set (tree, &iter,
+                                    0,
+                                    tmp->data,
+                                    -1);
+        }
+
+out:
+        g_object_unref (client);
+        g_slist_foreach (loaded_files, (GFunc) g_free, NULL);
+        g_slist_free (loaded_files);
+}
+
+void
+gsd_modmap_dialog_call (void)
+{
+        GtkBuilder        *builder;
+        guint              res;
+        GError            *error;
+        GtkWidget         *load_dialog;
+        GtkListStore      *tree;
+        GtkCellRenderer   *cell_renderer;
+        GtkTreeIter        parent_iter;
+        GtkTreeIter        iter;
+        GtkTreeModel      *sort_model;
+        GtkTreeSelection  *selection;
+        GtkWidget         *treeview;
+        GtkWidget         *treeview1;
+        GtkTreeViewColumn *column;
+        GtkWidget         *add_button;
+        GtkWidget         *remove_button;
+        GtkWidget         *chk_button;
+        GSList            *tmp;
+        GDir              *homeDir;
+        GSList            *loaded_files;
+        const char        *fname;
+        MateConfClient       *client;
+
+        homeDir = g_dir_open (g_get_home_dir (), 0, NULL);
+        if (homeDir == NULL)
+                return;
+
+        error = NULL;
+        builder = gtk_builder_new ();
+        res = gtk_builder_add_from_file (builder,
+                                         DATADIR "/modmap-dialog.ui",
+                                         &error);
+
+        if (res == 0) {
+                g_warning ("Could not load UI file: %s", error->message);
+                g_error_free (error);
+                g_object_unref (builder);
+                g_dir_close (homeDir);
+                return;
+        }
+
+        load_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "dialog1"));
+        gtk_window_set_modal (GTK_WINDOW (load_dialog), TRUE);
+        g_signal_connect (load_dialog,
+                          "response",
+                          G_CALLBACK (response_callback),
+                          builder);
+        add_button =  GTK_WIDGET (gtk_builder_get_object (builder, "button7"));
+        g_signal_connect (add_button,
+                          "clicked",
+                          G_CALLBACK (load_button_clicked_callback),
+                          load_dialog);
+        remove_button =  GTK_WIDGET (gtk_builder_get_object (builder,
+                                                             "button6"));
+        g_signal_connect (remove_button,
+                          "clicked",
+                          G_CALLBACK (remove_button_clicked_callback),
+                          load_dialog);
+        chk_button =  GTK_WIDGET (gtk_builder_get_object (builder,
+                                                          "checkbutton1"));
+        g_signal_connect (chk_button,
+                          "toggled",
+                          G_CALLBACK (check_button_callback),
+                          NULL);
+        g_object_set_data (G_OBJECT (load_dialog), "check_button", chk_button);
+        treeview = GTK_WIDGET (gtk_builder_get_object (builder, "treeview1"));
+        g_object_set_data (G_OBJECT (load_dialog), "treeview1", treeview);
+        treeview =  GTK_WIDGET (gtk_builder_get_object (builder, "treeview2"));
+        g_object_set_data (G_OBJECT (load_dialog), "loaded-treeview", treeview);
+        tree = gtk_list_store_new (1, G_TYPE_STRING);
+        cell_renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes ("modmap",
+                                                           cell_renderer,
+                                                           "text", 0,
+                                                           NULL);
+        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+        gtk_tree_view_column_set_sort_column_id (column, 0);
+
+        /* Add the data */
+        while ((fname = g_dir_read_name (homeDir)) != NULL) {
+                if (g_strrstr (fname, "modmap")) {
+                        gtk_list_store_append (tree, &parent_iter);
+                        gtk_list_store_set (tree, &parent_iter,
+                                            0,
+                                            fname,
+                                            -1);
+                }
+        }
+        sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (tree));
+        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                              0,
+                                              GTK_SORT_ASCENDING);
+        gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), sort_model);
+        g_object_unref (G_OBJECT (tree));
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+        gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
+                                     GTK_SELECTION_MULTIPLE);
+        gtk_widget_show (load_dialog);
+
+        g_dir_close (homeDir);
+
+        /* Left treeview */
+        treeview1 =  GTK_WIDGET (gtk_builder_get_object (builder, "treeview1"));
+        tree = gtk_list_store_new (1, G_TYPE_STRING);
+        cell_renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes ("modmap",
+                                                           cell_renderer,
+                                                           "text", 0,
+                                                           NULL);
+        gtk_tree_view_append_column (GTK_TREE_VIEW (treeview1), column);
+        gtk_tree_view_column_set_sort_column_id (column, 0);
+
+        client = mateconf_client_get_default ();
+        loaded_files = mateconf_client_get_list (client, LOADED_FILES_KEY, MATECONF_VALUE_STRING, NULL);
+        g_object_unref (client);
+
+        /* Add the data */
+        for (tmp = loaded_files; tmp != NULL; tmp = tmp->next) {
+                gtk_list_store_append (tree, &iter);
+                gtk_list_store_set (tree, &iter,
+                                    0,
+                                    tmp->data,
+                                    -1);
+        }
+
+        g_slist_foreach (loaded_files, (GFunc) g_free, NULL);
+        g_slist_free (loaded_files);
+
+        sort_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (tree));
+        gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (sort_model),
+                                              0,
+                                              GTK_SORT_ASCENDING);
+        gtk_tree_view_set_model (GTK_TREE_VIEW (treeview1), sort_model);
+        g_object_unref (G_OBJECT (tree));
+        selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview1));
+        gtk_tree_selection_set_mode (GTK_TREE_SELECTION (selection),
+                                     GTK_SELECTION_MULTIPLE);
+        g_object_set_data (G_OBJECT (load_dialog), "tree", tree);
+        g_object_unref (builder);
+}
diff --git a/plugins/keyboard/gsd-xmodmap.h b/plugins/keyboard/gsd-xmodmap.h
new file mode 100644
index 0000000..7cfff74
--- /dev/null
+++ b/plugins/keyboard/gsd-xmodmap.h
@@ -0,0 +1,29 @@
+/* mate-settings-xmodmap.h
+ *
+ * Copyright © 2005 Novell Inc.
+ *
+ * Written by Shakti Sen <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef XMODMAP_H
+#define XMODMAP_H
+
+void gsd_load_modmap_files (void);
+void gsd_modmap_dialog_call (void);
+
+#endif
diff --git a/plugins/keyboard/kbd-capslock-off.png b/plugins/keyboard/kbd-capslock-off.png
new file mode 100644
index 0000000..828cfa8
--- /dev/null
+++ b/plugins/keyboard/kbd-capslock-off.png
diff --git a/plugins/keyboard/kbd-capslock-on.png b/plugins/keyboard/kbd-capslock-on.png
new file mode 100644
index 0000000..32ea0c9
--- /dev/null
+++ b/plugins/keyboard/kbd-capslock-on.png
diff --git a/plugins/keyboard/kbd-numlock-off.png b/plugins/keyboard/kbd-numlock-off.png
new file mode 100644
index 0000000..21cac59
--- /dev/null
+++ b/plugins/keyboard/kbd-numlock-off.png
diff --git a/plugins/keyboard/kbd-numlock-on.png b/plugins/keyboard/kbd-numlock-on.png
new file mode 100644
index 0000000..bd9b9fc
--- /dev/null
+++ b/plugins/keyboard/kbd-numlock-on.png
diff --git a/plugins/keyboard/kbd-scrolllock-off.png b/plugins/keyboard/kbd-scrolllock-off.png
new file mode 100644
index 0000000..2ff8748
--- /dev/null
+++ b/plugins/keyboard/kbd-scrolllock-off.png
diff --git a/plugins/keyboard/kbd-scrolllock-on.png b/plugins/keyboard/kbd-scrolllock-on.png
new file mode 100644
index 0000000..77a4794
--- /dev/null
+++ b/plugins/keyboard/kbd-scrolllock-on.png
diff --git a/plugins/keyboard/keyboard.mate-settings-plugin.in b/plugins/keyboard/keyboard.mate-settings-plugin.in
new file mode 100644
index 0000000..2ced59c
--- /dev/null
+++ b/plugins/keyboard/keyboard.mate-settings-plugin.in
@@ -0,0 +1,8 @@
+[MATE Settings Plugin]
+Module=keyboard
+IAge=0
+_Name=Keyboard
+_Description=Keyboard plugin
+Authors=
+Copyright=Copyright © 2007
+Website=
diff --git a/plugins/keyboard/modmap-dialog.ui b/plugins/keyboard/modmap-dialog.ui
new file mode 100644
index 0000000..12c34a6
--- /dev/null
+++ b/plugins/keyboard/modmap-dialog.ui
@@ -0,0 +1,273 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkDialog" id="dialog1">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Load modmap files</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkVBox" id="dialog-vbox4">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkVBox" id="vbox44">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkLabel" id="label62">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Would you like to load the modmap files?</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHBox" id="hbox32">
+                <property name="visible">True</property>
+                <property name="border_width">12</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkVBox" id="vbox45">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label63">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Loaded files:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="treeview1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="headers_visible">False</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox46">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <object class="GtkLabel" id="label64">
+                        <property name="visible">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button7">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <child>
+                          <object class="GtkAlignment" id="alignment1">
+                            <property name="visible">True</property>
+                            <property name="xscale">0</property>
+                            <property name="yscale">0</property>
+                            <child>
+                              <object class="GtkHBox" id="hbox33">
+                                <property name="visible">True</property>
+                                <property name="spacing">2</property>
+                                <child>
+                                  <object class="GtkImage" id="image1">
+                                    <property name="visible">True</property>
+                                    <property name="stock">gtk-add</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label66">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">_Load</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="button6">
+                        <property name="label">gtk-remove</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkVBox" id="vbox47">
+                    <property name="visible">True</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkLabel" id="label65">
+                        <property name="visible">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">A_vailable files:</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkScrolledWindow" id="scrolledwindow8">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="treeview2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="headers_visible">False</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="checkbutton1">
+                <property name="label" translatable="yes">_Do not show this message again</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <object class="GtkHButtonBox" id="dialog-action_area3">
+            <property name="visible">True</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="helpbutton2">
+                <property name="label">gtk-help</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="okbutton1">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-11">helpbutton2</action-widget>
+      <action-widget response="-5">okbutton1</action-widget>
+    </action-widgets>
+  </object>
+</interface>