From 360da8a3c9713dc35ff12d5ecdd28ecdda9a525d Mon Sep 17 00:00:00 2001
From: Daiki Ueno <ueno@unixuser.org>
Date: Tue, 23 Aug 2011 10:57:53 +0900
Subject: [PATCH] Update vala binding.

---
 bindings/vala/eek-0.90/eek-0.90.defines       |   2 +
 bindings/vala/eek-0.90/eek-0.90.gi            |  95 +++++++
 .../eek-clutter-0.90/eek-clutter-0.90.defines |   2 +
 .../vala/eek-gtk-0.90/eek-gtk-0.90.defines    |   2 +
 .../vala/eek-xkb-0.90/eek-xkb-0.90.defines    |   2 +
 bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi    |   2 -
 .../vala/eek-xkl-0.90/eek-xkl-0.90.defines    |   2 +
 bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi    |   2 -
 .../vala/eekboard-0.90/eekboard-0.90.defines  |   2 +
 bindings/vala/eekboard-0.90/eekboard-0.90.gi  | 246 ++++++++++++++----
 10 files changed, 303 insertions(+), 54 deletions(-)
 create mode 100644 bindings/vala/eek-0.90/eek-0.90.defines
 create mode 100644 bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines
 create mode 100644 bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines
 create mode 100644 bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines
 create mode 100644 bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines
 create mode 100644 bindings/vala/eekboard-0.90/eekboard-0.90.defines

diff --git a/bindings/vala/eek-0.90/eek-0.90.defines b/bindings/vala/eek-0.90/eek-0.90.defines
new file mode 100644
index 00000000..13f3e944
--- /dev/null
+++ b/bindings/vala/eek-0.90/eek-0.90.defines
@@ -0,0 +1,2 @@
+-DEEK_COMPILATION=1
+
diff --git a/bindings/vala/eek-0.90/eek-0.90.gi b/bindings/vala/eek-0.90/eek-0.90.gi
index 5b63c31a..a76ffd1e 100644
--- a/bindings/vala/eek-0.90/eek-0.90.gi
+++ b/bindings/vala/eek-0.90/eek-0.90.gi
@@ -15,6 +15,10 @@
 				<parameter name="user_data" type="gpointer"/>
 			</parameters>
 		</callback>
+		<struct name="EekModifierKey">
+			<field name="modifiers" type="EekModifierType"/>
+			<field name="key" type="EekKey*"/>
+		</struct>
 		<struct name="EekThemeClass">
 		</struct>
 		<struct name="EekThemeContext">
@@ -500,6 +504,12 @@
 					<parameter name="fallback_level" type="gint"/>
 				</parameters>
 			</method>
+			<method name="is_locked" symbol="eek_key_is_locked">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</method>
 			<method name="is_pressed" symbol="eek_key_is_pressed">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -540,6 +550,18 @@
 			<property name="oref" type="gulong" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="row" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
 			<property name="symbol-matrix" type="EekSymbolMatrix*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="cancelled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="locked" when="FIRST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<signal name="pressed" when="FIRST">
 				<return-type type="void"/>
 				<parameters>
@@ -552,6 +574,12 @@
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
+			<signal name="unlocked" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<vfunc name="get_index">
 				<return-type type="void"/>
 				<parameters>
@@ -578,6 +606,12 @@
 					<parameter name="self" type="EekKey*"/>
 				</parameters>
 			</vfunc>
+			<vfunc name="is_locked">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="self" type="EekKey*"/>
+				</parameters>
+			</vfunc>
 			<vfunc name="is_pressed">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -662,6 +696,12 @@
 					<parameter name="keyboard" type="EekKeyboard*"/>
 				</parameters>
 			</method>
+			<method name="get_locked_keys" symbol="eek_keyboard_get_locked_keys">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
 			<method name="get_modifier_behavior" symbol="eek_keyboard_get_modifier_behavior">
 				<return-type type="EekModifierBehavior"/>
 				<parameters>
@@ -687,6 +727,12 @@
 					<parameter name="oref" type="gulong"/>
 				</parameters>
 			</method>
+			<method name="get_pressed_keys" symbol="eek_keyboard_get_pressed_keys">
+				<return-type type="GList*"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+				</parameters>
+			</method>
 			<method name="get_size" symbol="eek_keyboard_get_size">
 				<return-type type="void"/>
 				<parameters>
@@ -747,6 +793,13 @@
 					<parameter name="modifier_behavior" type="EekModifierBehavior"/>
 				</parameters>
 			</method>
+			<method name="set_modifiers" symbol="eek_keyboard_set_modifiers">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="modifiers" type="EekModifierType"/>
+				</parameters>
+			</method>
 			<method name="set_num_lock_mask" symbol="eek_keyboard_set_num_lock_mask">
 				<return-type type="void"/>
 				<parameters>
