Use gdbus in glib, and get rid of libdbus

3 files changed, 125 insertions, 181 deletions

diff --git a/docs/reference/ibus/Makefile.am b/docs/reference/ibus/Makefile.am
index 288e34df..420045a4 100644
--- a/docs/reference/ibus/Makefile.am
+++ b/docs/reference/ibus/Makefile.am
@@ -94,7 +94,7 @@ INCLUDES = \
 	-I$(top_builddir)/src \
 	$(NULL)
 GTKDOC_LIBS = \
-	$(top_builddir)/src/libibus.la \
+	$(top_builddir)/src/libibus-2.0.la \
 	$(NULL)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/docs/reference/ibus/ibus-sections.txt b/docs/reference/ibus/ibus-sections.txt
index a5a62257..b8cc06f0 100644
--- a/docs/reference/ibus/ibus-sections.txt
+++ b/docs/reference/ibus/ibus-sections.txt
@@ -8,13 +8,13 @@ ibus_prop_list_append
 ibus_prop_list_get
 ibus_prop_list_update_property
 <SUBSECTION Standard>
-IBUS_PROP_LIST
-IBUS_IS_PROP_LIST
-IBUS_TYPE_PROP_LIST
-ibus_prop_list_get_type
-IBUS_PROP_LIST_CLASS
-IBUS_IS_PROP_LIST_CLASS
-IBUS_PROP_LIST_GET_CLASS
+IBUS_COMPONENT
+IBUS_IS_COMPONENT
+IBUS_TYPE_COMPONENT
+ibus_component_get_type
+IBUS_COMPONENT_CLASS
+IBUS_IS_COMPONENT_CLASS
+IBUS_COMPONENT_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -42,6 +42,7 @@ IBUS_CONFIG_GET_CLASS
 IBUS_OBJECT_DESTROYED
 IBusObject
 IBusObjectClass
+IBusObjectPrivate
 ibus_object_new
 ibus_object_destroy
 <SUBSECTION Standard>
@@ -59,6 +60,7 @@ IBUS_OBJECT_GET_CLASS
 <TITLE>IBusBus</TITLE>
 IBusBus
 IBusBusClass
+IBusBusPrivate
 ibus_bus_new
 ibus_bus_is_connected
 ibus_bus_hello
@@ -94,6 +96,7 @@ IBUS_BUS_GET_CLASS
 <TITLE>IBusComponent</TITLE>
 IBusComponent
 IBusComponentClass
+IBusComponentPrivate
 ibus_component_new
 ibus_component_new_from_xml_node
 ibus_component_new_from_file
@@ -108,14 +111,60 @@ ibus_component_stop
 ibus_component_is_running
 ibus_component_get_from_engine
 ibus_component_set_restart
+>>>>>>> wip.
 <SUBSECTION Standard>
-IBUS_COMPONENT
-IBUS_IS_COMPONENT
-IBUS_TYPE_COMPONENT
-ibus_component_get_type
-IBUS_COMPONENT_CLASS
-IBUS_IS_COMPONENT_CLASS
-IBUS_COMPONENT_GET_CLASS
+IBUS_KEYMAP
+IBUS_IS_KEYMAP
+IBUS_TYPE_KEYMAP
+ibus_keymap_get_type
+IBUS_KEYMAP_CLASS
+IBUS_IS_KEYMAP_CLASS
+IBUS_KEYMAP_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>ibusattribute</FILE>
+<TITLE>IBusAttribute</TITLE>
+IBusAttrType
+IBusAttrUnderline
+IBusAttribute
+IBusAttributeClass
+ibus_attribute_new
+ibus_attr_underline_new
+ibus_attr_foreground_new
+ibus_attr_background_new
+<SUBSECTION Standard>
+IBUS_ATTRIBUTE
+IBUS_IS_ATTRIBUTE
+IBUS_TYPE_ATTRIBUTE
+ibus_attribute_get_type
+IBUS_ATTRIBUTE_CLASS
+IBUS_IS_ATTRIBUTE_CLASS
+IBUS_ATTRIBUTE_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>ibuspanelservice</FILE>
+<TITLE>IBusPanelService</TITLE>
+IBusPanelService
+IBusPanelServiceClass
+ibus_panel_service_new
+ibus_panel_service_candidate_clicked
+ibus_panel_service_cursor_down
+ibus_panel_service_cursor_up
+ibus_panel_service_page_down
+ibus_panel_service_page_up
+ibus_panel_service_property_active
+ibus_panel_service_property_show
+ibus_panel_service_property_hide
+<SUBSECTION Standard>
+IBUS_PANEL_SERVICE
+IBUS_IS_PANEL_SERVICE
+IBUS_TYPE_PANEL_SERVICE
+ibus_panel_service_get_type
+IBUS_PANEL_SERVICE_CLASS
+IBUS_IS_PANEL_SERVICE_CLASS
+IBUS_PANEL_SERVICE_GET_CLASS
 </SECTION>
 
 <SECTION>
