Simplify codebase.

* Drop clutter support.
* Unify eek-xkb into eek-xkl.
* Generate vapi from gir instead of gi.
This commit is contained in:
Daiki Ueno
2012-03-16 16:21:02 +09:00
parent 06644945cf
commit 32a1d23c2a
55 changed files with 540 additions and 3970 deletions

View File

@ -16,16 +16,13 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
INCLUDES = -I$(top_srcdir) $(GIO2_CFLAGS) $(GTK_CFLAGS) $(XKB_CFLAGS)
INCLUDES = -I$(top_srcdir) $(GIO2_CFLAGS) $(GTK_CFLAGS) $(LIBXKLAVIER_CFLAGS)
TESTS = eek-simple-test eek-xkb-test eek-xml-test
TESTS = eek-simple-test eek-xml-test
noinst_PROGRAMS = $(TESTS)
eek_simple_test_SOURCES = eek-simple-test.c
eek_simple_test_LDADD = $(top_builddir)/eek/libeek.la $(GIO2_LIBS)
eek_xkb_test_SOURCES = eek-xkb-test.c
eek_xkb_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkb.la $(GIO2_LIBS) $(GTK_LIBS)
eek_xml_test_SOURCES = eek-xml-test.c
eek_xml_test_LDADD = $(top_builddir)/eek/libeek.la $(top_builddir)/eek/libeek-xkl.la $(GIO2_LIBS) $(GTK_LIBS)

View File

@ -1,53 +0,0 @@
/*
* Copyright (C) 2010-2011 Daiki Ueno <ueno@unixuser.org>
* Copyright (C) 2010-2011 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This library 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
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
#include "eek/eek-xkb.h"
/* For gdk_x11_display_get_xdisplay(). See main(). */
#include <gtk/gtk.h>
static void
test_create (void)
{
EekLayout *layout;
const gchar *keycodes, *geometry, *symbols;
layout = eek_xkb_layout_new ();
g_assert (layout);
keycodes = eek_xkb_layout_get_keycodes (EEK_XKB_LAYOUT(layout));
g_assert (keycodes);
geometry = eek_xkb_layout_get_geometry (EEK_XKB_LAYOUT(layout));
g_assert (geometry);
symbols = eek_xkb_layout_get_symbols (EEK_XKB_LAYOUT(layout));
g_assert (symbols);
eek_xkb_layout_set_geometry (EEK_XKB_LAYOUT(layout), "winbook");
geometry = eek_xkb_layout_get_geometry (EEK_XKB_LAYOUT(layout));
g_assert_cmpstr (geometry, ==, "winbook");
g_object_unref (layout);
}
int
main (int argc, char **argv)
{
g_type_init ();
g_test_init (&argc, &argv, NULL);
gtk_init (&argc, &argv); /* for gdk_x11_display_get_xdisplay() */
g_test_add_func ("/eek-xkb-test/create", test_create);
return g_test_run ();
}