@@ -772,6 +825,20 @@
 			</method>
 			<property name="layout" type="EekLayout*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<property name="modifier-behavior" type="EekModifierBehavior" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="key-cancelled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="key-locked" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<signal name="key-pressed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -786,6 +853,13 @@
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
+			<signal name="key-unlocked" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekKeyboard*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<vfunc name="create_section">
 				<return-type type="EekSection*"/>
 				<parameters>
@@ -896,6 +970,20 @@
 				</parameters>
 			</method>
 			<property name="angle" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="key-cancelled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
+			<signal name="key-locked" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<signal name="key-pressed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -910,6 +998,13 @@
 					<parameter name="key" type="EekKey*"/>
 				</parameters>
 			</signal>
+			<signal name="key-unlocked" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekSection*"/>
+					<parameter name="key" type="EekKey*"/>
+				</parameters>
+			</signal>
 			<vfunc name="add_row">
 				<return-type type="void"/>
 				<parameters>
diff --git a/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines
new file mode 100644
index 00000000..13f3e944
--- /dev/null
+++ b/bindings/vala/eek-clutter-0.90/eek-clutter-0.90.defines
@@ -0,0 +1,2 @@
+-DEEK_COMPILATION=1
+
diff --git a/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines
new file mode 100644
index 00000000..13f3e944
--- /dev/null
+++ b/bindings/vala/eek-gtk-0.90/eek-gtk-0.90.defines
@@ -0,0 +1,2 @@
+-DEEK_COMPILATION=1
+
diff --git a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines
new file mode 100644
index 00000000..13f3e944
--- /dev/null
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.defines
@@ -0,0 +1,2 @@
+-DEEK_COMPILATION=1
+
diff --git a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
index 8ab6b153..891d532e 100644
--- a/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
+++ b/bindings/vala/eek-xkb-0.90/eek-xkb-0.90.gi
@@ -37,7 +37,6 @@
 					<parameter name="keycodes" type="gchar*"/>
 				</parameters>
 			</method>
-<!--
 			<method name="set_names" symbol="eek_xkb_layout_set_names">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -45,7 +44,6 @@
 					<parameter name="names" type="XkbComponentNamesRec*"/>
 				</parameters>
 			</method>
--->
 			<method name="set_names_full" symbol="eek_xkb_layout_set_names_full">
 				<return-type type="gboolean"/>
 				<parameters>
diff --git a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines
new file mode 100644
index 00000000..13f3e944
--- /dev/null
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.defines
@@ -0,0 +1,2 @@
+-DEEK_COMPILATION=1
+
diff --git a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
index 2f793222..87b9928b 100644
--- a/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
+++ b/bindings/vala/eek-xkl-0.90/eek-xkl-0.90.gi
@@ -50,7 +50,6 @@
 			<constructor name="new" symbol="eek_xkl_layout_new">
 				<return-type type="EekLayout*"/>
 			</constructor>
-<!--
 			<method name="set_config" symbol="eek_xkl_layout_set_config">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -58,7 +57,6 @@
 					<parameter name="config" type="XklConfigRec*"/>
 				</parameters>
 			</method>
--->
 			<method name="set_config_full" symbol="eek_xkl_layout_set_config_full">
 				<return-type type="gboolean"/>
 				<parameters>
diff --git a/bindings/vala/eekboard-0.90/eekboard-0.90.defines b/bindings/vala/eekboard-0.90/eekboard-0.90.defines
new file mode 100644
index 00000000..db1a80fc
--- /dev/null
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.defines
@@ -0,0 +1,2 @@
+-DEEKBOARD_COMPILATION
+
diff --git a/bindings/vala/eekboard-0.90/eekboard-0.90.gi b/bindings/vala/eekboard-0.90/eekboard-0.90.gi
index d8422d8d..4b6414a4 100644
--- a/bindings/vala/eekboard-0.90/eekboard-0.90.gi
+++ b/bindings/vala/eekboard-0.90/eekboard-0.90.gi
@@ -1,6 +1,100 @@
 <?xml version="1.0"?>
 <api version="1.0">
 	<namespace name="Eekboard">
