Fix clean rebuild.

docs/reference/eek/Makefile.am

@@ -102,6 +102,7 @@ GTKDOC_CFLAGS = $(GOBJECT2_CFLAGS)
 GTKDOC_LIBS = $(top_srcdir)/eek/libeek.la \
 	$(top_srcdir)/eek/libeek-clutter.la \
 	$(top_srcdir)/eek/libeek-xkb.la \
+	$(top_srcdir)/eek/libeek-xkl.la \
 	$(GOBJECT2_LIBS) \
 	$(CLUTTER_LIBS) \
 	$(XKB_LIBS) \

eek/eek-clutter-key-actor.c

@@ -61,9 +61,6 @@ static struct {
     gint outline_textures_ref_count;
 } texture_cache;
 
-static gboolean      on_event           (ClutterActor       *actor,
-                                         ClutterEvent       *event,
-                                         gpointer            user_data);
 static ClutterActor *get_texture        (EekClutterKeyActor *actor);
 static void          draw_key_on_layout (EekKey             *key,
                                          PangoLayout        *layout);
@@ -272,6 +269,7 @@ eek_clutter_key_actor_new (EekKey *key)
     return CLUTTER_ACTOR(actor);
 }
 
+#if 0
 static void  
 on_key_animate_complete (ClutterAnimation *animation,
                          gpointer user_data)
@@ -282,6 +280,7 @@ on_key_animate_complete (ClutterAnimation *animation,
     clutter_actor_set_opacity (actor, 0xff);
     clutter_actor_set_scale (actor, 1.0, 1.0);
 }
+#endif
 
 static void
 key_enlarge (ClutterActor *actor)
@@ -303,33 +302,6 @@ key_shrink (ClutterActor *actor)
                            NULL);
 }
 
-static gboolean
-on_event (ClutterActor *actor,
-	  ClutterEvent *event,
-	  gpointer      user_data)
-{
-    if (clutter_event_get_source (event) == actor) {
-        EekClutterKeyActorPrivate *priv =
-            EEK_CLUTTER_KEY_ACTOR_GET_PRIVATE(actor);
-        ClutterActor *section;
-
-        g_return_val_if_fail (priv, FALSE);
-        /* Make sure the enlarged key show up on the keys which belong
-           to other sections. */
-        section = clutter_actor_get_parent (actor);
-        clutter_actor_raise_top (section);
-        clutter_actor_raise_top (actor);
-        if (event->type == CLUTTER_BUTTON_PRESS) {
-            key_enlarge (actor);
-            g_signal_emit_by_name (priv->key, "pressed");
-        } else if (event->type == CLUTTER_BUTTON_RELEASE) {
-            key_shrink (actor);
-            g_signal_emit_by_name (priv->key, "released");
-        }
-    }
-    return FALSE;
-}
-
 static gdouble
 length (gdouble x, gdouble y)
 {

eek/eek-xkb-layout.c

@@ -222,7 +222,7 @@ create_section (EekXkbLayout  *layout,
     EekXkbLayoutPrivate *priv;
     EekSection *section;
     EekBounds bounds;
-    const gchar *name;
+    gchar *name;
     gfloat left, top;
     gint i, j;
 

eek/eek-xkl-layout.c

@@ -70,7 +70,7 @@ extern void xkl_xkb_config_native_cleanup (XklEngine * engine,
 					   XkbComponentNamesPtr
 					   component_names);
 
-static void update_xkb_layout (EekXklLayout *layout);
+static void get_xkb_component_names (EekXklLayout *layout);
 
 static void
 eek_xkl_layout_finalize (GObject *object)
@@ -120,16 +120,19 @@ eek_xkl_layout_get_property (GObject    *object,
     switch (prop_id) 
         {
         case PROP_LAYOUTS:
-            g_value_set_boxed (value,
+            g_value_set_boxed
-                               eek_xkl_layout_get_layouts (EEK_XKL_LAYOUT(object)));
+                (value,
+                 eek_xkl_layout_get_layouts (EEK_XKL_LAYOUT(object)));
             break;
         case PROP_VARIANTS:
-            g_value_set_boxed (value,
+            g_value_set_boxed
-                               eek_xkl_layout_get_variants (EEK_XKL_LAYOUT(object)));
+                (value,
+                 eek_xkl_layout_get_variants (EEK_XKL_LAYOUT(object)));
             break;
         case PROP_OPTIONS:
-            g_value_set_boxed (value,
+            g_value_set_boxed
-                               eek_xkl_layout_get_options (EEK_XKL_LAYOUT(object)));
+                (value,
+                 eek_xkl_layout_get_options (EEK_XKL_LAYOUT(object)));
             break;
         default:
             g_object_get_property (object,
@@ -187,7 +190,7 @@ eek_xkl_layout_init (EekXklLayout *self)
 
     priv->engine = xkl_engine_get_instance (display);
     xkl_config_rec_get_from_server (&priv->config, priv->engine);
-    update_xkb_layout (self);
+    get_xkb_component_names (self);
 }
 
 EekLayout *
@@ -206,7 +209,7 @@ eek_xkl_layout_set_layouts (EekXklLayout *layout, gchar **layouts)
     g_return_if_fail (priv);
     g_strfreev (priv->config.layouts);
     priv->config.layouts = g_strdupv (layouts);
-    update_xkb_layout (layout);
+    get_xkb_component_names (layout);
 }
 
 void
@@ -217,7 +220,7 @@ eek_xkl_layout_set_variants (EekXklLayout *layout, gchar **variants)
     g_return_if_fail (priv);
     g_strfreev (priv->config.variants);
     priv->config.variants = g_strdupv (variants);
-    update_xkb_layout (layout);
+    get_xkb_component_names (layout);
 }
 
 void
@@ -228,7 +231,7 @@ eek_xkl_layout_set_options (EekXklLayout *layout, gchar **options)
     g_return_if_fail (priv);
     g_strfreev (priv->config.options);
     priv->config.options = g_strdupv (options);
-    update_xkb_layout (layout);
+    get_xkb_component_names (layout);
 }
 
 gchar **
@@ -259,7 +262,7 @@ eek_xkl_layout_get_options (EekXklLayout *layout)
 }
 
 static void
-update_xkb_layout (EekXklLayout *layout)
+get_xkb_component_names (EekXklLayout *layout)
 {
     EekXklLayoutPrivate *priv = layout->priv;
     XkbComponentNamesRec names;

tests/Makefile.am

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-INCLUDES = -I$(top_srcdir) $(CLUTTER_CFLAGS) $(GOBJECT2_CFLAGS) $(SIMPLE_CFLAGS) $(XKB_CFLAGS)
+INCLUDES = -I$(top_srcdir) $(CLUTTER_CFLAGS) $(GOBJECT2_CFLAGS) $(GTK2_CFLAGS) $(XKB_CFLAGS)
 
 TESTS = eek-simple-test eek-xkb-test
 noinst_PROGRAMS = $(TESTS)

tests/eek-xkb-test.c

@@ -19,6 +19,9 @@
  */
 #include "eek-xkb.h"
 
+/* For gdk_x11_display_get_xdisplay().  See main(). */
+#include <gtk/gtk.h>
+
 static void
 test_create (void)
 {
@@ -44,7 +47,7 @@ main (int argc, char **argv)
 {
     g_type_init ();
     g_test_init (&argc, &argv, NULL);
-    gtk_init (&argc, &argv);
+    gtk_init (&argc, &argv);  /* for gdk_x11_display_get_xdisplay() */
     g_test_add_func ("/eek-xkb-test/create", test_create);
     return g_test_run ();
 }