@@ -123,16 +172,14 @@ IBUS_COMPONENT_GET_CLASS
 <TITLE>IBusService</TITLE>
 IBusService
 IBusServiceClass
-ServiceIBusMessageFunc
-ServiceIBusSignalFunc
+IBusServicePrivate
 ibus_service_new
-ibus_service_get_path
-ibus_service_handle_message
-ibus_service_add_to_connection
-ibus_service_get_connections
-ibus_service_remove_from_connection
-ibus_service_remove_from_all_connections
-ibus_service_send_signal
+ibus_service_get_object_path
+ibus_service_get_connection
+ibus_service_register
+ibus_service_unregister
+ibus_service_emit_signal
+ibus_service_class_add_interfaces
 <SUBSECTION Standard>
 IBUS_SERVICE
 IBUS_IS_SERVICE
@@ -190,6 +237,7 @@ ibus_serializable_get_attachment
 ibus_serializable_remove_attachment
 IBusSerializable
 IBusSerializableClass
+IBusSerializablePrivate
 IBusSerializableSerializeFunc
 IBusSerializableDeserializeFunc
 IBusSerializableCopyFunc
@@ -211,45 +259,6 @@ IBUS_SERIALIZABLE_GET_CLASS
 </SECTION>
 
 <SECTION>
-<FILE>ibusconnection</FILE>
-<TITLE>IBusConnection</TITLE>
-IBusConnection
-IBusConnectionClass
-IBusIBusMessageFunc
-IBusIBusSignalFunc
-IBusMessageFunc
-ibus_connection_new
-ibus_connection_set_connection
-ibus_connection_open
-ibus_connection_open_private
-ibus_connection_close
-ibus_connection_is_connected
-ibus_connection_is_authenticated
-ibus_connection_get_connection
-ibus_connection_get_unix_user
-ibus_connection_read_write_dispatch
-ibus_connection_send
-ibus_connection_send_signal
-ibus_connection_send_signal_valist
-ibus_connection_send_valist
-ibus_connection_send_with_reply
-ibus_connection_send_with_reply_and_block
-ibus_connection_call
-ibus_connection_call_with_reply
-ibus_connection_flush
-ibus_connection_register_object_path
-ibus_connection_unregister_object_path
-<SUBSECTION Standard>
-IBUS_CONNECTION
-IBUS_IS_CONNECTION
-IBUS_TYPE_CONNECTION
-ibus_connection_get_type
-IBUS_CONNECTION_CLASS
-IBUS_IS_CONNECTION_CLASS
-IBUS_CONNECTION_GET_CLASS
-</SECTION>
-
-<SECTION>
 <FILE>ibuslookuptable</FILE>
 <TITLE>IBusLookupTable</TITLE>
 IBusLookupTable
