From: Peng Huang <shawn.p.huang@gmail.com>
Date: Wed, 20 Oct 2010 10:48:01 +0000 (+0900)
Subject: wip.
X-Git-Tag: 1.4.0~227
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16304d0882068d01f897a64451041aebc389d045;p=platform%2Fupstream%2Fibus.git

wip.
---

diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index d1f1cf4..5252e3a 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -23,9 +23,11 @@
 vapidir = $(datadir)/vala/vapi
 dist_vapi_DATA = \
 	ibus-@IBUS_API_VERSION@.vapi \
+	ibus-@IBUS_API_VERSION@.deps \
 	$(NULL)
 
-ibus-2.0.vapi:
+ibus-@IBUS_API_VERSION@.vapi:
 	vapigen --library ibus-@IBUS_API_VERSION@ \
+			--pkg gio-2.0 \
 			ibus-@IBUS_API_VERSION@/ibus-@IBUS_API_VERSION@.gi \
 			ibus-@IBUS_API_VERSION@/ibus-@IBUS_API_VERSION@-custom.vala
diff --git a/bindings/vala/ibus-1.0.deps b/bindings/vala/ibus-1.0.deps
new file mode 100644
index 0000000..cd10dfd
--- /dev/null
+++ b/bindings/vala/ibus-1.0.deps
@@ -0,0 +1 @@
+gio-2.0
diff --git a/bindings/vala/ibus-1.0.vapi b/bindings/vala/ibus-1.0.vapi
index 218c03a..23c8c5d 100644
--- a/bindings/vala/ibus-1.0.vapi
+++ b/bindings/vala/ibus-1.0.vapi
@@ -1,6 +1,6 @@
 /* ibus-1.0.vapi generated by vapigen, do not modify. */
 
