Update version to 1.0.5.

Mark struct types in eek-0.90.metadata; add eek-text.h to eek-0.90.files.

bindings/vala/eek-0.90/eek-0.90.files

@@ -9,6 +9,7 @@ include/eek-0.90/eek/eek-section.h
 include/eek-0.90/eek/eek-serializable.h
 include/eek-0.90/eek/eek-symbol.h
 include/eek-0.90/eek/eek-symbol-matrix.h
+include/eek-0.90/eek/eek-text.h
 include/eek-0.90/eek/eek-theme.h
 include/eek-0.90/eek/eek-types.h
 include/eek-0.90/eek/eek-xml.h

bindings/vala/eek-0.90/eek-0.90.gi

@@ -900,7 +900,7 @@
 				<return-type type="EekKeysym*"/>
 				<parameters>
 					<parameter name="xkeysym" type="guint"/>
-					<parameter name="modifier" type="EekModifierType"/>
+					<parameter name="modifier_mask" type="EekModifierType"/>
 				</parameters>
 			</constructor>
 		</object>
@@ -1061,6 +1061,18 @@
 			<implements>
 				<interface name="EekSerializable"/>
 			</implements>
+			<method name="category_from_name" symbol="eek_symbol_category_from_name">
+				<return-type type="EekSymbolCategory"/>
+				<parameters>
+					<parameter name="name" type="gchar*"/>
+				</parameters>
+			</method>
+			<method name="category_get_name" symbol="eek_symbol_category_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="category" type="EekSymbolCategory"/>
+				</parameters>
+			</method>
 			<method name="get_category" symbol="eek_symbol_get_category">
 				<return-type type="EekSymbolCategory"/>
 				<parameters>
@@ -1082,7 +1094,7 @@
 			<method name="get_modifier_mask" symbol="eek_symbol_get_modifier_mask">
 				<return-type type="EekModifierType"/>
 				<parameters>
-					<parameter name="keysym" type="EekSymbol*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
 				</parameters>
 			</method>
 			<method name="get_name" symbol="eek_symbol_get_name">
@@ -1127,7 +1139,7 @@
 			<method name="set_modifier_mask" symbol="eek_symbol_set_modifier_mask">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="keysym" type="EekSymbol*"/>
+					<parameter name="symbol" type="EekSymbol*"/>
 					<parameter name="mask" type="EekModifierType"/>
 				</parameters>
 			</method>
@@ -1144,6 +1156,24 @@
 			<property name="modifier-mask" type="EekModifierType" readable="1" writable="1" construct="1" construct-only="0"/>
 			<property name="name" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 		</object>
+		<object name="EekText" parent="EekSymbol" type-name="EekText" get-type="eek_text_get_type">
+			<implements>
+				<interface name="EekSerializable"/>
+			</implements>
+			<method name="get_text" symbol="eek_text_get_text">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="text" type="EekText*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eek_text_new">
+				<return-type type="EekText*"/>
+				<parameters>
+					<parameter name="text" type="gchar*"/>
+				</parameters>
+			</constructor>
+			<property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+		</object>
 		<object name="EekTheme" parent="GObject" type-name="EekTheme" get-type="eek_theme_get_type">
 			<method name="load_stylesheet" symbol="eek_theme_load_stylesheet">
 				<return-type type="gboolean"/>
@@ -1235,6 +1265,7 @@
 		<constant name="EEK_SERIALIZABLE_H" type="int" value="1"/>
 		<constant name="EEK_SYMBOL_H" type="int" value="1"/>
 		<constant name="EEK_SYMBOL_MATRIX_H" type="int" value="1"/>
+		<constant name="EEK_TEXT_H" type="int" value="1"/>
 		<constant name="EEK_TYPES_H" type="int" value="1"/>
 		<constant name="EEK_XML_H" type="int" value="1"/>
 		<constant name="EEK_XML_LAYOUT_H" type="int" value="1"/>

bindings/vala/eek-0.90/eek-0.90.metadata

@@ -1 +1,24 @@
 Eek cheader_filename="eek/eek.h"