@@ -393,6 +402,7 @@ IBUS_PANEL_SERVICE_GET_CLASS
 <TITLE>IBusFactory</TITLE>
 IBusFactory
 IBusFactoryClass
+IBusFactoryPrivate
 ibus_factory_new
 ibus_factory_add_engine
 <SUBSECTION Standard>
@@ -438,7 +448,9 @@ IBUS_PROPERTY_GET_CLASS
 <TITLE>IBusEngine</TITLE>
 IBusEngine
 IBusEngineClass
+IBusEnginePrivate
 ibus_engine_new
+ibus_engine_new_type
 ibus_engine_commit_text
 ibus_engine_update_preedit_text
 ibus_engine_update_preedit_text_with_mode
@@ -538,6 +550,51 @@ IBUS_SERVER_GET_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>ibustext</FILE>
+<TITLE>IBusText</TITLE>
+IBusText
+IBusTextClass
+ibus_text_new_from_string
+ibus_text_new_from_ucs4
+ibus_text_new_from_static_string
+ibus_text_new_from_printf
+ibus_text_new_from_unichar
+ibus_text_append_attribute
+ibus_text_get_length
+<SUBSECTION Standard>
+IBUS_TEXT
+IBUS_IS_TEXT
+IBUS_TYPE_TEXT
+ibus_text_get_type
+IBUS_TEXT_CLASS
+IBUS_IS_TEXT_CLASS
+IBUS_TEXT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>ibusserver</FILE>
+<TITLE>IBusServer</TITLE>
+IBusServer
+IBusServerClass
+IBusNewConnectionFunc
+ibus_server_new
+ibus_server_listen
+ibus_server_disconnect
+ibus_server_get_address
+ibus_server_get_id
+ibus_server_is_connected
+ibus_server_set_auth_mechanisms
+<SUBSECTION Standard>
+IBUS_SERVER
+IBUS_IS_SERVER
+IBUS_TYPE_SERVER
+ibus_server_get_type
+IBUS_SERVER_CLASS
+IBUS_IS_SERVER_CLASS
+IBUS_SERVER_GET_CLASS
+</SECTION>
+
+<SECTION>
 <FILE>ibusconfigservice</FILE>
 <TITLE>IBusConfigService</TITLE>
 IBusConfigService
@@ -559,19 +616,11 @@ IBUS_CONFIG_SERVICE_GET_CLASS
 <TITLE>IBusProxy</TITLE>
 IBusProxy
 IBusProxyClass
-ibus_proxy_new
-ibus_proxy_send
-ibus_proxy_call
-ibus_proxy_call_with_reply
-ibus_proxy_call_with_reply_and_block
-ibus_proxy_send_with_reply
-ibus_proxy_send_with_reply_and_block
-ibus_proxy_handle_signal
-ibus_proxy_get_name
-ibus_proxy_get_unique_name
-ibus_proxy_get_path
-ibus_proxy_get_interface
-ibus_proxy_get_connection
+IBUS_PROXY_FLAGS
+IBUS_PROXY_SET_FLAGS
+IBUS_PROXY_UNSET_FLAGS
+IBUS_PROXY_DESTROYED
+ibus_proxy_destroy
 <SUBSECTION Standard>
 IBUS_PROXY
 IBUS_IS_PROXY
@@ -2590,15 +2639,6 @@ IBUS_braille_dots_12345678
 </SECTION>
 
 <SECTION>
-<FILE>ibusmainloop</FILE>
-DBusConnectionSetupFunc
-DBusServerSetupFunc
-ibus_mainloop_setup
-ibus_dbus_server_setup
-ibus_dbus_connection_setup
-</SECTION>
-
-<SECTION>
 <FILE>ibusdbus</FILE>
 DBusError
 DBusMessage
@@ -2609,34 +2649,6 @@ DBusConnection
 </SECTION>
 
 <SECTION>