-[CCode (cprefix = "IBus", lower_case_cprefix = "ibus_", gir_namespace = "IBus", gir_version = "2.0")]
+[CCode (cprefix = "IBus", lower_case_cprefix = "ibus_", gir_namespace = "IBus", gir_version = "1.0")]
 namespace IBus {
 	[CCode (cheader_filename = "ibus.h")]
 	public class AttrList : IBus.Serializable {
@@ -26,9 +26,9 @@ namespace IBus {
 		public void add_match (string rule);
 		public unowned IBus.InputContext create_input_context (string client_name);
 		public unowned string current_input_context ();
-		public bool exit (bool restart);
+		public void exit (bool restart);
 		public unowned IBus.Config get_config ();
-		public unowned IBus.Connection get_connection ();
+		public unowned GLib.DBusConnection get_connection ();
 		public unowned IBus.EngineDesc get_global_engine ();
 		public string get_name_owner (string name);
 		public bool get_use_global_engine ();
@@ -55,19 +55,11 @@ namespace IBus {
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class Component : IBus.Serializable {
-		public weak string author;
 		public uint child_source_id;
-		public weak string description;
 		public weak GLib.List engines;
-		public weak string exec;
-		public weak string homepage;
-		public weak string license;
-		public weak string name;
 		public weak GLib.List observed_paths;
 		public void* pdummy;
 		public GLib.Pid pid;
-		public weak string textdomain;
-		public weak string version;
 		[CCode (has_construct_function = false)]
 		public Component (string name, string description, string version, string license, string author, string homepage, string exec, string textdomain);
 		public void add_engine (IBus.EngineDesc engine);
@@ -77,66 +69,53 @@ namespace IBus {
 		public Component.from_file (string filename);
 		[CCode (has_construct_function = false)]
 		public Component.from_xml_node (IBus.XMLNode node);
+		public unowned string get_author ();
+		public unowned string get_description ();
 		public unowned GLib.List get_engines ();
+		public unowned string get_exec ();
 		public static unowned IBus.Component get_from_engine (IBus.EngineDesc engine);
+		public unowned string get_homepage ();
+		public unowned string get_license ();
+		public unowned string get_name ();
+		public unowned string get_textdomain ();
+		public unowned string get_version ();
 		public bool is_running ();
+		[CCode (cname = "ibus_component_new2", has_construct_function = false)]
+		public Component.new2 (...);
 		public void output (GLib.StringBuilder output, int indent);
 		public void output_engines (GLib.StringBuilder output, int indent);
+		public void set_restart (bool restart);
 		public bool start (bool verbose);
 		public bool stop ();
+		public string author { get; construct; }
+		public string description { get; construct; }
+		public string exec { get; construct; }
+		public string homepage { get; construct; }
+		public string license { get; construct; }
+		public string name { get; construct; }
+		public string textdomain { get; construct; }
+		public string version { get; construct; }
 	}
 	[CCode (cheader_filename = "ibus.h")]
-	public class Config : IBus.Proxy {
+	public class Config : IBus.Proxy, GLib.Initable, GLib.AsyncInitable {
 		[CCode (has_construct_function = false)]
-		public Config (IBus.Connection connection);
-		public bool get_value (string section, string name, GLib.Value value);
-		public bool set_value (string section, string name, GLib.Value value);
+		public Config (GLib.DBusConnection connection, GLib.Cancellable cancellable) throws GLib.Error;
+		public unowned GLib.Variant get_value (string section, string name);
+		public bool set_value (string section, string name, GLib.Variant value);
 		public bool unset (string section, string name);
-		public virtual signal void value_changed (string p0, string p1, GLib.Value p2);
+		public virtual signal void value_changed (string p0, string p1, GLib.Variant p2);
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class ConfigService : IBus.Service {
 		[CCode (has_construct_function = false)]
-		public ConfigService (IBus.Connection connection);
+		public ConfigService (GLib.DBusConnection connection);
 		[NoWrapper]
-		public virtual bool get_value (string section, string name, GLib.Value value, out unowned IBus.Error error);
+		public virtual unowned GLib.Variant get_value (string section, string name) throws GLib.Error;
 		[NoWrapper]
-		public virtual bool set_value (string section, string name, GLib.Value value, out unowned IBus.Error error);
+		public virtual bool set_value (string section, string name, GLib.Variant value) throws GLib.Error;
 		[NoWrapper]
-		public virtual bool unset (string section, string name, out unowned IBus.Error error);
-		public void value_changed (string section, string name, GLib.Value value);
-		[NoAccessorMethod]
-		public IBus.Connection connection { owned get; construct; }
-	}
-	[CCode (cheader_filename = "ibus.h")]
-	public class Connection : IBus.Object {
-		[CCode (has_construct_function = false)]
-		public Connection ();
-		public bool call (string name, string path, string @interface, string member, out unowned IBus.Error error, ...);
-		public unowned IBus.Message call_with_reply (string name, string path, string @interface, string member, out unowned IBus.Error error, ...);
-		public void close ();
-		public void flush ();
-		public unowned IBus.DBusConnection get_connection ();
-		public long get_unix_user ();
-		public bool is_authenticated ();
-		public bool is_connected ();
-		public static unowned IBus.Connection open (string address);
-		public static unowned IBus.Connection open_private (string address);
-		public bool read_write_dispatch (int timeout);
-		public bool register_object_path (string path, IBus.MessageFunc message_func);
-		public bool send (IBus.Message message);
-		public bool send_signal (string path, string @interface, string name, ...);
-		public bool send_signal_valist (string path, string @interface, string name, GLib.Type first_arg_type, void* args);
-		public bool send_valist (int message_type, string path, string @interface, string name, GLib.Type first_arg_type, void* args);
-		public bool send_with_reply (IBus.Message message, out unowned IBus.PendingCall pending_return, int timeout_milliseconds);
-		public unowned IBus.Message send_with_reply_and_block (IBus.Message message, int timeout_milliseconds, out unowned IBus.Error error);
-		public void set_connection (IBus.DBusConnection dbus_connection, bool shared);
-		public bool unregister_object_path (string path);
-		public virtual signal bool authenticate_unix_user (ulong uid);
-		public virtual signal void disconnected ();
-		public virtual signal bool ibus_message (void* message);
-		public virtual signal void ibus_message_sent (void* message);
-		public virtual signal bool ibus_signal (void* message);
+		public virtual bool unset_value (string section, string name) throws GLib.Error;
+		public void value_changed (string section, string name, GLib.Variant value);
 	}
 	[Compact]
 	[CCode (cheader_filename = "ibus.h")]
@@ -144,22 +123,6 @@ namespace IBus {
 	}
 	[Compact]
 	[CCode (cheader_filename = "ibus.h")]
-	public class DBusError {
-	}
-	[Compact]
-	[CCode (cheader_filename = "ibus.h")]
-	public class DBusMessage {
-	}
-	[Compact]
-	[CCode (cheader_filename = "ibus.h")]
-	public class DBusMessageIter {
-	}
-	[Compact]
-	[CCode (cheader_filename = "ibus.h")]
-	public class DBusPendingCall {
-	}
-	[Compact]
-	[CCode (cheader_filename = "ibus.h")]
 	public class DBusServer {
 	}
 	[CCode (cheader_filename = "ibus.h")]
@@ -169,7 +132,7 @@ namespace IBus {
 		public bool enabled;
 		public bool has_focus;
 		[CCode (has_construct_function = false)]
-		public Engine (string name, string path, IBus.Connection connection);
+		public Engine (string engine_name, string object_path, GLib.DBusConnection connection);
 		public void commit_text (IBus.Text text);
 		public void delete_surrounding_text (int offset, uint nchars);
 		public void forward_key_event (uint keyval, uint keycode, uint state);
@@ -181,6 +144,8 @@ namespace IBus {
 		public void show_auxiliary_text ();
 		public void show_lookup_table ();
 		public void show_preedit_text ();
+		[CCode (has_construct_function = false)]
+		public Engine.type (GLib.Type engine_type, string engine_name, string object_path, GLib.DBusConnection connection);
 		public void update_auxiliary_text (IBus.Text text, bool visible);
 		public void update_lookup_table (IBus.LookupTable lookup_table, bool visible);
 		public void update_lookup_table_fast (IBus.LookupTable lookup_table, bool visible);
@@ -188,8 +153,7 @@ namespace IBus {
 		public void update_preedit_text_with_mode (IBus.Text text, uint cursor_pos, bool visible, IBus.PreeditFocusMode mode);
 		public void update_property (IBus.Property prop);
 		[NoAccessorMethod]
-		public IBus.Connection connection { owned get; construct; }
-		public string name { get; construct; }
+		public string engine_name { owned get; construct; }
 		public virtual signal void candidate_clicked (uint index, uint button, uint state);
 		public virtual signal void cursor_down ();
 		public virtual signal void cursor_up ();
@@ -209,40 +173,43 @@ namespace IBus {
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class EngineDesc : IBus.Serializable {
-		public weak string author;
-		public weak string description;
-		public weak string icon;
-		public weak string language;
-		public weak string layout;
-		public weak string license;
-		public weak string longname;
-		public weak string name;
-		public uint rank;
 		[CCode (has_construct_function = false)]
 		public EngineDesc (string name, string longname, string description, string language, string license, string author, string icon, string layout);
 		[CCode (has_construct_function = false)]
 		public EngineDesc.from_xml_node (IBus.XMLNode node);
+		public unowned string get_author ();
+		public unowned string get_description ();
+		public unowned string get_hotkeys ();
+		public unowned string get_icon ();
+		public unowned string get_language ();
+		public unowned string get_layout ();
+		public unowned string get_license ();
+		public unowned string get_longname ();
+		public unowned string get_name ();
+		public uint get_rank ();
+		[CCode (cname = "ibus_engine_desc_new2", has_construct_function = false)]
+		public EngineDesc.new2 (...);
 		public void output (GLib.StringBuilder output, int indent);
+		public string author { get; construct; }
+		public string description { get; construct; }
+		public string hotkeys { get; construct; }
+		public string icon { get; construct; }
+		public string language { get; construct; }
+		public string layout { get; construct; }
+		public string license { get; construct; }
+		public string longname { get; construct; }
+		public string name { get; construct; }
+		public uint rank { get; construct; }
 	}
 	[Compact]
 	[CCode (cheader_filename = "ibus.h")]
 	public class Error {
-		[CCode (has_construct_function = false)]
-		public Error ();
-		[CCode (has_construct_function = false)]
-		public Error.from_message (IBus.DBusMessage message);
-		[CCode (has_construct_function = false)]
-		public Error.from_printf (string name, string format_message);
-		[CCode (has_construct_function = false)]
-		public Error.from_text (string name, string message);
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class Factory : IBus.Service {
 		[CCode (has_construct_function = false)]
-		public Factory (IBus.Connection connection);
+		public Factory (GLib.DBusConnection connection);
 		public void add_engine (string engine_name, GLib.Type engine_type);
-		[NoAccessorMethod]
-		public IBus.Connection connection { owned get; construct; }
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class HotkeyProfile : IBus.Serializable {
@@ -251,20 +218,21 @@ namespace IBus {
 		public bool add_hotkey (uint keyval, uint modifiers, GLib.Quark event);
 		public bool add_hotkey_from_string (string str, GLib.Quark event);
 		public GLib.Quark filter_key_event (uint keyval, uint modifiers, uint prev_keyval, uint prev_modifiers);
+		public GLib.Quark lookup_hotkey (uint keyval, uint modifiers);
 		public bool remove_hotkey (uint keyval, uint modifiers);
 		public bool remove_hotkey_by_event (GLib.Quark event);
 		public virtual signal void trigger (uint event, void* user_data);
 	}
 	[CCode (cheader_filename = "ibus.h")]
-	public class InputContext : IBus.Proxy {
+	public class InputContext : IBus.Proxy, GLib.Initable, GLib.AsyncInitable {
 		[CCode (has_construct_function = false)]
-		public InputContext (string path, IBus.Connection connection);
+		public InputContext (string path, GLib.DBusConnection connection, GLib.Cancellable cancellable) throws GLib.Error;
 		public void disable ();
 		public void enable ();
 		public void focus_in ();
 		public void focus_out ();
 		public unowned IBus.EngineDesc get_engine ();
-		public static unowned IBus.InputContext get_input_context (string path, IBus.Connection connection);
+		public static unowned IBus.InputContext get_input_context (string path, GLib.DBusConnection connection);
 		public bool is_enabled ();
 		public bool process_key_event (uint32 keyval, uint32 keycode, uint32 state);
 		public void property_activate (string prop_name, int32 state);
@@ -338,63 +306,12 @@ namespace IBus {
 		public void set_round (bool round);
 	}
 	[Compact]
-	[CCode (ref_function = "ibus_message_ref", unref_function = "ibus_message_unref", cheader_filename = "ibus.h")]
+	[CCode (cheader_filename = "ibus.h")]
 	public class Message {
-		[CCode (has_construct_function = false)]
-		public Message (int message_type);
-		public bool append_args (...);
-		public bool append_args_valist (GLib.Type first_arg_type, void* va_args);
-		[CCode (has_construct_function = false)]
-		public Message.error (IBus.Message reply_to, string error_name, string error_message);
-		[CCode (has_construct_function = false)]
-		public Message.error_printf (IBus.Message reply_to, string error_name, string error_format);
-		public bool get_args (out unowned IBus.Error error, ...);
-		public bool get_args_valist (out unowned IBus.Error error, GLib.Type first_arg_type, void* va_args);
-		public unowned string get_destination ();
-		public unowned string get_error_message ();
-		public unowned string get_error_name ();
-		public unowned string get_interface ();
-		public unowned string get_member ();
-		public bool get_no_reply ();
-		public unowned string get_path ();
-		public uint32 get_reply_serial ();
-		public unowned string get_sender ();
-		public uint32 get_serial ();
-		public bool is_error (string error_name);
-		public bool is_method_call (string @interface, string method);
-		public bool is_signal (string @interface, string signal_name);
-		[CCode (has_construct_function = false)]
-		public Message.method_call (string destination, string path, string @interface, string method);
-		[CCode (has_construct_function = false)]
-		public Message.method_return (IBus.Message reply_to);
-		public bool set_destination (string destination);
-		public bool set_error_name (string error_name);
-		public bool set_interface (string @interface);
-		public bool set_member (string member);
-		public void set_no_reply (bool no_reply);
-		public bool set_path (string path);
-		public bool set_reply_serial (uint32 reply_serial);
-		public bool set_sender (string sender);
-		[CCode (has_construct_function = false)]
-		public Message.@signal (string path, string @interface, string method);
-		public unowned string to_string ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "ibus.h")]
 	public class MessageIter {
-		public bool append (GLib.Type type, void* value);
-		public bool close_container (IBus.MessageIter sub);
-		public bool copy_data (IBus.MessageIter src);
-		public bool @get (GLib.Type type, void* value);
-		public GLib.Type get_arg_type ();
-		public void get_basic (void* value);
-		public GLib.Type get_element_type ();
-		public bool has_next ();
-		public static bool init (IBus.Message message, IBus.MessageIter iter);
-		public static void init_append (IBus.Message message, IBus.MessageIter iter);
-		public bool next ();
-		public bool open_container (GLib.Type type, string contained_signature, IBus.MessageIter sub);
-		public bool recurse (GLib.Type type, IBus.MessageIter sub);
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class Object : GLib.InitiallyUnowned {
@@ -421,79 +338,67 @@ namespace IBus {
 	[CCode (cheader_filename = "ibus.h")]
 	public class PanelService : IBus.Service {
 		[CCode (has_construct_function = false)]
-		public PanelService (IBus.Connection connection);
+		public PanelService (GLib.DBusConnection connection);
 		public void candidate_clicked (uint index, uint button, uint state);
 		public void cursor_down ();
 		[NoWrapper]
-		public virtual bool cursor_down_lookup_table (out unowned IBus.Error error);
+		public virtual void cursor_down_lookup_table ();
 		public void cursor_up ();
 		[NoWrapper]
-		public virtual bool cursor_up_lookup_table (out unowned IBus.Error error);
+		public virtual void cursor_up_lookup_table ();
 		[NoWrapper]
-		public virtual bool destroy (out unowned IBus.Error error);
+		public virtual void destroy ();
 		[NoWrapper]
-		public virtual bool focus_in (string input_context_path, out unowned IBus.Error error);
+		public virtual void focus_in (string input_context_path);
 		[NoWrapper]
-		public virtual bool focus_out (string input_context_path, out unowned IBus.Error error);
+		public virtual void focus_out (string input_context_path);
 		[NoWrapper]
-		public virtual bool hide_auxiliary_text (out unowned IBus.Error error);
+		public virtual void hide_auxiliary_text ();
 		[NoWrapper]
-		public virtual bool hide_language_bar (out unowned IBus.Error error);
+		public virtual void hide_language_bar ();
 		[NoWrapper]
-		public virtual bool hide_lookup_table (out unowned IBus.Error error);
+		public virtual void hide_lookup_table ();
 		[NoWrapper]
-		public virtual bool hide_preedit_text (out unowned IBus.Error error);
+		public virtual void hide_preedit_text ();
 		public void page_down ();
 		[NoWrapper]
-		public virtual bool page_down_lookup_table (out unowned IBus.Error error);
+		public virtual void page_down_lookup_table ();
 		public void page_up ();
 		[NoWrapper]
-		public virtual bool page_up_lookup_table (out unowned IBus.Error error);
-		public void property_active (string prop_name, int prop_state);
+		public virtual void page_up_lookup_table ();
+		public void property_active (string prop_name, uint prop_state);
 		public void property_hide (string prop_name);
 		public void property_show (string prop_name);
 		[NoWrapper]
-		public virtual bool register_properties (IBus.PropList prop_list, out unowned IBus.Error error);
+		public virtual void register_properties (IBus.PropList prop_list);
 		[NoWrapper]
-		public virtual bool reset (out unowned IBus.Error error);
+		public virtual void reset ();
 		[NoWrapper]
-		public virtual bool set_cursor_location (int x, int y, int w, int h, out unowned IBus.Error error);
+		public virtual void set_cursor_location (int x, int y, int w, int h);
 		[NoWrapper]
-		public virtual bool show_auxiliary_text (out unowned IBus.Error error);
+		public virtual void show_auxiliary_text ();
 		[NoWrapper]
-		public virtual bool show_language_bar (out unowned IBus.Error error);
+		public virtual void show_language_bar ();
 		[NoWrapper]
-		public virtual bool show_lookup_table (out unowned IBus.Error error);
+		public virtual void show_lookup_table ();
 		[NoWrapper]
-		public virtual bool show_preedit_text (out unowned IBus.Error error);
+		public virtual void show_preedit_text ();
 		[NoWrapper]
-		public virtual bool start_setup (out unowned IBus.Error error);
+		public virtual void start_setup ();
 		[NoWrapper]
-		public virtual bool state_changed (out unowned IBus.Error error);
+		public virtual void state_changed ();
 		[NoWrapper]
-		public virtual bool update_auxiliary_text (IBus.Text text, bool visible, out unowned IBus.Error error);
+		public virtual void update_auxiliary_text (IBus.Text text, bool visible);
 		[NoWrapper]
-		public virtual bool update_lookup_table (IBus.LookupTable lookup_table, bool visible, out unowned IBus.Error error);
+		public virtual void update_lookup_table (IBus.LookupTable lookup_table, bool visible);
 		[NoWrapper]
-		public virtual bool update_preedit_text (IBus.Text text, uint cursor_pos, bool visible, out unowned IBus.Error error);
+		public virtual void update_preedit_text (IBus.Text text, uint cursor_pos, bool visible);
 		[NoWrapper]
-		public virtual bool update_property (IBus.Property prop, out unowned IBus.Error error);
-		[NoAccessorMethod]
-		public IBus.Connection connection { owned get; construct; }
+		public virtual void update_property (IBus.Property prop);
 	}
 	[Compact]
-	[CCode (ref_function = "ibus_pending_call_ref", unref_function = "ibus_pending_call_unref", cheader_filename = "ibus.h")]
+	[CCode (cheader_filename = "ibus.h")]
 	public class PendingCall {
-		public static bool allocate_data_slot (int slot_p);
-		public void block ();
-		public void cancel ();
-		public static void free_data_slot (int slot_p);
-		public bool get_completed ();
-		public void* get_data (int slot);
-		public bool set_data (int slot, void* data, GLib.DestroyNotify free_data_func);
-		public bool set_notify (IBus.PendingCallNotifyFunction function, GLib.DestroyNotify free_user_data);
-		public unowned IBus.Message steal_reply ();
-		public void wait ();
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class PropList : IBus.Serializable {
@@ -527,26 +432,12 @@ namespace IBus {
 		public bool update (IBus.Property prop_update);
 	}
 	[CCode (cheader_filename = "ibus.h")]
-	public class Proxy : IBus.Object {
+	public class Proxy : GLib.DBusProxy, GLib.Initable, GLib.AsyncInitable {
+		public uint32 flags;
 		[CCode (has_construct_function = false)]
-		public Proxy (string name, string path, IBus.Connection connection);
-		public bool call (string method, ...);
-		public bool call_with_reply (string method, out unowned IBus.PendingCall pending, int timeout_milliseconds, out unowned IBus.Error error, ...);
-		public unowned IBus.Message call_with_reply_and_block (string method, int timeout_milliseconds, out unowned IBus.Error error, ...);
-		public unowned IBus.Connection get_connection ();
-		public unowned string get_interface ();
-		public unowned string get_name ();
-		public unowned string get_path ();
-		public unowned string get_unique_name ();
-		public bool handle_signal (IBus.Message message);
-		public bool send (IBus.Message message);
-		public bool send_with_reply (IBus.Message message, out unowned IBus.PendingCall pending, int timeout_milliseconds);
-		public unowned IBus.Message send_with_reply_and_block (IBus.Message message);
-		public IBus.Connection connection { get; construct; }
-		public string @interface { get; construct; }
-		public string name { get; construct; }
-		public string path { get; construct; }
-		public virtual signal bool ibus_signal (void* message);
+		protected Proxy ();
+		[HasEmitter]
+		public virtual signal void destroy ();
 	}
 	[Compact]
 	[CCode (cheader_filename = "ibus.h")]
@@ -558,50 +449,42 @@ namespace IBus {
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class Serializable : IBus.Object {
-		public uint32 flags;
 		[CCode (has_construct_function = false)]
 		public Serializable ();
 		public virtual bool copy ();
-		public virtual bool deserialize (IBus.MessageIter iter);
+		public virtual int deserialize (GLib.Variant variant);
 		public GLib.Value get_qattachment (GLib.Quark key);
 		public void remove_qattachment (GLib.Quark key);
-		public virtual bool serialize (IBus.MessageIter iter);
+		public virtual bool serialize ();
 		public bool set_qattachment (GLib.Quark key, GLib.Value value);
 	}
 	[CCode (cheader_filename = "ibus.h")]
-	public class Server : IBus.Object {
-		[CCode (has_construct_function = false)]
-		public Server ();
-		public void disconnect ();
-		public unowned string get_address ();
-		public unowned string get_id ();
-		public bool is_connected ();
-		public bool listen (string address);
-		public bool set_auth_mechanisms (string mechanisms);
-		[NoAccessorMethod]
-		public GLib.Type connection_type { get; set; }
-		public virtual signal void new_connection (GLib.Object connectin);
-	}
-	[CCode (cheader_filename = "ibus.h")]
 	public class Service : IBus.Object {
 		[CCode (has_construct_function = false)]
-		public Service (string path);
-		public bool add_to_connection (IBus.Connection connection);
-		public GLib.List<weak IBus.Connection> get_connections ();
-		public unowned string get_path ();
-		public bool handle_message (IBus.Connection connection, IBus.Message message);
-		public bool remove_from_all_connections ();
-		public bool remove_from_connection (IBus.Connection connection);
-		public bool send_signal (string @interface, string name, ...);
-		public string path { get; construct; }
-		public virtual signal bool ibus_message (void* connection, void* message);
-		public virtual signal bool ibus_signal (void* connection, void* message);
+		public Service (GLib.DBusConnection connection, string path);
+		[CCode (cname = "ibus_service_class_add_interfaces")]
+		public class bool add_interfaces (string xml_data);
+		public bool emit_signal (string dest_bus_name, string interface_name, string signal_name, GLib.Variant parameters) throws GLib.Error;
+		public unowned GLib.DBusConnection get_connection ();
+		public unowned string get_object_path ();
+		public bool register (GLib.DBusConnection connection) throws GLib.Error;
+		[NoWrapper]
+		public virtual unowned GLib.Variant service_get_property (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name) throws GLib.Error;
+		[NoWrapper]
+		public virtual void service_method_call (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string method_name, GLib.Variant parameters, GLib.DBusMethodInvocation invocation);
+		[NoWrapper]
+		public virtual bool service_set_property (GLib.DBusConnection connection, string sender, string object_path, string interface_name, string property_name, GLib.Variant value) throws GLib.Error;
+		public void unregister (GLib.DBusConnection connection);
+		public GLib.DBusConnection connection { get; construct; }
+		public string object_path { get; construct; }
 	}
 	[CCode (cheader_filename = "ibus.h")]
 	public class Text : IBus.Serializable {
 		public weak IBus.AttrList attrs;
 		public bool is_static;
 		public weak string text;
+		[CCode (has_construct_function = false)]
+		protected Text ();
 		public void append_attribute (uint type, uint value, uint start_index, int end_index);
 		[CCode (has_construct_function = false)]
 		public Text.from_printf (string fmt);
@@ -702,36 +585,16 @@ namespace IBus {
 		MENU,
 		SEPARATOR
 	}
-	[CCode (cheader_filename = "ibus.h")]
-	public delegate void ConnectionReplyFunc (IBus.Connection connection, IBus.Message reply);
-	[CCode (cheader_filename = "ibus.h")]
-	public delegate void DBusConnectionSetupFunc (IBus.DBusConnection connection);
-	[CCode (cheader_filename = "ibus.h")]
-	public delegate void DBusServerSetupFunc (IBus.DBusServer server);
 	[CCode (cheader_filename = "ibus.h", has_target = false)]
 	public delegate void FreeFunc (void* object);
 	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool IBusMessageFunc (IBus.Connection connection, IBus.Message message);
-	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool IBusSignalFunc (IBus.Connection connection, IBus.Message message);
-	[CCode (cheader_filename = "ibus.h")]
-	public delegate bool MessageFunc (IBus.Connection connection, IBus.Message message);
-	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate void NewConnectionFunc (IBus.Server server, IBus.Connection connection);
-	[CCode (cheader_filename = "ibus.h", has_target = false)]
 	public delegate void ObjectDestroyFunc (IBus.Object p1);
-	[CCode (cheader_filename = "ibus.h")]
-	public delegate void PendingCallNotifyFunction (IBus.PendingCall pending);
 	[CCode (cheader_filename = "ibus.h", has_target = false)]
 	public delegate bool SerializableCopyFunc (IBus.Serializable dest, IBus.Serializable src);
 	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool SerializableDeserializeFunc (IBus.Serializable object, IBus.MessageIter iter);
+	public delegate int SerializableDeserializeFunc (IBus.Serializable object, GLib.Variant variant);
 	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool SerializableSerializeFunc (IBus.Serializable object, IBus.MessageIter iter);
-	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool ServiceIBusMessageFunc (IBus.Service service, IBus.Connection connection, IBus.Message message);
-	[CCode (cheader_filename = "ibus.h", has_target = false)]
-	public delegate bool ServiceIBusSignalFunc (IBus.Service service, IBus.Connection connection, IBus.Message message);
+	public delegate bool SerializableSerializeFunc (IBus.Serializable object, GLib.VariantBuilder builder);
 	[CCode (cheader_filename = "ibus.h")]
 	public const int @0;
 	[CCode (cheader_filename = "ibus.h")]
@@ -4757,10 +4620,6 @@ namespace IBus {
 	[CCode (cheader_filename = "ibus.h")]
 	public static unowned IBus.Attribute attr_underline_new (uint underline_type, uint start_index, uint end_index);
 	[CCode (cheader_filename = "ibus.h")]
-	public static void dbus_connection_setup (IBus.DBusConnection connection);
-	[CCode (cheader_filename = "ibus.h")]
-	public static void dbus_server_setup (IBus.DBusServer server);
-	[CCode (cheader_filename = "ibus.h")]
 	public static void free_strv (string strv);
 	[CCode (cheader_filename = "ibus.h")]
 	public static unowned string get_address ();
@@ -4785,21 +4644,11 @@ namespace IBus {
 	[CCode (cheader_filename = "ibus.h")]
 	public static void main ();
 	[CCode (cheader_filename = "ibus.h")]
-	public static void mainloop_setup (IBus.DBusConnectionSetupFunc connection_func, IBus.DBusServerSetupFunc server_func);
-	[CCode (cheader_filename = "ibus.h")]
 	public static void quit ();
 	[CCode (cheader_filename = "ibus.h")]
 	public static void set_display (string display);
 	[CCode (cheader_filename = "ibus.h")]
-	public static GLib.Type type_get_array ();
-	[CCode (cheader_filename = "ibus.h")]
-	public static GLib.Type type_get_dict_entry ();
-	[CCode (cheader_filename = "ibus.h")]
-	public static GLib.Type type_get_object_path ();
-	[CCode (cheader_filename = "ibus.h")]
-	public static GLib.Type type_get_struct ();
-	[CCode (cheader_filename = "ibus.h")]
-	public static GLib.Type type_get_variant ();
+	public static void set_log_handler (bool verbose);
 	[CCode (cheader_filename = "ibus.h")]
 	public static void write_address (string address);
 	[CCode (cheader_filename = "ibus.h")]
diff --git a/bindings/vala/ibus-1.0/ibus-1.0.defines b/bindings/vala/ibus-1.0/ibus-1.0.defines
new file mode 100644
index 0000000..226b860
--- /dev/null
+++ b/bindings/vala/ibus-1.0/ibus-1.0.defines
@@ -0,0 +1 @@
+-DIBUS_COMPILATION
diff --git a/bindings/vala/ibus-1.0/ibus-1.0.files b/bindings/vala/ibus-1.0/ibus-1.0.files
index 5e2d7aa..04d147f 100644
--- a/bindings/vala/ibus-1.0/ibus-1.0.files
+++ b/bindings/vala/ibus-1.0/ibus-1.0.files
@@ -1,2 +1,2 @@
-include/ibus-1.0/
-lib/libibus.so
+include/ibus-1.0
+lib/libibus-1.0.so
diff --git a/bindings/vala/ibus-1.0/ibus-1.0.gi b/bindings/vala/ibus-1.0/ibus-1.0.gi
index 17203f6..8728a9f 100644
--- a/bindings/vala/ibus-1.0/ibus-1.0.gi
+++ b/bindings/vala/ibus-1.0/ibus-1.0.gi
@@ -25,18 +25,6 @@
 				<parameter name="end_index" type="guint"/>
 			</parameters>
 		</function>
-		<function name="dbus_connection_setup" symbol="ibus_dbus_connection_setup">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="connection" type="DBusConnection*"/>
-			</parameters>
-		</function>
-		<function name="dbus_server_setup" symbol="ibus_dbus_server_setup">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="server" type="DBusServer*"/>
-			</parameters>
-		</function>
 		<function name="free_strv" symbol="ibus_free_strv">
 			<return-type type="void"/>
 			<parameters>
@@ -91,14 +79,6 @@
 		<function name="main" symbol="ibus_main">
 			<return-type type="void"/>
 		</function>
-		<function name="mainloop_setup" symbol="ibus_mainloop_setup">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="connection_func" type="DBusConnectionSetupFunc"/>
-				<parameter name="server_func" type="DBusServerSetupFunc"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</function>
 		<function name="quit" symbol="ibus_quit">
 			<return-type type="void"/>
 		</function>
@@ -108,20 +88,11 @@
 				<parameter name="display" type="gchar*"/>
 			</parameters>
 		</function>
-		<function name="type_get_array" symbol="ibus_type_get_array">
-			<return-type type="GType"/>
-		</function>
-		<function name="type_get_dict_entry" symbol="ibus_type_get_dict_entry">
-			<return-type type="GType"/>
-		</function>
-		<function name="type_get_object_path" symbol="ibus_type_get_object_path">
-			<return-type type="GType"/>
-		</function>
-		<function name="type_get_struct" symbol="ibus_type_get_struct">
-			<return-type type="GType"/>
-		</function>
-		<function name="type_get_variant" symbol="ibus_type_get_variant">
-			<return-type type="GType"/>
+		<function name="set_log_handler" symbol="ibus_set_log_handler">
+			<return-type type="void"/>
+			<parameters>
+				<parameter name="verbose" type="gboolean"/>
+			</parameters>
 		</function>
 		<function name="write_address" symbol="ibus_write_address">
 			<return-type type="void"/>
@@ -154,76 +125,18 @@
 				<parameter name="name" type="gchar*"/>
 			</parameters>
 		</function>
-		<callback name="DBusConnectionSetupFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="connection" type="DBusConnection*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="DBusServerSetupFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="server" type="DBusServer*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="IBusConnectionReplyFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="reply" type="IBusMessage*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="IBusFreeFunc">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="object" type="gpointer"/>
 			</parameters>
 		</callback>
-		<callback name="IBusIBusMessageFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="message" type="IBusMessage*"/>
-			</parameters>
-		</callback>
-		<callback name="IBusIBusSignalFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="message" type="IBusMessage*"/>
-			</parameters>
-		</callback>
-		<callback name="IBusMessageFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="message" type="IBusMessage*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
-		<callback name="IBusNewConnectionFunc">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="server" type="IBusServer*"/>
-				<parameter name="connection" type="IBusConnection*"/>
-			</parameters>
-		</callback>
 		<callback name="IBusObjectDestroyFunc">
 			<return-type type="void"/>
 			<parameters>
 				<parameter name="p1" type="IBusObject*"/>
 			</parameters>
 		</callback>
-		<callback name="IBusPendingCallNotifyFunction">
-			<return-type type="void"/>
-			<parameters>
-				<parameter name="pending" type="IBusPendingCall*"/>
-				<parameter name="user_data" type="gpointer"/>
-			</parameters>
-		</callback>
 		<callback name="IBusSerializableCopyFunc">
 			<return-type type="gboolean"/>
 			<parameters>
@@ -232,490 +145,32 @@
 			</parameters>
 		</callback>
 		<callback name="IBusSerializableDeserializeFunc">
-			<return-type type="gboolean"/>
+			<return-type type="gint"/>
 			<parameters>
 				<parameter name="object" type="IBusSerializable*"/>
-				<parameter name="iter" type="IBusMessageIter*"/>
+				<parameter name="variant" type="GVariant*"/>
 			</parameters>
 		</callback>
 		<callback name="IBusSerializableSerializeFunc">
 			<return-type type="gboolean"/>
 			<parameters>
 				<parameter name="object" type="IBusSerializable*"/>
-				<parameter name="iter" type="IBusMessageIter*"/>
-			</parameters>
-		</callback>
-		<callback name="ServiceIBusMessageFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="service" type="IBusService*"/>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="message" type="IBusMessage*"/>
-			</parameters>
-		</callback>
-		<callback name="ServiceIBusSignalFunc">
-			<return-type type="gboolean"/>
-			<parameters>
-				<parameter name="service" type="IBusService*"/>
-				<parameter name="connection" type="IBusConnection*"/>
-				<parameter name="message" type="IBusMessage*"/>
+				<parameter name="builder" type="GVariantBuilder*"/>
 			</parameters>
 		</callback>
 		<struct name="BusComponent">
 		</struct>
 		<struct name="DBusConnection">
 		</struct>
-		<struct name="DBusError">
-		</struct>
-		<struct name="DBusMessage">
-		</struct>
-		<struct name="DBusMessageIter">
-		</struct>
-		<struct name="DBusPendingCall">
-		</struct>
 		<struct name="DBusServer">
 		</struct>
 		<struct name="IBusError">
-			<method name="free" symbol="ibus_error_free">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="error" type="IBusError*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="ibus_error_new">
-				<return-type type="IBusError*"/>
-			</method>
-			<method name="new_from_message" symbol="ibus_error_new_from_message">
-				<return-type type="IBusError*"/>
-				<parameters>
-					<parameter name="message" type="DBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="new_from_printf" symbol="ibus_error_new_from_printf">
-				<return-type type="IBusError*"/>
-				<parameters>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="format_message" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new_from_text" symbol="ibus_error_new_from_text">
-				<return-type type="IBusError*"/>
-				<parameters>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="message" type="gchar*"/>
-				</parameters>
-			</method>
 		</struct>
 		<struct name="IBusMessage">
-			<method name="append_args" symbol="ibus_message_append_args">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="append_args_valist" symbol="ibus_message_append_args_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="first_arg_type" type="GType"/>
-					<parameter name="va_args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="get_args" symbol="ibus_message_get_args">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="get_args_valist" symbol="ibus_message_get_args_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-					<parameter name="va_args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="get_destination" symbol="ibus_message_get_destination">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_error_message" symbol="ibus_message_get_error_message">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_error_name" symbol="ibus_message_get_error_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_interface" symbol="ibus_message_get_interface">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_member" symbol="ibus_message_get_member">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_no_reply" symbol="ibus_message_get_no_reply">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_path" symbol="ibus_message_get_path">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_reply_serial" symbol="ibus_message_get_reply_serial">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_sender" symbol="ibus_message_get_sender">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="get_serial" symbol="ibus_message_get_serial">
-				<return-type type="guint32"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="is_error" symbol="ibus_message_is_error">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="error_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="is_method_call" symbol="ibus_message_is_method_call">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="method" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="is_signal" symbol="ibus_message_is_signal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="signal_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new" symbol="ibus_message_new">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="message_type" type="gint"/>
-				</parameters>
-			</method>
-			<method name="new_error" symbol="ibus_message_new_error">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="reply_to" type="IBusMessage*"/>
-					<parameter name="error_name" type="gchar*"/>
-					<parameter name="error_message" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new_error_printf" symbol="ibus_message_new_error_printf">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="reply_to" type="IBusMessage*"/>
-					<parameter name="error_name" type="gchar*"/>
-					<parameter name="error_format" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new_method_call" symbol="ibus_message_new_method_call">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="destination" type="gchar*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="method" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="new_method_return" symbol="ibus_message_new_method_return">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="reply_to" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="new_signal" symbol="ibus_message_new_signal">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="method" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="ref" symbol="ibus_message_ref">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="set_destination" symbol="ibus_message_set_destination">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="destination" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_error_name" symbol="ibus_message_set_error_name">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="error_name" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_interface" symbol="ibus_message_set_interface">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="interface" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_member" symbol="ibus_message_set_member">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="member" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_no_reply" symbol="ibus_message_set_no_reply">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="no_reply" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="set_path" symbol="ibus_message_set_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="path" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="set_reply_serial" symbol="ibus_message_set_reply_serial">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="reply_serial" type="guint32"/>
-				</parameters>
-			</method>
-			<method name="set_sender" symbol="ibus_message_set_sender">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="sender" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="to_string" symbol="ibus_message_to_string">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="unref" symbol="ibus_message_unref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
 		</struct>
 		<struct name="IBusMessageIter">
-			<method name="append" symbol="ibus_message_iter_append">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="type" type="GType"/>
-					<parameter name="value" type="gconstpointer"/>
-				</parameters>
-			</method>
-			<method name="close_container" symbol="ibus_message_iter_close_container">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="sub" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="copy_data" symbol="ibus_message_iter_copy_data">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="dst" type="IBusMessageIter*"/>
-					<parameter name="src" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="get" symbol="ibus_message_iter_get">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="type" type="GType"/>
-					<parameter name="value" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="get_arg_type" symbol="ibus_message_iter_get_arg_type">
-				<return-type type="GType"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="get_basic" symbol="ibus_message_iter_get_basic">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="value" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="get_element_type" symbol="ibus_message_iter_get_element_type">
-				<return-type type="GType"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="has_next" symbol="ibus_message_iter_has_next">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="init" symbol="ibus_message_iter_init">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="init_append" symbol="ibus_message_iter_init_append">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="next" symbol="ibus_message_iter_next">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="open_container" symbol="ibus_message_iter_open_container">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="type" type="GType"/>
-					<parameter name="contained_signature" type="gchar*"/>
-					<parameter name="sub" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
-			<method name="recurse" symbol="ibus_message_iter_recurse">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
-					<parameter name="type" type="GType"/>
-					<parameter name="sub" type="IBusMessageIter*"/>
-				</parameters>
-			</method>
 		</struct>
 		<struct name="IBusPendingCall">
-			<method name="allocate_data_slot" symbol="ibus_pending_call_allocate_data_slot">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="slot_p" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="block" symbol="ibus_pending_call_block">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="cancel" symbol="ibus_pending_call_cancel">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="free_data_slot" symbol="ibus_pending_call_free_data_slot">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="slot_p" type="gint*"/>
-				</parameters>
-			</method>
-			<method name="get_completed" symbol="ibus_pending_call_get_completed">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="get_data" symbol="ibus_pending_call_get_data">
-				<return-type type="gpointer"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-					<parameter name="slot" type="gint"/>
-				</parameters>
-			</method>
-			<method name="ref" symbol="ibus_pending_call_ref">
-				<return-type type="IBusPendingCall*"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="set_data" symbol="ibus_pending_call_set_data">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-					<parameter name="slot" type="gint"/>
-					<parameter name="data" type="gpointer"/>
-					<parameter name="free_data_func" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="set_notify" symbol="ibus_pending_call_set_notify">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-					<parameter name="function" type="IBusPendingCallNotifyFunction"/>
-					<parameter name="user_data" type="gpointer"/>
-					<parameter name="free_user_data" type="GDestroyNotify"/>
-				</parameters>
-			</method>
-			<method name="steal_reply" symbol="ibus_pending_call_steal_reply">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="unref" symbol="ibus_pending_call_unref">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
-			<method name="wait" symbol="ibus_pending_call_wait">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="pending" type="IBusPendingCall*"/>
-				</parameters>
-			</method>
 		</struct>
 		<struct name="IBusRectangle">
 			<field name="x" type="gint"/>
@@ -856,7 +311,7 @@
 				</parameters>
 			</method>
 			<method name="exit" symbol="ibus_bus_exit">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="bus" type="IBusBus*"/>
 					<parameter name="restart" type="gboolean"/>
@@ -869,7 +324,7 @@
 				</parameters>
 			</method>
 			<method name="get_connection" symbol="ibus_bus_get_connection">
-				<return-type type="IBusConnection*"/>
+				<return-type type="GDBusConnection*"/>
 				<parameters>
 					<parameter name="bus" type="IBusBus*"/>
 				</parameters>
@@ -1022,18 +477,66 @@
 					<parameter name="component" type="IBusComponent*"/>
 				</parameters>
 			</method>
+			<method name="get_author" symbol="ibus_component_get_author">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
+			<method name="get_description" symbol="ibus_component_get_description">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
 			<method name="get_engines" symbol="ibus_component_get_engines">
 				<return-type type="GList*"/>
 				<parameters>
 					<parameter name="component" type="IBusComponent*"/>
 				</parameters>
 			</method>
+			<method name="get_exec" symbol="ibus_component_get_exec">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
 			<method name="get_from_engine" symbol="ibus_component_get_from_engine">
 				<return-type type="IBusComponent*"/>
 				<parameters>
 					<parameter name="engine" type="IBusEngineDesc*"/>
 				</parameters>
 			</method>
+			<method name="get_homepage" symbol="ibus_component_get_homepage">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
+			<method name="get_license" symbol="ibus_component_get_license">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="ibus_component_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
+			<method name="get_textdomain" symbol="ibus_component_get_textdomain">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
+			<method name="get_version" symbol="ibus_component_get_version">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+				</parameters>
+			</method>
 			<method name="is_running" symbol="ibus_component_is_running">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1053,6 +556,12 @@
 					<parameter name="textdomain" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new2" symbol="ibus_component_new2">
+				<return-type type="IBusComponent*"/>
+				<parameters>
+					<parameter name="first_property_name" type="gchar*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_from_file" symbol="ibus_component_new_from_file">
 				<return-type type="IBusComponent*"/>
 				<parameters>
@@ -1081,6 +590,13 @@
 					<parameter name="indent" type="gint"/>
 				</parameters>
 			</method>
+			<method name="set_restart" symbol="ibus_component_set_restart">
+				<return-type type="void"/>
+				<parameters>
+					<parameter name="component" type="IBusComponent*"/>
+					<parameter name="restart" type="gboolean"/>
+				</parameters>
+			</method>
 			<method name="start" symbol="ibus_component_start">
 				<return-type type="gboolean"/>
 				<parameters>
@@ -1094,14 +610,14 @@
 					<parameter name="component" type="IBusComponent*"/>
 				</parameters>
 			</method>
-			<field name="name" type="gchar*"/>
-			<field name="description" type="gchar*"/>
-			<field name="version" type="gchar*"/>
-			<field name="license" type="gchar*"/>
-			<field name="author" type="gchar*"/>
-			<field name="homepage" type="gchar*"/>
-			<field name="exec" type="gchar*"/>
-			<field name="textdomain" type="gchar*"/>
+			<property name="author" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="description" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="exec" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="homepage" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="textdomain" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="version" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<field name="engines" type="GList*"/>
 			<field name="observed_paths" type="GList*"/>
 			<field name="pid" type="GPid"/>
@@ -1109,19 +625,24 @@
 			<field name="pdummy" type="gpointer[]"/>
 		</object>
 		<object name="IBusConfig" parent="IBusProxy" type-name="IBusConfig" get-type="ibus_config_get_type">
+			<implements>
+				<interface name="GInitable"/>
+				<interface name="GAsyncInitable"/>
+			</implements>
 			<method name="get_value" symbol="ibus_config_get_value">
-				<return-type type="gboolean"/>
+				<return-type type="GVariant*"/>
 				<parameters>
 					<parameter name="config" type="IBusConfig*"/>
 					<parameter name="section" type="gchar*"/>
 					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="GValue*"/>
 				</parameters>
 			</method>
 			<constructor name="new" symbol="ibus_config_new">
 				<return-type type="IBusConfig*"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</constructor>
 			<method name="set_value" symbol="ibus_config_set_value">
@@ -1130,7 +651,7 @@
 					<parameter name="config" type="IBusConfig*"/>
 					<parameter name="section" type="gchar*"/>
 					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="GValue*"/>
+					<parameter name="value" type="GVariant*"/>
 				</parameters>
 			</method>
 			<method name="unset" symbol="ibus_config_unset">
@@ -1147,7 +668,7 @@
 					<parameter name="object" type="IBusConfig*"/>
 					<parameter name="p0" type="char*"/>
 					<parameter name="p1" type="char*"/>
-					<parameter name="p2" type="GValue*"/>
+					<parameter name="p2" type="GVariant"/>
 				</parameters>
 			</signal>
 		</object>
@@ -1155,7 +676,7 @@
 			<constructor name="new" symbol="ibus_config_service_new">
 				<return-type type="IBusConfigService*"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</constructor>
 			<method name="value_changed" symbol="ibus_config_service_value_changed">
@@ -1164,239 +685,37 @@
 					<parameter name="config" type="IBusConfigService*"/>
 					<parameter name="section" type="gchar*"/>
 					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="GValue*"/>
+					<parameter name="value" type="GVariant*"/>
 				</parameters>
 			</method>
-			<property name="connection" type="IBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<vfunc name="get_value">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="config" type="IBusConfigService*"/>
-					<parameter name="section" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="GValue*"/>
-					<parameter name="error" type="IBusError**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="set_value">
-				<return-type type="gboolean"/>
+				<return-type type="GVariant*"/>
 				<parameters>
 					<parameter name="config" type="IBusConfigService*"/>
 					<parameter name="section" type="gchar*"/>
 					<parameter name="name" type="gchar*"/>
-					<parameter name="value" type="GValue*"/>
-					<parameter name="error" type="IBusError**"/>
-				</parameters>
-			</vfunc>
-			<vfunc name="unset">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="config" type="IBusConfigService*"/>
-					<parameter name="section" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="error" type="IBusError**"/>
-				</parameters>
-			</vfunc>
-		</object>
-		<object name="IBusConnection" parent="IBusObject" type-name="IBusConnection" get-type="ibus_connection_get_type">
-			<method name="call" symbol="ibus_connection_call">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="member" type="gchar*"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="call_with_reply" symbol="ibus_connection_call_with_reply">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="member" type="gchar*"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="close" symbol="ibus_connection_close">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<method name="flush" symbol="ibus_connection_flush">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<method name="get_connection" symbol="ibus_connection_get_connection">
-				<return-type type="DBusConnection*"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<method name="get_unix_user" symbol="ibus_connection_get_unix_user">
-				<return-type type="glong"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<method name="is_authenticated" symbol="ibus_connection_is_authenticated">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<method name="is_connected" symbol="ibus_connection_is_connected">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="ibus_connection_new">
-				<return-type type="IBusConnection*"/>
-			</constructor>
-			<method name="open" symbol="ibus_connection_open">
-				<return-type type="IBusConnection*"/>
-				<parameters>
-					<parameter name="address" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="open_private" symbol="ibus_connection_open_private">
-				<return-type type="IBusConnection*"/>
-				<parameters>
-					<parameter name="address" type="gchar*"/>
-				</parameters>
-			</method>
-			<method name="read_write_dispatch" symbol="ibus_connection_read_write_dispatch">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="timeout" type="gint"/>
-				</parameters>
-			</method>
-			<method name="register_object_path" symbol="ibus_connection_register_object_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="message_func" type="IBusMessageFunc"/>
-					<parameter name="user_data" type="gpointer"/>
-				</parameters>
-			</method>
-			<method name="send" symbol="ibus_connection_send">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="send_signal" symbol="ibus_connection_send_signal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="send_signal_valist" symbol="ibus_connection_send_signal_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="first_arg_type" type="GType"/>
-					<parameter name="args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="send_valist" symbol="ibus_connection_send_valist">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message_type" type="gint"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="first_arg_type" type="GType"/>
-					<parameter name="args" type="va_list"/>
-				</parameters>
-			</method>
-			<method name="send_with_reply" symbol="ibus_connection_send_with_reply">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="pending_return" type="IBusPendingCall**"/>
-					<parameter name="timeout_milliseconds" type="gint"/>
-				</parameters>
-			</method>
-			<method name="send_with_reply_and_block" symbol="ibus_connection_send_with_reply_and_block">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="timeout_milliseconds" type="gint"/>
-					<parameter name="error" type="IBusError**"/>
-				</parameters>
-			</method>
-			<method name="set_connection" symbol="ibus_connection_set_connection">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="dbus_connection" type="DBusConnection*"/>
-					<parameter name="shared" type="gboolean"/>
-				</parameters>
-			</method>
-			<method name="unregister_object_path" symbol="ibus_connection_unregister_object_path">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="path" type="gchar*"/>
-				</parameters>
-			</method>
-			<signal name="authenticate-unix-user" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="uid" type="gulong"/>
-				</parameters>
-			</signal>
-			<signal name="disconnected" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</signal>
-			<signal name="ibus-message" when="LAST">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="gpointer"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
-			</signal>
-			<signal name="ibus-message-sent" when="LAST">
-				<return-type type="void"/>
+			</vfunc>
+			<vfunc name="set_value">
+				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="gpointer"/>
+					<parameter name="config" type="IBusConfigService*"/>
+					<parameter name="section" type="gchar*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="value" type="GVariant*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
-			</signal>
-			<signal name="ibus-signal" when="LAST">
+			</vfunc>
+			<vfunc name="unset_value">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="gpointer"/>
+					<parameter name="config" type="IBusConfigService*"/>
+					<parameter name="section" type="gchar*"/>
+					<parameter name="name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
-			</signal>
+			</vfunc>
 		</object>
 		<object name="IBusEngine" parent="IBusService" type-name="IBusEngine" get-type="ibus_engine_get_type">
 			<method name="commit_text" symbol="ibus_engine_commit_text">
@@ -1450,9 +769,18 @@
 			<constructor name="new" symbol="ibus_engine_new">
 				<return-type type="IBusEngine*"/>
 				<parameters>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="engine_name" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+				</parameters>
+			</constructor>
+			<constructor name="new_type" symbol="ibus_engine_new_type">
+				<return-type type="IBusEngine*"/>
+				<parameters>
+					<parameter name="engine_type" type="GType"/>
+					<parameter name="engine_name" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</constructor>
 			<method name="register_properties" symbol="ibus_engine_register_properties">
@@ -1530,8 +858,7 @@
 					<parameter name="prop" type="IBusProperty*"/>
 				</parameters>
 			</method>
-			<property name="connection" type="IBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="engine-name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<signal name="candidate-clicked" when="LAST">
 				<return-type type="void"/>
 				<parameters>
@@ -1649,6 +976,66 @@
 			<field name="client_capabilities" type="guint"/>
 		</object>
 		<object name="IBusEngineDesc" parent="IBusSerializable" type-name="IBusEngineDesc" get-type="ibus_engine_desc_get_type">
+			<method name="get_author" symbol="ibus_engine_desc_get_author">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_description" symbol="ibus_engine_desc_get_description">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_hotkeys" symbol="ibus_engine_desc_get_hotkeys">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_icon" symbol="ibus_engine_desc_get_icon">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_language" symbol="ibus_engine_desc_get_language">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_layout" symbol="ibus_engine_desc_get_layout">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_license" symbol="ibus_engine_desc_get_license">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_longname" symbol="ibus_engine_desc_get_longname">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_name" symbol="ibus_engine_desc_get_name">
+				<return-type type="gchar*"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
+			<method name="get_rank" symbol="ibus_engine_desc_get_rank">
+				<return-type type="guint"/>
+				<parameters>
+					<parameter name="info" type="IBusEngineDesc*"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="ibus_engine_desc_new">
 				<return-type type="IBusEngineDesc*"/>
 				<parameters>
@@ -1662,6 +1049,12 @@
 					<parameter name="layout" type="gchar*"/>
 				</parameters>
 			</constructor>
+			<constructor name="new2" symbol="ibus_engine_desc_new2">
+				<return-type type="IBusEngineDesc*"/>
+				<parameters>
+					<parameter name="first_property_name" type="gchar*"/>
+				</parameters>
+			</constructor>
 			<constructor name="new_from_xml_node" symbol="ibus_engine_desc_new_from_xml_node">
 				<return-type type="IBusEngineDesc*"/>
 				<parameters>
@@ -1676,15 +1069,16 @@
 					<parameter name="indent" type="gint"/>
 				</parameters>
 			</method>
-			<field name="name" type="gchar*"/>
-			<field name="longname" type="gchar*"/>
-			<field name="description" type="gchar*"/>
-			<field name="language" type="gchar*"/>
-			<field name="license" type="gchar*"/>
-			<field name="author" type="gchar*"/>
-			<field name="icon" type="gchar*"/>
-			<field name="layout" type="gchar*"/>
-			<field name="rank" type="guint"/>
+			<property name="author" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="description" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="hotkeys" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="icon" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="language" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="layout" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="license" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="longname" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="rank" type="guint" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="IBusFactory" parent="IBusService" type-name="IBusFactory" get-type="ibus_factory_get_type">
 			<method name="add_engine" symbol="ibus_factory_add_engine">
@@ -1698,10 +1092,9 @@
 			<constructor name="new" symbol="ibus_factory_new">
 				<return-type type="IBusFactory*"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</constructor>
-			<property name="connection" type="IBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
 		</object>
 		<object name="IBusHotkeyProfile" parent="IBusSerializable" type-name="IBusHotkeyProfile" get-type="ibus_hotkey_profile_get_type">
 			<method name="add_hotkey" symbol="ibus_hotkey_profile_add_hotkey">
@@ -1732,6 +1125,14 @@
 					<parameter name="user_data" type="gpointer"/>
 				</parameters>
 			</method>
+			<method name="lookup_hotkey" symbol="ibus_hotkey_profile_lookup_hotkey">
+				<return-type type="GQuark"/>
+				<parameters>
+					<parameter name="profile" type="IBusHotkeyProfile*"/>
+					<parameter name="keyval" type="guint"/>
+					<parameter name="modifiers" type="guint"/>
+				</parameters>
+			</method>
 			<constructor name="new" symbol="ibus_hotkey_profile_new">
 				<return-type type="IBusHotkeyProfile*"/>
 			</constructor>
@@ -1760,6 +1161,10 @@
 			</signal>
 		</object>
 		<object name="IBusInputContext" parent="IBusProxy" type-name="IBusInputContext" get-type="ibus_input_context_get_type">
+			<implements>
+				<interface name="GInitable"/>
+				<interface name="GAsyncInitable"/>
+			</implements>
 			<method name="disable" symbol="ibus_input_context_disable">
 				<return-type type="void"/>
 				<parameters>
@@ -1794,7 +1199,7 @@
 				<return-type type="IBusInputContext*"/>
 				<parameters>
 					<parameter name="path" type="gchar*"/>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</method>
 			<method name="is_enabled" symbol="ibus_input_context_is_enabled">
@@ -1807,7 +1212,9 @@
 				<return-type type="IBusInputContext*"/>
 				<parameters>
 					<parameter name="path" type="gchar*"/>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="cancellable" type="GCancellable*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</constructor>
 			<method name="process_key_event" symbol="ibus_input_context_process_key_event">
@@ -2261,7 +1668,7 @@
 			<constructor name="new" symbol="ibus_panel_service_new">
 				<return-type type="IBusPanelService*"/>
 				<parameters>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</constructor>
 			<method name="page_down" symbol="ibus_panel_service_page_down">
@@ -2281,7 +1688,7 @@
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="prop_name" type="gchar*"/>
-					<parameter name="prop_state" type="int"/>
+					<parameter name="prop_state" type="guint"/>
 				</parameters>
 			</method>
 			<method name="property_hide" symbol="ibus_panel_service_property_hide">
@@ -2298,188 +1705,163 @@
 					<parameter name="prop_name" type="gchar*"/>
 				</parameters>
 			</method>
-			<property name="connection" type="IBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
 			<vfunc name="cursor_down_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="cursor_up_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="destroy">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="focus_in">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="input_context_path" type="gchar*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="focus_out">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="input_context_path" type="gchar*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="hide_auxiliary_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="hide_language_bar">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="hide_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="hide_preedit_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="page_down_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="page_up_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="register_properties">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="prop_list" type="IBusPropList*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="reset">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="set_cursor_location">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="x" type="gint"/>
 					<parameter name="y" type="gint"/>
 					<parameter name="w" type="gint"/>
 					<parameter name="h" type="gint"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="show_auxiliary_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="show_language_bar">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="show_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="show_preedit_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="start_setup">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="state_changed">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="update_auxiliary_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="text" type="IBusText*"/>
 					<parameter name="visible" type="gboolean"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="update_lookup_table">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="lookup_table" type="IBusLookupTable*"/>
 					<parameter name="visible" type="gboolean"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="update_preedit_text">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="text" type="IBusText*"/>
 					<parameter name="cursor_pos" type="guint"/>
 					<parameter name="visible" type="gboolean"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="update_property">
-				<return-type type="gboolean"/>
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="panel" type="IBusPanelService*"/>
 					<parameter name="prop" type="IBusProperty*"/>
-					<parameter name="error" type="IBusError**"/>
 				</parameters>
 			</vfunc>
 		</object>
@@ -2591,115 +1973,24 @@
 			<field name="state" type="guint"/>
 			<field name="sub_props" type="IBusPropList*"/>
 		</object>
-		<object name="IBusProxy" parent="IBusObject" type-name="IBusProxy" get-type="ibus_proxy_get_type">
-			<method name="call" symbol="ibus_proxy_call">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="method" type="gchar*"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="call_with_reply" symbol="ibus_proxy_call_with_reply">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="method" type="gchar*"/>
-					<parameter name="pending" type="IBusPendingCall**"/>
-					<parameter name="timeout_milliseconds" type="gint"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="call_with_reply_and_block" symbol="ibus_proxy_call_with_reply_and_block">
-				<return-type type="IBusMessage*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="method" type="gchar*"/>
-					<parameter name="timeout_milliseconds" type="gint"/>
-					<parameter name="error" type="IBusError**"/>
-					<parameter name="first_arg_type" type="GType"/>
-				</parameters>
-			</method>
-			<method name="get_connection" symbol="ibus_proxy_get_connection">
-				<return-type type="IBusConnection*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_interface" symbol="ibus_proxy_get_interface">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_name" symbol="ibus_proxy_get_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_path" symbol="ibus_proxy_get_path">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-				</parameters>
-			</method>
-			<method name="get_unique_name" symbol="ibus_proxy_get_unique_name">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-				</parameters>
-			</method>
-			<method name="handle_signal" symbol="ibus_proxy_handle_signal">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="ibus_proxy_new">
-				<return-type type="IBusProxy*"/>
-				<parameters>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="path" type="gchar*"/>
-					<parameter name="connection" type="IBusConnection*"/>
-				</parameters>
-			</constructor>
-			<method name="send" symbol="ibus_proxy_send">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
-			<method name="send_with_reply" symbol="ibus_proxy_send_with_reply">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="message" type="IBusMessage*"/>
-					<parameter name="pending" type="IBusPendingCall**"/>
-					<parameter name="timeout_milliseconds" type="gint"/>
-				</parameters>
-			</method>
-			<method name="send_with_reply_and_block" symbol="ibus_proxy_send_with_reply_and_block">
-				<return-type type="IBusMessage*"/>
+		<object name="IBusProxy" parent="GDBusProxy" type-name="IBusProxy" get-type="ibus_proxy_get_type">
+			<implements>
+				<interface name="GInitable"/>
+				<interface name="GAsyncInitable"/>
+			</implements>
+			<method name="destroy" symbol="ibus_proxy_destroy">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="message" type="IBusMessage*"/>
 				</parameters>
 			</method>
-			<property name="connection" type="IBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="interface" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<property name="path" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<signal name="ibus-signal" when="LAST">
-				<return-type type="gboolean"/>
+			<signal name="destroy" when="LAST">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="proxy" type="IBusProxy*"/>
-					<parameter name="message" type="gpointer"/>
 				</parameters>
 			</signal>
+			<field name="flags" type="guint32"/>
 		</object>
 		<object name="IBusSerializable" parent="IBusObject" type-name="IBusSerializable" get-type="ibus_serializable_get_type">
 			<method name="copy" symbol="ibus_serializable_copy">
@@ -2711,7 +2002,7 @@
 			<method name="deserialize" symbol="ibus_serializable_deserialize">
 				<return-type type="IBusSerializable*"/>
 				<parameters>
-					<parameter name="iter" type="IBusMessageIter*"/>
+					<parameter name="variant" type="GVariant*"/>
 				</parameters>
 			</method>
 			<method name="get_qattachment" symbol="ibus_serializable_get_qattachment">
@@ -2732,10 +2023,9 @@
 				</parameters>
 			</method>
 			<method name="serialize" symbol="ibus_serializable_serialize">
-				<return-type type="gboolean"/>
+				<return-type type="GVariant*"/>
 				<parameters>
 					<parameter name="object" type="IBusSerializable*"/>
-					<parameter name="iter" type="IBusMessageIter*"/>
 				</parameters>
 			</method>
 			<method name="set_qattachment" symbol="ibus_serializable_set_qattachment">
@@ -2754,145 +2044,113 @@
 				</parameters>
 			</vfunc>
 			<vfunc name="deserialize">
-				<return-type type="gboolean"/>
+				<return-type type="gint"/>
 				<parameters>
 					<parameter name="object" type="IBusSerializable*"/>
-					<parameter name="iter" type="IBusMessageIter*"/>
+					<parameter name="variant" type="GVariant*"/>
 				</parameters>
 			</vfunc>
 			<vfunc name="serialize">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="object" type="IBusSerializable*"/>
-					<parameter name="iter" type="IBusMessageIter*"/>
+					<parameter name="builder" type="GVariantBuilder*"/>
 				</parameters>
 			</vfunc>
-			<field name="flags" type="guint32"/>
 		</object>
-		<object name="IBusServer" parent="IBusObject" type-name="IBusServer" get-type="ibus_server_get_type">
-			<method name="disconnect" symbol="ibus_server_disconnect">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-				</parameters>
-			</method>
-			<method name="get_address" symbol="ibus_server_get_address">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-				</parameters>
-			</method>
-			<method name="get_id" symbol="ibus_server_get_id">
-				<return-type type="gchar*"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-				</parameters>
-			</method>
-			<method name="is_connected" symbol="ibus_server_is_connected">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-				</parameters>
-			</method>
-			<method name="listen" symbol="ibus_server_listen">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-					<parameter name="address" type="gchar*"/>
-				</parameters>
-			</method>
-			<constructor name="new" symbol="ibus_server_new">
-				<return-type type="IBusServer*"/>
-			</constructor>
-			<method name="set_auth_mechanisms" symbol="ibus_server_set_auth_mechanisms">
+		<object name="IBusService" parent="IBusObject" type-name="IBusService" get-type="ibus_service_get_type">
+			<method name="class_add_interfaces" symbol="ibus_service_class_add_interfaces">
 				<return-type type="gboolean"/>
 				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-					<parameter name="mechanisms" type="gchar**"/>
+					<parameter name="klass" type="IBusServiceClass*"/>
+					<parameter name="xml_data" type="gchar*"/>
 				</parameters>
 			</method>
-			<property name="connection-type" type="GType" readable="1" writable="1" construct="0" construct-only="0"/>
-			<signal name="new-connection" when="LAST">
-				<return-type type="void"/>
-				<parameters>
-					<parameter name="server" type="IBusServer*"/>
-					<parameter name="connectin" type="GObject*"/>
-				</parameters>
-			</signal>
-		</object>
-		<object name="IBusService" parent="IBusObject" type-name="IBusService" get-type="ibus_service_get_type">
-			<method name="add_to_connection" symbol="ibus_service_add_to_connection">
+			<method name="emit_signal" symbol="ibus_service_emit_signal">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="dest_bus_name" type="gchar*"/>
+					<parameter name="interface_name" type="gchar*"/>
+					<parameter name="signal_name" type="gchar*"/>
+					<parameter name="parameters" type="GVariant*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="get_connections" symbol="ibus_service_get_connections">
-				<return-type type="GList*"/>
+			<method name="get_connection" symbol="ibus_service_get_connection">
+				<return-type type="GDBusConnection*"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
 				</parameters>
 			</method>
-			<method name="get_path" symbol="ibus_service_get_path">
+			<method name="get_object_path" symbol="ibus_service_get_object_path">
 				<return-type type="gchar*"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
 				</parameters>
 			</method>
-			<method name="handle_message" symbol="ibus_service_handle_message">
-				<return-type type="gboolean"/>
-				<parameters>
-					<parameter name="service" type="IBusService*"/>
-					<parameter name="connection" type="IBusConnection*"/>
-					<parameter name="message" type="IBusMessage*"/>
-				</parameters>
-			</method>
 			<constructor name="new" symbol="ibus_service_new">
 				<return-type type="IBusService*"/>
 				<parameters>
+					<parameter name="connection" type="GDBusConnection*"/>
 					<parameter name="path" type="gchar*"/>
 				</parameters>
 			</constructor>
-			<method name="remove_from_all_connections" symbol="ibus_service_remove_from_all_connections">
+			<method name="register" symbol="ibus_service_register">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
 			</method>
-			<method name="remove_from_connection" symbol="ibus_service_remove_from_connection">
-				<return-type type="gboolean"/>
+			<method name="unregister" symbol="ibus_service_unregister">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
-					<parameter name="connection" type="IBusConnection*"/>
+					<parameter name="connection" type="GDBusConnection*"/>
 				</parameters>
 			</method>
-			<method name="send_signal" symbol="ibus_service_send_signal">
-				<return-type type="gboolean"/>
+			<property name="connection" type="GDBusConnection*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<property name="object-path" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
+			<vfunc name="service_get_property">
+				<return-type type="GVariant*"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
-					<parameter name="interface" type="gchar*"/>
-					<parameter name="name" type="gchar*"/>
-					<parameter name="first_arg_type" type="GType"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="sender" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+					<parameter name="interface_name" type="gchar*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
-			</method>
-			<property name="path" type="char*" readable="1" writable="1" construct="0" construct-only="1"/>
-			<signal name="ibus-message" when="LAST">
-				<return-type type="gboolean"/>
+			</vfunc>
+			<vfunc name="service_method_call">
+				<return-type type="void"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
-					<parameter name="connection" type="gpointer"/>
-					<parameter name="message" type="gpointer"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="sender" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+					<parameter name="interface_name" type="gchar*"/>
+					<parameter name="method_name" type="gchar*"/>
+					<parameter name="parameters" type="GVariant*"/>
+					<parameter name="invocation" type="GDBusMethodInvocation*"/>
 				</parameters>
-			</signal>
-			<signal name="ibus-signal" when="LAST">
+			</vfunc>
+			<vfunc name="service_set_property">
 				<return-type type="gboolean"/>
 				<parameters>
 					<parameter name="service" type="IBusService*"/>
-					<parameter name="connection" type="gpointer"/>
-					<parameter name="message" type="gpointer"/>
+					<parameter name="connection" type="GDBusConnection*"/>
+					<parameter name="sender" type="gchar*"/>
+					<parameter name="object_path" type="gchar*"/>
+					<parameter name="interface_name" type="gchar*"/>
+					<parameter name="property_name" type="gchar*"/>
+					<parameter name="value" type="GVariant*"/>
+					<parameter name="error" type="GError**"/>
 				</parameters>
-			</signal>
+			</vfunc>
 		</object>
 		<object name="IBusText" parent="IBusSerializable" type-name="IBusText" get-type="ibus_text_get_type">
 			<method name="append_attribute" symbol="ibus_text_append_attribute">
@@ -3762,7 +3020,7 @@
 		<constant name="IBUS_Lstroke" type="int" value="419"/>
 		<constant name="IBUS_M" type="int" value="77"/>
 		<constant name="IBUS_MAJOR_VERSION" type="int" value="1"/>
-		<constant name="IBUS_MICRO_VERSION" type="int" value="4"/>
+		<constant name="IBUS_MICRO_VERSION" type="int" value="99"/>
 		<constant name="IBUS_MINOR_VERSION" type="int" value="3"/>
 		<constant name="IBUS_Mabovedot" type="int" value="16784960"/>
 		<constant name="IBUS_Macedonia_DSE" type="int" value="1717"/>
diff --git a/bindings/vala/ibus-1.0/ibus-1.0.metadata b/bindings/vala/ibus-1.0/ibus-1.0.metadata
index 161872e..962ef0f 100644
--- a/bindings/vala/ibus-1.0/ibus-1.0.metadata
+++ b/bindings/vala/ibus-1.0/ibus-1.0.metadata
@@ -5,3 +5,4 @@ ibus_bus_list_active_engines transfer_ownership="1" type_arguments="EngineDesc"
 ibus_bus_list_names transfer_ownership="1" type_arguments="string"
 ibus_bus_get_name_owner transfer_ownership="1"
 ibus_service_get_connections transfer_ownership="1" type_arguments="unowned Connection"
+IBusProxy::destroy has_emitter="1"
diff --git a/bindings/vala/test/enchant.vala b/bindings/vala/test/enchant.vala
index 500cad2..bb88817 100644
--- a/bindings/vala/test/enchant.vala
+++ b/bindings/vala/test/enchant.vala
@@ -139,7 +139,7 @@ class TestEngine : Engine {
 }
 
 void main (string []argv) {
-    var bus = new Bus();
+    var bus = new IBus.Bus();
     
     if (!bus.is_connected ()) {
         stderr.printf ("Can not connect to ibus-daemon!\n");