summaryrefslogtreecommitdiff
path: root/libmatekbd
diff options
context:
space:
mode:
authorPerberos <[email protected]>2011-12-08 12:58:23 -0300
committerPerberos <[email protected]>2011-12-08 12:58:23 -0300
commit46a8d42095a30a1b62b7f24658f4886941b54800 (patch)
tree9862712c41c8187f74f6e1c7786eaf679a51571c /libmatekbd
parent731006ad7b3c6c47a52b8ef16e29e2d5ea9e1ea5 (diff)
downloadlibmatekbd-46a8d42095a30a1b62b7f24658f4886941b54800.tar.bz2
libmatekbd-46a8d42095a30a1b62b7f24658f4886941b54800.tar.xz
GDK_ key constants was renamed to GDK_KEY_ on GTK+-3.0
Diffstat (limited to 'libmatekbd')
-rw-r--r--libmatekbd/Makefile.in886
-rw-r--r--libmatekbd/matekbd-indicator.c61
-rw-r--r--libmatekbd/matekbd-keyboard-drawing.c37
-rw-r--r--libmatekbd/matekbd-status.c5
4 files changed, 60 insertions, 929 deletions
diff --git a/libmatekbd/Makefile.in b/libmatekbd/Makefile.in
deleted file mode 100644
index 993f916..0000000
--- a/libmatekbd/Makefile.in
+++ /dev/null
@@ -1,886 +0,0 @@
-# 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 = libmatekbd
-DIST_COMMON = $(matekbdinc_HEADERS) $(noinst_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.in
-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)$(libdir)" "$(DESTDIR)$(schemadir)" \
- "$(DESTDIR)$(uidir)" "$(DESTDIR)$(matekbdincdir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-libmatekbd_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_libmatekbd_la_OBJECTS = libmatekbd_la-matekbd-desktop-config.lo \
- libmatekbd_la-matekbd-keyboard-config.lo \
- libmatekbd_la-matekbd-util.lo
-libmatekbd_la_OBJECTS = $(am_libmatekbd_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
-am__v_lt_0 = --silent
-libmatekbd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libmatekbd_la_CFLAGS) \
- $(CFLAGS) $(libmatekbd_la_LDFLAGS) $(LDFLAGS) -o $@
-libmatekbdui_la_DEPENDENCIES = libmatekbd.la $(am__DEPENDENCIES_2) \
- $(am__DEPENDENCIES_1)
-am_libmatekbdui_la_OBJECTS = \
- libmatekbdui_la-matekbd-indicator-config.lo \
- libmatekbdui_la-matekbd-indicator.lo \
- libmatekbdui_la-matekbd-status.lo \
- libmatekbdui_la-matekbd-indicator-marshal.lo \
- libmatekbdui_la-matekbd-indicator-plugin-manager.lo \
- libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo \
- libmatekbdui_la-matekbd-keyboard-drawing.lo
-libmatekbdui_la_OBJECTS = $(am_libmatekbdui_la_OBJECTS)
-libmatekbdui_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(libmatekbdui_la_CFLAGS) $(CFLAGS) $(libmatekbdui_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) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
-am__v_at_0 = @
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
-SOURCES = $(libmatekbd_la_SOURCES) $(libmatekbdui_la_SOURCES)
-DIST_SOURCES = $(libmatekbd_la_SOURCES) $(libmatekbdui_la_SOURCES)
-DATA = $(schema_DATA) $(ui_DATA)
-HEADERS = $(matekbdinc_HEADERS) $(noinst_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
-ALL_LINGUAS = @ALL_LINGUAS@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-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@
-GDK_CFLAGS = @GDK_CFLAGS@
-GDK_LIBS = @GDK_LIBS@
-GDK_REQUIRED = @GDK_REQUIRED@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GLIB_CFLAGS = @GLIB_CFLAGS@
-GLIB_LIBS = @GLIB_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GREP = @GREP@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-GTK_REQUIRED = @GTK_REQUIRED@
-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@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIBXKLAVIER_CFLAGS = @LIBXKLAVIER_CFLAGS@
-LIBXKLAVIER_LIBS = @LIBXKLAVIER_LIBS@
-LIBXKLAVIER_REQUIRED = @LIBXKLAVIER_REQUIRED@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MATECONFTOOL = @MATECONFTOOL@
-MATECONF_CFLAGS = @MATECONF_CFLAGS@
-MATECONF_LIBS = @MATECONF_LIBS@
-MATECONF_REQUIRED = @MATECONF_REQUIRED@
-MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@
-MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@
-MKDIR_P = @MKDIR_P@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-MSGFMT_OPTS = @MSGFMT_OPTS@
-MSGMERGE = @MSGMERGE@
-NM = @NM@
-NMEDIT = @NMEDIT@
-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@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-VERSION_INFO = @VERSION_INFO@
-WARN_CFLAGS = @WARN_CFLAGS@
-XGETTEXT = @XGETTEXT@
-XLIB_CFLAGS = @XLIB_CFLAGS@
-XLIB_LIBS = @XLIB_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_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@
-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@
-lib_LTLIBRARIES = libmatekbd.la libmatekbdui.la
-uidir = "$(pkgdatadir)/ui"
-ui_DATA = show-layout.ui
-common_CFLAGS = \
- -I$(top_srcdir) -Wall \
- $(GDK_CFLAGS) \
- $(MATECONF_CFLAGS) \
- $(LIBXKLAVIER_CFLAGS) \
- $(XLIB_CFLAGS) \
- -I$(top_srcdir)/intl \
- -DSYS_PLUGIN_DIR=\"$(libdir)/matekbd/\" \
- -DG_LOG_DOMAIN=\"MateKbdIndicator\" \
- -DDATADIR=\"$(datadir)\" \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DLIBDIR=\"$(libdir)\"
-
-libmatekbd_la_CFLAGS = $(common_CFLAGS)
-libmatekbdui_la_CFLAGS = $(common_CFLAGS) \
- -DUIDIR=\"$(uidir)\" \
- $(GTK_CFLAGS)
-
-common_LDFLAGS = -version-info @VERSION_INFO@ -no-undefined
-common_LIBADD = \
- $(GDK_LIBS) \
- $(MATECONF_LIBS) \
- $(LIBXKLAVIER_LIBS) \
- $(XLIB_LIBS)
-
-libmatekbd_la_LDFLAGS = $(common_LDFLAGS)
-libmatekbd_la_LIBADD = $(common_LIBADD)
-libmatekbdui_la_LDFLAGS = $(common_LDFLAGS)
-libmatekbdui_la_LIBADD = libmatekbd.la \
- $(common_LIBADD) \
- $(GTK_LIBS)
-
-libmatekbd_la_SOURCES = \
- matekbd-desktop-config.c \
- matekbd-keyboard-config.c \
- matekbd-util.c
-
-libmatekbdui_la_SOURCES = \
- matekbd-indicator-config.c \
- matekbd-indicator.c \
- matekbd-status.c \
- matekbd-indicator-marshal.c \
- matekbd-indicator-plugin-manager.c \
- matekbd-keyboard-drawing-marshal.c \
- matekbd-keyboard-drawing.c
-
-BUILT_SOURCES = matekbd-indicator-marshal.c \
- matekbd-indicator-marshal.h \
- matekbd-keyboard-drawing-marshal.c \
- matekbd-keyboard-drawing-marshal.h
-
-CLEANFILES = $(BUILT_SOURCES) $(schema_DATA)
-matekbdincdir = $(includedir)/libmatekbd
-matekbdinc_HEADERS = \
- matekbd-desktop-config.h \
- matekbd-keyboard-config.h \
- matekbd-indicator.h \
- matekbd-status.h \
- matekbd-indicator-config.h \
- matekbd-indicator-plugin.h \
- matekbd-keyboard-drawing.h \
- matekbd-util.h
-
-noinst_HEADERS = matekbd-indicator-plugin-manager.h \
- $(extra_nih) \
- matekbd-config-private.h
-
-EXTRA_DIST = matekbd-indicator-marshal.list \
- matekbd-keyboard-drawing-marshal.list \
- $(schema_in_files) $(ui_DATA)
-
-GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0)
-schemadir = $(MATECONF_SCHEMA_FILE_DIR)
-schema_in_files = desktop_mate_peripherals_keyboard_xkb.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) 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 libmatekbd/Makefile'; \
- $(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --gnu libmatekbd/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-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || 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)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
-
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_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
-libmatekbd.la: $(libmatekbd_la_OBJECTS) $(libmatekbd_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libmatekbd_la_LINK) -rpath $(libdir) $(libmatekbd_la_OBJECTS) $(libmatekbd_la_LIBADD) $(LIBS)
-libmatekbdui.la: $(libmatekbdui_la_OBJECTS) $(libmatekbdui_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libmatekbdui_la_LINK) -rpath $(libdir) $(libmatekbdui_la_OBJECTS) $(libmatekbdui_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbd_la-matekbd-desktop-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbd_la-matekbd-keyboard-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbd_la-matekbd-util.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-indicator-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-indicator-marshal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-indicator-plugin-manager.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-indicator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing-marshal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmatekbdui_la-matekbd-status.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@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@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@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@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@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 $@ $<
-
-libmatekbd_la-matekbd-desktop-config.lo: matekbd-desktop-config.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -MT libmatekbd_la-matekbd-desktop-config.lo -MD -MP -MF $(DEPDIR)/libmatekbd_la-matekbd-desktop-config.Tpo -c -o libmatekbd_la-matekbd-desktop-config.lo `test -f 'matekbd-desktop-config.c' || echo '$(srcdir)/'`matekbd-desktop-config.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbd_la-matekbd-desktop-config.Tpo $(DEPDIR)/libmatekbd_la-matekbd-desktop-config.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-desktop-config.c' object='libmatekbd_la-matekbd-desktop-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -c -o libmatekbd_la-matekbd-desktop-config.lo `test -f 'matekbd-desktop-config.c' || echo '$(srcdir)/'`matekbd-desktop-config.c
-
-libmatekbd_la-matekbd-keyboard-config.lo: matekbd-keyboard-config.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -MT libmatekbd_la-matekbd-keyboard-config.lo -MD -MP -MF $(DEPDIR)/libmatekbd_la-matekbd-keyboard-config.Tpo -c -o libmatekbd_la-matekbd-keyboard-config.lo `test -f 'matekbd-keyboard-config.c' || echo '$(srcdir)/'`matekbd-keyboard-config.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbd_la-matekbd-keyboard-config.Tpo $(DEPDIR)/libmatekbd_la-matekbd-keyboard-config.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-keyboard-config.c' object='libmatekbd_la-matekbd-keyboard-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -c -o libmatekbd_la-matekbd-keyboard-config.lo `test -f 'matekbd-keyboard-config.c' || echo '$(srcdir)/'`matekbd-keyboard-config.c
-
-libmatekbd_la-matekbd-util.lo: matekbd-util.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -MT libmatekbd_la-matekbd-util.lo -MD -MP -MF $(DEPDIR)/libmatekbd_la-matekbd-util.Tpo -c -o libmatekbd_la-matekbd-util.lo `test -f 'matekbd-util.c' || echo '$(srcdir)/'`matekbd-util.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbd_la-matekbd-util.Tpo $(DEPDIR)/libmatekbd_la-matekbd-util.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-util.c' object='libmatekbd_la-matekbd-util.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbd_la_CFLAGS) $(CFLAGS) -c -o libmatekbd_la-matekbd-util.lo `test -f 'matekbd-util.c' || echo '$(srcdir)/'`matekbd-util.c
-
-libmatekbdui_la-matekbd-indicator-config.lo: matekbd-indicator-config.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-indicator-config.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-indicator-config.Tpo -c -o libmatekbdui_la-matekbd-indicator-config.lo `test -f 'matekbd-indicator-config.c' || echo '$(srcdir)/'`matekbd-indicator-config.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-indicator-config.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-indicator-config.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-indicator-config.c' object='libmatekbdui_la-matekbd-indicator-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-indicator-config.lo `test -f 'matekbd-indicator-config.c' || echo '$(srcdir)/'`matekbd-indicator-config.c
-
-libmatekbdui_la-matekbd-indicator.lo: matekbd-indicator.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-indicator.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-indicator.Tpo -c -o libmatekbdui_la-matekbd-indicator.lo `test -f 'matekbd-indicator.c' || echo '$(srcdir)/'`matekbd-indicator.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-indicator.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-indicator.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-indicator.c' object='libmatekbdui_la-matekbd-indicator.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-indicator.lo `test -f 'matekbd-indicator.c' || echo '$(srcdir)/'`matekbd-indicator.c
-
-libmatekbdui_la-matekbd-status.lo: matekbd-status.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-status.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-status.Tpo -c -o libmatekbdui_la-matekbd-status.lo `test -f 'matekbd-status.c' || echo '$(srcdir)/'`matekbd-status.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-status.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-status.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-status.c' object='libmatekbdui_la-matekbd-status.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-status.lo `test -f 'matekbd-status.c' || echo '$(srcdir)/'`matekbd-status.c
-
-libmatekbdui_la-matekbd-indicator-marshal.lo: matekbd-indicator-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-indicator-marshal.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-indicator-marshal.Tpo -c -o libmatekbdui_la-matekbd-indicator-marshal.lo `test -f 'matekbd-indicator-marshal.c' || echo '$(srcdir)/'`matekbd-indicator-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-indicator-marshal.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-indicator-marshal.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-indicator-marshal.c' object='libmatekbdui_la-matekbd-indicator-marshal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-indicator-marshal.lo `test -f 'matekbd-indicator-marshal.c' || echo '$(srcdir)/'`matekbd-indicator-marshal.c
-
-libmatekbdui_la-matekbd-indicator-plugin-manager.lo: matekbd-indicator-plugin-manager.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-indicator-plugin-manager.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-indicator-plugin-manager.Tpo -c -o libmatekbdui_la-matekbd-indicator-plugin-manager.lo `test -f 'matekbd-indicator-plugin-manager.c' || echo '$(srcdir)/'`matekbd-indicator-plugin-manager.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-indicator-plugin-manager.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-indicator-plugin-manager.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-indicator-plugin-manager.c' object='libmatekbdui_la-matekbd-indicator-plugin-manager.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-indicator-plugin-manager.lo `test -f 'matekbd-indicator-plugin-manager.c' || echo '$(srcdir)/'`matekbd-indicator-plugin-manager.c
-
-libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo: matekbd-keyboard-drawing-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing-marshal.Tpo -c -o libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo `test -f 'matekbd-keyboard-drawing-marshal.c' || echo '$(srcdir)/'`matekbd-keyboard-drawing-marshal.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing-marshal.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing-marshal.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-keyboard-drawing-marshal.c' object='libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-keyboard-drawing-marshal.lo `test -f 'matekbd-keyboard-drawing-marshal.c' || echo '$(srcdir)/'`matekbd-keyboard-drawing-marshal.c
-
-libmatekbdui_la-matekbd-keyboard-drawing.lo: matekbd-keyboard-drawing.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -MT libmatekbdui_la-matekbd-keyboard-drawing.lo -MD -MP -MF $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing.Tpo -c -o libmatekbdui_la-matekbd-keyboard-drawing.lo `test -f 'matekbd-keyboard-drawing.c' || echo '$(srcdir)/'`matekbd-keyboard-drawing.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing.Tpo $(DEPDIR)/libmatekbdui_la-matekbd-keyboard-drawing.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matekbd-keyboard-drawing.c' object='libmatekbdui_la-matekbd-keyboard-drawing.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmatekbdui_la_CFLAGS) $(CFLAGS) -c -o libmatekbdui_la-matekbd-keyboard-drawing.lo `test -f 'matekbd-keyboard-drawing.c' || echo '$(srcdir)/'`matekbd-keyboard-drawing.c
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-schemaDATA: $(schema_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
- @list='$(schema_DATA)'; test -n "$(schemadir)" || 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)$(schemadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
- done
-
-uninstall-schemaDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(schemadir)" && 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
-install-matekbdincHEADERS: $(matekbdinc_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(matekbdincdir)" || $(MKDIR_P) "$(DESTDIR)$(matekbdincdir)"
- @list='$(matekbdinc_HEADERS)'; test -n "$(matekbdincdir)" || 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_HEADER) $$files '$(DESTDIR)$(matekbdincdir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(matekbdincdir)" || exit $$?; \
- done
-
-uninstall-matekbdincHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(matekbdinc_HEADERS)'; test -n "$(matekbdincdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(matekbdincdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(matekbdincdir)" && 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: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(uidir)" "$(DESTDIR)$(matekbdincdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) 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)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- 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-data-local install-matekbdincHEADERS \
- install-schemaDATA install-uiDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-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-libLTLIBRARIES uninstall-matekbdincHEADERS \
- uninstall-schemaDATA uninstall-uiDATA
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool 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-data-local install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-libLTLIBRARIES install-man \
- install-matekbdincHEADERS install-pdf install-pdf-am \
- install-ps install-ps-am install-schemaDATA 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-libLTLIBRARIES uninstall-matekbdincHEADERS \
- uninstall-schemaDATA uninstall-uiDATA
-
-
-@INTLTOOL_DESKTOP_RULE@
-
-@INTLTOOL_SCHEMAS_RULE@
-
-matekbd-indicator-marshal.h: matekbd-indicator-marshal.list
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=matekbd_indicator $(srcdir)/matekbd-indicator-marshal.list --header > $@
-
-matekbd-indicator-marshal.c: matekbd-indicator-marshal.h
- $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=matekbd_indicator $(srcdir)/matekbd-indicator-marshal.list --body > $@
-
-matekbd-keyboard-drawing-marshal.h: matekbd-keyboard-drawing-marshal.list
- $(AM_V_GEN)( $(GLIB_GENMARSHAL) --prefix=matekbd_keyboard_drawing $(srcdir)/matekbd-keyboard-drawing-marshal.list \
- --header > matekbd-keyboard-drawing-marshal.tmp \
- && mv matekbd-keyboard-drawing-marshal.tmp matekbd-keyboard-drawing-marshal.h ) \
- || ( rm -f matekbd-keyboard-drawing-marshal.tmp && exit 1 )
-
-matekbd-keyboard-drawing-marshal.c: matekbd-keyboard-drawing-marshal.h
- $(AM_V_GEN)( $(GLIB_GENMARSHAL) --prefix=matekbd_keyboard_drawing $(srcdir)/matekbd-keyboard-drawing-marshal.list \
- --body > matekbd-keyboard-drawing-marshal.tmp \
- && mv matekbd-keyboard-drawing-marshal.tmp matekbd-keyboard-drawing-marshal.c ) \
- || ( rm -f matekbd-keyboard-drawing-marshal.tmp && exit 1 )
-
-# don't do this if we are building in eg. rpm
-@MATECONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-@MATECONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-@MATECONF_SCHEMAS_INSTALL_TRUE@ for p in $(schema_DATA) ; do \
-@MATECONF_SCHEMAS_INSTALL_TRUE@ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $$p; \
-@MATECONF_SCHEMAS_INSTALL_TRUE@ done \
-@MATECONF_SCHEMAS_INSTALL_TRUE@ fi
-@MATECONF_SCHEMAS_INSTALL_FALSE@install-data-local:
-
-# 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/libmatekbd/matekbd-indicator.c b/libmatekbd/matekbd-indicator.c
index c4928aa..a361c8d 100644
--- a/libmatekbd/matekbd-indicator.c
+++ b/libmatekbd/matekbd-indicator.c
@@ -19,6 +19,7 @@
#include <memory.h>
+#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
@@ -227,23 +228,31 @@ matekbd_indicator_fill (MatekbdIndicator * gki)
}
}
-static gboolean
-matekbd_indicator_key_pressed (GtkWidget *
- widget, GdkEventKey * event,
- MatekbdIndicator * gki)
-{
- switch (event->keyval) {
- case GDK_KP_Enter:
- case GDK_ISO_Enter:
- case GDK_3270_Enter:
- case GDK_Return:
- case GDK_space:
- case GDK_KP_Space:
- matekbd_desktop_config_lock_next_group (&globals.cfg);
- return TRUE;
- default:
- break;
+static gboolean matekbd_indicator_key_pressed(GtkWidget* widget, GdkEventKey* event, MatekbdIndicator* gki)
+{
+ switch (event->keyval)
+ {
+ #if GTK_CHECK_VERSION(3, 0, 0)
+ case GDK_KEY_KP_Enter:
+ case GDK_KEY_ISO_Enter:
+ case GDK_KEY_3270_Enter:
+ case GDK_KEY_Return:
+ case GDK_KEY_space:
+ case GDK_KEY_KP_Space:
+ #else
+ case GDK_KP_Enter:
+ case GDK_ISO_Enter:
+ case GDK_3270_Enter:
+ case GDK_Return:
+ case GDK_space:
+ case GDK_KP_Space:
+ #endif
+ matekbd_desktop_config_lock_next_group(&globals.cfg);
+ return TRUE;
+ default:
+ break;
}
+
return FALSE;
}
@@ -524,7 +533,7 @@ matekbd_indicator_load_group_names (const gchar ** layout_ids,
if (!matekbd_desktop_config_load_group_descriptions
(&globals.cfg, globals.registry, layout_ids, variant_ids,
&globals.short_group_names, &globals.full_group_names)) {
- /* We just populate no short names (remain NULL) -
+ /* We just populate no short names (remain NULL) -
* full names are going to be used anyway */
gint i, total_groups =
xkl_engine_get_num_groups (globals.engine);
@@ -688,21 +697,21 @@ matekbd_indicator_scroll (GtkWidget * gki, GdkEventScroll * event)
return TRUE;
}
-static void
-matekbd_indicator_init (MatekbdIndicator * gki)
+static void matekbd_indicator_init(MatekbdIndicator* gki)
{
GtkWidget *def_drawing;
GtkNotebook *notebook;
- if (!g_slist_length (globals.widget_instances))
- matekbd_indicator_global_init ();
+ if (!g_slist_length(globals.widget_instances))
+ {
+ matekbd_indicator_global_init();
+ }
gki->priv = g_new0 (MatekbdIndicatorPrivate, 1);
notebook = GTK_NOTEBOOK (gki);
- xkl_debug (100, "Initiating the widget startup process for %p\n",
- gki);
+ xkl_debug (100, "Initiating the widget startup process for %p\n", gki);
gtk_notebook_set_show_tabs (notebook, FALSE);
gtk_notebook_set_show_border (notebook, FALSE);
@@ -817,8 +826,10 @@ matekbd_indicator_global_init (void)
MateConfClient *mateconf_client;
XklConfigRec *xklrec = xkl_config_rec_new ();
- globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
- if (globals.engine == NULL) {
+ globals.engine = xkl_engine_get_instance(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
+
+ if (globals.engine == NULL)
+ {
xkl_debug (0, "Libxklavier initialization error");
return;
}
diff --git a/libmatekbd/matekbd-keyboard-drawing.c b/libmatekbd/matekbd-keyboard-drawing.c
index 77e481f..f14460d 100644
--- a/libmatekbd/matekbd-keyboard-drawing.c
+++ b/libmatekbd/matekbd-keyboard-drawing.c
@@ -1988,8 +1988,8 @@ matekbd_keyboard_drawing_init (MatekbdKeyboardDrawing * drawing)
gint opcode = 0, error = 0, major = 1, minor = 0;
gint mask;
- drawing->display =
- GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+ drawing->display = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+
printf ("dpy: %p\n", (void *) drawing->display);
if (!XkbQueryExtension
@@ -2534,7 +2534,7 @@ matekbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
GdkRectangle *rect;
GError *error = NULL;
char title[128] = "";
- XklEngine *engine = xkl_engine_get_instance (GDK_DISPLAY ());
+ XklEngine* engine = xkl_engine_get_instance(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
builder = gtk_builder_new ();
gtk_builder_add_from_file (builder, UIDIR "/show-layout.ui",
@@ -2592,8 +2592,8 @@ matekbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
NULL;
}
- if (xkl_xkb_config_native_prepare
- (engine, xkl_data, &component_names)) {
+ if (xkl_xkb_config_native_prepare(engine, xkl_data, &component_names))
+ {
matekbd_keyboard_drawing_set_keyboard
(MATEKBD_KEYBOARD_DRAWING (kbdraw),
&component_names);
@@ -2601,20 +2601,24 @@ matekbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
&component_names);
}
}
+
g_object_unref (G_OBJECT (xkl_data));
g_object_set_data (G_OBJECT (dialog), "builderData", builder);
- g_signal_connect (G_OBJECT (dialog), "response",
- G_CALLBACK (show_layout_response), NULL);
+ g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (show_layout_response), NULL);
rect = matekbd_preview_load_position ();
- if (rect != NULL) {
+
+ if (rect != NULL)
+ {
gtk_window_move (GTK_WINDOW (dialog), rect->x, rect->y);
- gtk_window_resize (GTK_WINDOW (dialog), rect->width,
- rect->height);
+ gtk_window_resize (GTK_WINDOW (dialog), rect->width, rect->height);
g_free (rect);
- } else
+ }
+ else
+ {
gtk_window_resize (GTK_WINDOW (dialog), 700, 400);
+ }
gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
@@ -2624,12 +2628,13 @@ matekbd_keyboard_drawing_new_dialog (gint group, gchar * group_name)
g_object_set_data (G_OBJECT (dialog), "kbdraw", kbdraw);
- g_signal_connect_swapped (GTK_OBJECT (dialog), "destroy",
- G_CALLBACK (g_object_unref),
- g_object_get_data (G_OBJECT (dialog),
- "builderData"));
+ #if GTK_CHECK_VERSION(3, 0, 0)
+ g_signal_connect_swapped(G_OBJECT(dialog), "destroy", G_CALLBACK(g_object_unref), g_object_get_data(G_OBJECT(dialog), "builderData"));
+ #else
+ g_signal_connect_swapped(GTK_OBJECT(dialog), "destroy", G_CALLBACK(g_object_unref), g_object_get_data(G_OBJECT(dialog), "builderData"));
+ #endif
- gtk_widget_show_all (dialog);
+ gtk_widget_show_all(dialog);
return dialog;
}
diff --git a/libmatekbd/matekbd-status.c b/libmatekbd/matekbd-status.c
index 72a9add..6b55828 100644
--- a/libmatekbd/matekbd-status.c
+++ b/libmatekbd/matekbd-status.c
@@ -459,7 +459,7 @@ matekbd_status_load_group_names (const gchar ** layout_ids,
if (!matekbd_desktop_config_load_group_descriptions
(&globals.cfg, globals.registry, layout_ids, variant_ids,
&globals.short_group_names, &globals.full_group_names)) {
- /* We just populate no short names (remain NULL) -
+ /* We just populate no short names (remain NULL) -
* full names are going to be used anyway */
gint i, total_groups =
xkl_engine_get_num_groups (globals.engine);
@@ -771,7 +771,8 @@ matekbd_status_global_init (void)
MateConfClient *mateconf_client;
XklConfigRec *xklrec = xkl_config_rec_new ();
- globals.engine = xkl_engine_get_instance (GDK_DISPLAY ());
+ globals.engine = xkl_engine_get_instance(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()));
+
if (globals.engine == NULL) {
xkl_debug (0, "Libxklavier initialization error");
return;