-<FILE>ibuspendingcall</FILE>
-IBusPendingCall
-IBusPendingCallNotifyFunction
-ibus_pending_call_ref
-ibus_pending_call_unref
-ibus_pending_call_set_notify
-ibus_pending_call_cancel
-ibus_pending_call_get_completed
-ibus_pending_call_steal_reply
-ibus_pending_call_block
-ibus_pending_call_wait
-ibus_pending_call_allocate_data_slot
-ibus_pending_call_free_data_slot
-ibus_pending_call_set_data
-ibus_pending_call_get_data
-</SECTION>
-
-<SECTION>
-<FILE>ibuserror</FILE>
-IBusError
-ibus_error_new
-ibus_error_new_from_text
-ibus_error_new_from_printf
-ibus_error_new_from_message
-ibus_error_free
-</SECTION>
-
-<SECTION>
 <FILE>ibusshare</FILE>
 IBUS_SERVICE_IBUS
 IBUS_SERVICE_PANEL
@@ -2689,68 +2701,3 @@ IBUS_MINOR_VERSION
 IBUS_MICRO_VERSION
 IBUS_CHECK_VERSION
 </SECTION>
-
-<SECTION>
-<FILE>ibusmessage</FILE>
-IBUS_TYPE_OBJECT_PATH
-IBUS_TYPE_ARRAY
-IBUS_TYPE_STRUCT
-IBUS_TYPE_DICT_ENTRY
-IBUS_TYPE_VARIANT
-IBusMessage
-IBusMessageIter
-ibus_type_get_object_path
-ibus_type_get_array
-ibus_type_get_struct
-ibus_type_get_dict_entry
-ibus_type_get_variant
-ibus_message_new
-ibus_message_ref
-ibus_message_unref
-ibus_message_new_method_call
-ibus_message_new_method_return
-ibus_message_new_error
-ibus_message_new_error_printf
-ibus_message_new_signal
-ibus_message_is_method_call
-ibus_message_is_error
-ibus_message_is_signal
-ibus_message_set_destination
-ibus_message_set_sender
-ibus_message_set_error_name
-ibus_message_set_interface
-ibus_message_set_member
-ibus_message_set_path
-ibus_message_set_no_reply
-ibus_message_set_reply_serial
-ibus_message_get_type
-ibus_message_get_destination
-ibus_message_get_sender
-ibus_message_get_error_name
-ibus_message_get_error_message
-ibus_message_get_interface
-ibus_message_get_member
-ibus_message_get_path
-ibus_message_get_no_reply
-ibus_message_get_reply_serial
-ibus_message_get_serial
-ibus_message_append_args
-ibus_message_append_args_valist
-ibus_message_get_args
-ibus_message_get_args_valist
-ibus_message_iter_init_append
-ibus_message_iter_append
-ibus_message_iter_copy_data
-ibus_message_iter_init
-ibus_message_iter_get_basic
-ibus_message_iter_get
-ibus_message_iter_next
-ibus_message_iter_has_next
-ibus_message_iter_open_container
-ibus_message_iter_close_container
-ibus_message_iter_recurse
-ibus_message_iter_get_arg_type
-ibus_message_iter_get_element_type
-ibus_message_to_string
-</SECTION>
-
diff --git a/docs/reference/ibus/ibus.types b/docs/reference/ibus/ibus.types
index f992c650..016e9cea 100644
--- a/docs/reference/ibus/ibus.types
+++ b/docs/reference/ibus/ibus.types
@@ -1,4 +1,3 @@
-ibus_connection_get_type
 ibus_hotkey_profile_get_type
 ibus_object_get_type
 ibus_config_get_type
@@ -12,11 +11,9 @@ ibus_prop_state_get_type
 ibus_modifier_type_get_type
 ibus_capabilite_get_type
 ibus_orientation_get_type
-ibus_service_get_type
 ibus_factory_get_type
 ibus_text_get_type
 ibus_config_service_get_type
-ibus_server_get_type
 ibus_attribute_get_type
 ibus_attr_list_get_type
 ibus_engine_desc_get_type