+
+EekBounds is_value_type="1"
+eek_bounds_copy hidden="1"
+eek_bounds_free hidden="1"
+
+EekPoint is_value_type="1"
+eek_point_copy hidden="1"
+eek_point_free hidden="1"
+
+EekOutline is_value_type="1"
+eek_outline_copy hidden="1"
+eek_outline_free hidden="1"
+
+EekColor is_value_type="1"
+eek_color_copy hidden="1"
+eek_color_free hidden="1"
+eek_color_new hidden="1"
+
+eek_element_get_bounds.bounds is_out="1"
+eek_element_get_absolute_position.x is_out="1"
+eek_element_get_absolute_position.y is_out="1"
+eek_element_get_symbol_index.group is_out="1"
+eek_element_get_symbol_index.level is_out="1"

configure.ac

@@ -20,7 +20,7 @@ AC_PREREQ(2.63)
 dnl AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
 
-AC_INIT([eekboard], [1.0.4], [ueno@unixuser.org])
+AC_INIT([eekboard], [1.0.5], [ueno@unixuser.org])
 
 dnl Init automake
 AM_INIT_AUTOMAKE

eek/eek-gtk-keyboard.c

@@ -141,11 +141,11 @@ eek_gtk_keyboard_real_draw (GtkWidget *self,
         style = gtk_widget_get_style (self);
         state = gtk_widget_get_state (self);
 
-        color = color_from_gdk_color (&style->fg[state]);
+        color = color_from_gdk_color (&style->text[state]);
         eek_renderer_set_default_foreground_color (priv->renderer, color);
         eek_color_free (color);
 
-        color = color_from_gdk_color (&style->bg[state]);
+        color = color_from_gdk_color (&style->base[state]);
         eek_renderer_set_default_background_color (priv->renderer, color);
         eek_color_free (color);
     }

eek/eek-renderer.c

@@ -249,8 +249,8 @@ render_key_outline (EekRenderer *renderer,
     /* need to rescale so that the border fit inside the clipping
        region */
     eek_element_get_bounds (EEK_ELEMENT(key), &bounds);
-    scale = MIN((bounds.width - border_width) / bounds.width,
-                (bounds.height - border_width) / bounds.height);
+    scale = MIN((bounds.width - border_width * 2) / bounds.width,
+                (bounds.height - border_width * 2) / bounds.height);
 
     outline = eek_keyboard_get_outline (priv->keyboard, oref);
     outline = eek_outline_copy (outline);
@@ -260,8 +260,8 @@ render_key_outline (EekRenderer *renderer,
     }
 
     cairo_translate (cr,
-                     border_width / 2 * priv->scale,
-                     border_width / 2 * priv->scale);
+                     border_width * priv->scale * scale,
+                     border_width * priv->scale * scale);
 
     if (gradient_type != EEK_GRADIENT_NONE) {
         cairo_pattern_t *pat;

eek/eek-text.c

@@ -18,6 +18,11 @@
  * 02110-1301 USA
  */
 
+/**
+ * SECTION:eek-text
+ * @short_description: an #EekText represents a text symbol
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
@@ -166,6 +171,12 @@ eek_text_new (const gchar *text)
                          NULL);
 }
 
+/**
+ * eek_text_get_text:
+ * @text: an #EekText
+ *
+ * Get a text value associated with @text
+ */
 const gchar *
 eek_text_get_text (EekText *text)
 {

eek/eek-text.h

@@ -39,6 +39,12 @@ G_BEGIN_DECLS
 typedef struct _EekTextClass EekTextClass;
 typedef struct _EekTextPrivate EekTextPrivate;
 
+/**
+ * EekText:
+ *
+ * The #EekText structure contains only private data and should only
+ * be accessed using the provided API.
+ */
 struct _EekText {
     /*< private >*/
     EekSymbol parent;

src/server-main.c

@@ -93,8 +93,6 @@ main (int argc, char **argv)
 
     eek_init ();
 
-    g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
-
     if (opt_system)
         bus_type = G_BUS_TYPE_SYSTEM;
     else if (opt_address)