+		<function name="xkl_config_rec_from_string" symbol="eekboard_xkl_config_rec_from_string">
+			<return-type type="XklConfigRec*"/>
+			<parameters>
+				<parameter name="layouts" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="xkl_config_rec_to_string" symbol="eekboard_xkl_config_rec_to_string">
+			<return-type type="gchar*"/>
+			<parameters>
+				<parameter name="rec" type="XklConfigRec*"/>
+			</parameters>
+		</function>
+		<function name="xkl_list_layout_variants" symbol="eekboard_xkl_list_layout_variants">
+			<return-type type="GSList*"/>
+			<parameters>
+				<parameter name="registry" type="XklConfigRegistry*"/>
+				<parameter name="layout" type="gchar*"/>
+			</parameters>
+		</function>
+		<function name="xkl_list_layouts" symbol="eekboard_xkl_list_layouts">
+			<return-type type="GSList*"/>
+			<parameters>
+				<parameter name="registry" type="XklConfigRegistry*"/>
+			</parameters>
+		</function>
+		<function name="xkl_list_models" symbol="eekboard_xkl_list_models">
+			<return-type type="GSList*"/>
+			<parameters>
+				<parameter name="registry" type="XklConfigRegistry*"/>
+			</parameters>
+		</function>
+		<function name="xkl_list_option_groups" symbol="eekboard_xkl_list_option_groups">
+			<return-type type="GSList*"/>
+			<parameters>
+				<parameter name="registry" type="XklConfigRegistry*"/>
+			</parameters>
+		</function>
+		<function name="xkl_list_options" symbol="eekboard_xkl_list_options">
+			<return-type type="GSList*"/>
+			<parameters>
+				<parameter name="registry" type="XklConfigRegistry*"/>
+				<parameter name="group" type="gchar*"/>
+			</parameters>
+		</function>
+		<object name="EekboardClient" parent="GDBusProxy" type-name="EekboardClient" get-type="eekboard_client_get_type">
+			<implements>
+				<interface name="GInitable"/>
+				<interface name="GAsyncInitable"/>
+			</implements>
+			<method name="create_context" symbol="eekboard_client_create_context">
+				<return-type type="EekboardContext*"/>
+				<parameters>
+					<parameter name="eekboard" type="EekboardClient*"/>
+					<parameter name="client_name" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
+			<method name="destroy_context" symbol="eekboard_client_destroy_context">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="eekboard" type="EekboardClient*"/>
+					<parameter name="context" type="EekboardContext*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
+			<constructor name="new" symbol="eekboard_client_new">
+				<return-type type="EekboardClient*"/>
+				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</constructor>
+			<method name="pop_context" symbol="eekboard_client_pop_context">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="eekboard" type="EekboardClient*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
+			<method name="push_context" symbol="eekboard_client_push_context">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="eekboard" type="EekboardClient*"/>
+					<parameter name="context" type="EekboardContext*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
+			<signal name="destroyed" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekboardClient*"/>
+				</parameters>
+			</signal>
+		</object>
 		<object name="EekboardContext" parent="GDBusProxy" type-name="EekboardContext" get-type="eekboard_context_get_type">
 			<implements>
 				<interface name="GInitable"/>
@@ -10,7 +104,14 @@
 				<return-type type="guint"/>
 				<parameters>
 					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="keyboard" type="EekKeyboard*"/>
+					<parameter name="keyboard" type="gchar*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+				</parameters>
+			</method>
+			<method name="get_group" symbol="eekboard_context_get_group">
+				<return-type type="gint"/>
+				<parameters>
+					<parameter name="context" type="EekboardContext*"/>
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</method>
@@ -41,7 +142,7 @@
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</constructor>
-			<method name="press_key" symbol="eekboard_context_press_key">
+			<method name="press_keycode" symbol="eekboard_context_press_keycode">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="context" type="EekboardContext*"/>
@@ -49,7 +150,7 @@
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</method>
-			<method name="release_key" symbol="eekboard_context_release_key">
+			<method name="release_keycode" symbol="eekboard_context_release_keycode">
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="context" type="EekboardContext*"/>
@@ -103,7 +204,7 @@
 					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</method>
-			<property name="keyboard-visible" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
+			<property name="visible" type="gboolean" readable="1" writable="0" construct="0" construct-only="0"/>
 			<signal name="destroyed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -126,69 +227,114 @@
 				<return-type type="void"/>
 				<parameters>
 					<parameter name="self" type="EekboardContext*"/>
-					<parameter name="keycode" type="guint"/>
-				</parameters>
-			</signal>
-			<signal name="key-released" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="self" type="EekboardContext*"/>
-					<parameter name="keycode" type="guint"/>
+					<parameter name="keyname" type="char*"/>
+					<parameter name="symbol" type="GObject*"/>
+					<parameter name="modifiers" type="guint"/>
 				</parameters>
 			</signal>
 		</object>
-		<object name="EekboardEekboard" parent="GDBusProxy" type-name="EekboardEekboard" get-type="eekboard_eekboard_get_type">
-			<implements>
-				<interface name="GInitable"/>
-				<interface name="GAsyncInitable"/>
-			</implements>
-			<method name="create_context" symbol="eekboard_eekboard_create_context">
-				<return-type type="EekboardContext*"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardEekboard*"/>
-					<parameter name="client_name" type="gchar*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="destroy_context" symbol="eekboard_eekboard_destroy_context">
+		<object name="EekboardContextService" parent="GObject" type-name="EekboardContextService" get-type="eekboard_context_service_get_type">
+			<method name="disable" symbol="eekboard_context_service_disable">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="eekboard" type="EekboardEekboard*"/>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="context" type="EekboardContextService*"/>
 				</parameters>
 			</method>
-			<constructor name="new" symbol="eekboard_eekboard_new">
-				<return-type type="EekboardEekboard*"/>
+			<method name="enable" symbol="eekboard_context_service_enable">
+				<return-type type="void"/>
 				<parameters>
+					<parameter name="context" type="EekboardContextService*"/>
+				</parameters>
+			</method>
+			<method name="get_client_name" symbol="eekboard_context_service_get_client_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="context" type="EekboardContextService*"/>
+				</parameters>
+			</method>
+			<method name="get_fullscreen" symbol="eekboard_context_service_get_fullscreen">
+				<return-type type="gboolean"/>
+				<parameters>
+					<parameter name="context" type="EekboardContextService*"/>
+				</parameters>
+			</method>
+			<method name="get_keyboard" symbol="eekboard_context_service_get_keyboard">
+				<return-type type="EekKeyboard*"/>
+				<parameters>
+					<parameter name="context" type="EekboardContextService*"/>
+				</parameters>
+			</method>
+			<property name="client-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="connection" type="GDBusConnection*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="fullscreen" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="keyboard" type="EekKeyboard*" readable="1" writable="1" construct="0" construct-only="0"/>
+			<property name="object-path" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="visible" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
+			<signal name="disabled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekboardContextService*"/>
+				</parameters>
+			</signal>
+			<signal name="enabled" when="LAST">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekboardContextService*"/>
+				</parameters>
+			</signal>
+			<vfunc name="create_keyboard">
+				<return-type type="EekKeyboard*"/>
+				<parameters>
+					<parameter name="self" type="EekboardContextService*"/>
+					<parameter name="keyboard_type" type="gchar*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="hide_keyboard">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekboardContextService*"/>
+				</parameters>
+			</vfunc>
+			<vfunc name="show_keyboard">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="self" type="EekboardContextService*"/>
+				</parameters>
+			</vfunc>
+		</object>
+		<object name="EekboardService" parent="GObject" type-name="EekboardService" get-type="eekboard_service_get_type">
+			<constructor name="new" symbol="eekboard_service_new">
+				<return-type type="EekboardService*"/>
+				<parameters>
+					<parameter name="object_path" type="gchar*"/>
 					<parameter name="connection" type="GDBusConnection*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
 				</parameters>
 			</constructor>
-			<method name="pop_context" symbol="eekboard_eekboard_pop_context">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardEekboard*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
-			<method name="push_context" symbol="eekboard_eekboard_push_context">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="eekboard" type="EekboardEekboard*"/>
-					<parameter name="context" type="EekboardContext*"/>
-					<parameter name="cancellable" type="GCancellable*"/>
-				</parameters>
-			</method>
+			<property name="connection" type="GDBusConnection*" readable="1" writable="1" construct="1" construct-only="0"/>
+			<property name="object-path" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
 			<signal name="destroyed" when="LAST">
 				<return-type type="void"/>
 				<parameters>
-					<parameter name="self" type="EekboardEekboard*"/>
+					<parameter name="object" type="EekboardService*"/>
 				</parameters>
 			</signal>
+			<vfunc name="create_context">
+				<return-type type="EekboardContextService*"/>
+				<parameters>
+					<parameter name="self" type="EekboardService*"/>
+					<parameter name="client_name" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+				</parameters>
+			</vfunc>
 		</object>
+		<constant name="EEKBOARD_CLIENT_H" type="int" value="1"/>
 		<constant name="EEKBOARD_CONTEXT_H" type="int" value="1"/>
-		<constant name="EEKBOARD_EEKBOARD_H" type="int" value="1"/>
-		<constant name="EEKBOARD_H" type="int" value="1"/>
+		<constant name="EEKBOARD_CONTEXT_SERVICE_H" type="int" value="1"/>
+		<constant name="EEKBOARD_CONTEXT_SERVICE_INTERFACE" type="char*" value="org.fedorahosted.Eekboard.Context"/>
+		<constant name="EEKBOARD_CONTEXT_SERVICE_PATH" type="char*" value="/org/fedorahosted/Eekboard/Context_%d"/>
+		<constant name="EEKBOARD_SERVICE_H" type="int" value="1"/>
+		<constant name="EEKBOARD_SERVICE_INTERFACE" type="char*" value="org.fedorahosted.Eekboard"/>
+		<constant name="EEKBOARD_SERVICE_PATH" type="char*" value="/org/fedorahosted/Eekboard"/>
+		<constant name="EEKBOARD_XKLUTIL_H" type="int" value="1"/>
 	</namespace>
 </api>