Use gdbus in glib, and get rid of libdbus

4 files changed, 16 insertions, 146 deletions

diff --git a/debian/libibus-dev.install b/debian/libibus-dev.install
index 51e89e76..34eb19e8 100644
--- a/debian/libibus-dev.install
+++ b/debian/libibus-dev.install
@@ -1,6 +1,6 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/libibus.so
-debian/tmp/usr/lib/libibus.a
+debian/tmp/usr/lib/libibus-*.so
+debian/tmp/usr/lib/libibus-*.a
 debian/tmp/usr/lib/pkgconfig/*
 debian/tmp/usr/share/gir-1.0/*
 debian/tmp/usr/share/vala/vapi/*
diff --git a/debian/libibus2.install b/debian/libibus2.install
index 15c8243c..b6fcee94 100644
--- a/debian/libibus2.install
+++ b/debian/libibus2.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libibus.so.2*
+debian/tmp/usr/lib/libibus-*.so.*
 debian/tmp/usr/lib/girepository-1.0/*
diff --git a/debian/libibus2.symbols b/debian/libibus2.symbols
index c94c8717..9214f814 100644
--- a/debian/libibus2.symbols
+++ b/debian/libibus2.symbols
@@ -1,4 +1,4 @@
-libibus.so.2 libibus2 #MINVER#
+libibus-2.0.so.0 libibus2 #MINVER#
  ibus_attr_background_new@Base 1.2.99.20100202
  ibus_attr_foreground_new@Base 1.2.99.20100202
  ibus_attr_list_append@Base 1.2.99.20100202
@@ -11,9 +11,6 @@ libibus.so.2 libibus2 #MINVER#
  ibus_attribute_get_type@Base 1.2.99.20100202
  ibus_attribute_new@Base 1.2.99.20100202
  ibus_bus_add_match@Base 1.2.99.20100202
- ibus_bus_call@Base 1.3.5.20100705
- ibus_bus_call_with_reply@Base 1.3.5.20100705
- ibus_bus_call_with_reply_valist@Base 1.3.5.20100705
  ibus_bus_create_input_context@Base 1.2.99.20100202
  ibus_bus_current_input_context@Base 1.2.99.20100202
  ibus_bus_exit@Base 1.2.99.20100202
@@ -62,33 +59,10 @@ libibus.so.2 libibus2 #MINVER#
  ibus_config_service_value_changed@Base 1.2.99.20100202
  ibus_config_set_value@Base 1.2.99.20100202
  ibus_config_unset@Base 1.2.99.20100202
- ibus_connection_call@Base 1.2.99.20100202
- ibus_connection_call_with_reply@Base 1.3.5.20100705
- ibus_connection_close@Base 1.2.99.20100202
- ibus_connection_flush@Base 1.2.99.20100202
- ibus_connection_get_connection@Base 1.2.99.20100202
- ibus_connection_get_type@Base 1.2.99.20100202
- ibus_connection_get_unix_user@Base 1.2.99.20100202
- ibus_connection_is_authenticated@Base 1.2.99.20100202
- ibus_connection_is_connected@Base 1.2.99.20100202
- ibus_connection_new@Base 1.2.99.20100202
- ibus_connection_open@Base 1.2.99.20100202
- ibus_connection_open_private@Base 1.2.99.20100202
- ibus_connection_read_write_dispatch@Base 1.2.99.20100202
- ibus_connection_register_object_path@Base 1.2.99.20100202
- ibus_connection_send@Base 1.2.99.20100202
- ibus_connection_send_signal@Base 1.2.99.20100202
- ibus_connection_send_signal_valist@Base 1.2.99.20100202
- ibus_connection_send_valist@Base 1.2.99.20100202
- ibus_connection_send_with_reply@Base 1.2.99.20100202
- ibus_connection_send_with_reply_and_block@Base 1.2.99.20100202
- ibus_connection_set_connection@Base 1.2.99.20100202
- ibus_connection_unregister_object_path@Base 1.2.99.20100202
- ibus_dbus_connection_setup@Base 1.2.99.20100202
- ibus_dbus_server_setup@Base 1.2.99.20100202
  ibus_engine_commit_text@Base 1.2.99.20100202
  ibus_engine_delete_surrounding_text@Base 1.2.99.20100202
  ibus_engine_desc_get_type@Base 1.2.99.20100202
+ ibus_engine_desc_new2@Base 1.9.0.20101013
  ibus_engine_desc_new@Base 1.2.99.20100202
  ibus_engine_desc_new_from_xml_node@Base 1.2.99.20100202
  ibus_engine_desc_output@Base 1.2.99.20100202
@@ -99,6 +73,7 @@ libibus.so.2 libibus2 #MINVER#
  ibus_engine_hide_lookup_table@Base 1.2.99.20100202
  ibus_engine_hide_preedit_text@Base 1.2.99.20100202
  ibus_engine_new@Base 1.2.99.20100202
+ ibus_engine_new_type@Base 1.9.0.20101013
  ibus_engine_register_properties@Base 1.2.99.20100202
  ibus_engine_show_auxiliary_text@Base 1.2.99.20100202
  ibus_engine_show_lookup_table@Base 1.2.99.20100202
@@ -109,11 +84,6 @@ libibus.so.2 libibus2 #MINVER#
  ibus_engine_update_preedit_text@Base 1.2.99.20100202
  ibus_engine_update_preedit_text_with_mode@Base 1.3.0
  ibus_engine_update_property@Base 1.2.99.20100202
- ibus_error_free@Base 1.2.99.20100202
- ibus_error_new@Base 1.2.99.20100202
- ibus_error_new_from_message@Base 1.2.99.20100202
- ibus_error_new_from_printf@Base 1.2.99.20100202
- ibus_error_new_from_text@Base 1.2.99.20100202
  ibus_factory_add_engine@Base 1.2.99.20100202
  ibus_factory_get_type@Base 1.2.99.20100202
  ibus_factory_new@Base 1.2.99.20100202
@@ -129,6 +99,7 @@ libibus.so.2 libibus2 #MINVER#
  ibus_hotkey_profile_add_hotkey_from_string@Base 1.2.99.20100202
  ibus_hotkey_profile_filter_key_event@Base 1.2.99.20100202
  ibus_hotkey_profile_get_type@Base 1.2.99.20100202
+ ibus_hotkey_profile_lookup_hotkey@Base 1.9.0.20101013
  ibus_hotkey_profile_new@Base 1.2.99.20100202
  ibus_hotkey_profile_remove_hotkey@Base 1.2.99.20100202
  ibus_hotkey_profile_remove_hotkey_by_event@Base 1.2.99.20100202
@@ -188,72 +159,6 @@ libibus.so.2 libibus2 #MINVER#
  ibus_lookup_table_set_page_size@Base 1.2.99.20100202
  ibus_lookup_table_set_round@Base 1.2.99.20100202
  ibus_main@Base 1.2.99.20100202
- ibus_mainloop_setup@Base 1.2.99.20100202
- ibus_marshal_BOOLEAN__POINTER@Base 1.2.99.20100202
- ibus_marshal_BOOLEAN__POINTER_POINTER@Base 1.2.99.20100202
- ibus_marshal_BOOLEAN__UINT_UINT@Base 1.2.99.20100202
- ibus_marshal_BOOLEAN__UINT_UINT_UINT@Base 1.2.99.20100202
- ibus_marshal_BOOLEAN__ULONG@Base 1.2.99.20100202
- ibus_marshal_VOID__BOXED_BOOLEAN@Base 1.2.99.20100202
- ibus_marshal_VOID__INT_INT_INT_INT@Base 1.2.99.20100202
- ibus_marshal_VOID__INT_UINT@Base 1.2.99.20100202
- ibus_marshal_VOID__OBJECT_BOOLEAN@Base 1.2.99.20100202
- ibus_marshal_VOID__OBJECT_UINT_BOOLEAN@Base 1.2.99.20100202
- ibus_marshal_VOID__OBJECT_UINT_BOOLEAN_UINT@Base 1.3.5.20100705
- ibus_marshal_VOID__STRING_INT@Base 1.2.99.20100202
- ibus_marshal_VOID__STRING_STRING_BOXED@Base 1.2.99.20100202
- ibus_marshal_VOID__STRING_STRING_STRING@Base 1.2.99.20100202
- ibus_marshal_VOID__STRING_UINT@Base 1.2.99.20100202
- ibus_marshal_VOID__UINT_UINT@Base 1.2.99.20100202
- ibus_marshal_VOID__UINT_UINT_UINT@Base 1.2.99.20100202
- ibus_message_append_args@Base 1.2.99.20100202
- ibus_message_append_args_valist@Base 1.2.99.20100202
- ibus_message_get_args@Base 1.2.99.20100202
- ibus_message_get_args_valist@Base 1.2.99.20100202
- ibus_message_get_destination@Base 1.2.99.20100202
- ibus_message_get_error_message@Base 1.2.99.20100202
- ibus_message_get_error_name@Base 1.2.99.20100202
- ibus_message_get_interface@Base 1.2.99.20100202
- ibus_message_get_member@Base 1.2.99.20100202
- ibus_message_get_no_reply@Base 1.2.99.20100202
- ibus_message_get_path@Base 1.2.99.20100202
- ibus_message_get_reply_serial@Base 1.2.99.20100202
- ibus_message_get_sender@Base 1.2.99.20100202
- ibus_message_get_serial@Base 1.2.99.20100202
- ibus_message_get_type@Base 1.2.99.20100202
- ibus_message_is_error@Base 1.2.99.20100202
- ibus_message_is_method_call@Base 1.2.99.20100202
- ibus_message_is_signal@Base 1.2.99.20100202
- ibus_message_iter_append@Base 1.2.99.20100202
- ibus_message_iter_close_container@Base 1.2.99.20100202
- ibus_message_iter_copy_data@Base 1.2.99.20100202
- ibus_message_iter_get@Base 1.2.99.20100202
- ibus_message_iter_get_arg_type@Base 1.2.99.20100202
- ibus_message_iter_get_basic@Base 1.2.99.20100202
- ibus_message_iter_get_element_type@Base 1.2.99.20100202
- ibus_message_iter_has_next@Base 1.2.99.20100202
- ibus_message_iter_init@Base 1.2.99.20100202
- ibus_message_iter_init_append@Base 1.2.99.20100202
- ibus_message_iter_next@Base 1.2.99.20100202
- ibus_message_iter_open_container@Base 1.2.99.20100202
- ibus_message_iter_recurse@Base 1.2.99.20100202
- ibus_message_new@Base 1.2.99.20100202
- ibus_message_new_error@Base 1.2.99.20100202
- ibus_message_new_error_printf@Base 1.2.99.20100202
- ibus_message_new_method_call@Base 1.2.99.20100202
- ibus_message_new_method_return@Base 1.2.99.20100202
- ibus_message_new_signal@Base 1.2.99.20100202
- ibus_message_ref@Base 1.2.99.20100202
- ibus_message_set_destination@Base 1.2.99.20100202
- ibus_message_set_error_name@Base 1.2.99.20100202
- ibus_message_set_interface@Base 1.2.99.20100202
- ibus_message_set_member@Base 1.2.99.20100202
- ibus_message_set_no_reply@Base 1.2.99.20100202
- ibus_message_set_path@Base 1.2.99.20100202
- ibus_message_set_reply_serial@Base 1.2.99.20100202
- ibus_message_set_sender@Base 1.2.99.20100202
- ibus_message_to_string@Base 1.2.99.20100202
- ibus_message_unref@Base 1.2.99.20100202
  ibus_modifier_type_get_type@Base 1.2.99.20100202
  ibus_object_destroy@Base 1.2.99.20100202
  ibus_object_flags_get_type@Base 1.2.99.20100202
@@ -276,18 +181,6 @@ libibus.so.2 libibus2 #MINVER#
  ibus_panel_service_property_active@Base 1.2.99.20100202
  ibus_panel_service_property_hide@Base 1.2.99.20100202
  ibus_panel_service_property_show@Base 1.2.99.20100202
- ibus_pending_call_allocate_data_slot@Base 1.2.99.20100202
- ibus_pending_call_block@Base 1.2.99.20100202
- ibus_pending_call_cancel@Base 1.2.99.20100202
- ibus_pending_call_free_data_slot@Base 1.2.99.20100202
- ibus_pending_call_get_completed@Base 1.2.99.20100202
- ibus_pending_call_get_data@Base 1.2.99.20100202
- ibus_pending_call_ref@Base 1.2.99.20100202
- ibus_pending_call_set_data@Base 1.2.99.20100202
- ibus_pending_call_set_notify@Base 1.2.99.20100202
- ibus_pending_call_steal_reply@Base 1.2.99.20100202
- ibus_pending_call_unref@Base 1.2.99.20100202
- ibus_pending_call_wait@Base 1.2.99.20100202
  ibus_preedit_focus_mode_get_type@Base 1.3.0
  ibus_prop_list_append@Base 1.2.99.20100202
  ibus_prop_list_get@Base 1.2.99.20100202
@@ -306,18 +199,8 @@ libibus.so.2 libibus2 #MINVER#
  ibus_property_set_tooltip@Base 1.2.99.20100202
  ibus_property_set_visible@Base 1.2.99.20100202
  ibus_property_update@Base 1.2.99.20100202
- ibus_proxy_call@Base 1.2.99.20100202
- ibus_proxy_call_with_reply@Base 1.2.99.20100202
- ibus_proxy_call_with_reply_and_block@Base 1.2.99.20100202
- ibus_proxy_get_connection@Base 1.2.99.20100202
- ibus_proxy_get_interface@Base 1.2.99.20100202
- ibus_proxy_get_name@Base 1.2.99.20100202
- ibus_proxy_get_path@Base 1.2.99.20100202
+ ibus_proxy_destroy@Base 1.9.0.20101013
  ibus_proxy_get_type@Base 1.2.99.20100202
- ibus_proxy_get_unique_name@Base 1.2.99.20100202
- ibus_proxy_handle_signal@Base 1.2.99.20100202
- ibus_proxy_new@Base 1.2.99.20100202
- ibus_proxy_send@Base 1.2.99.20100202
  ibus_quit@Base 1.2.99.20100202
  ibus_serializable_copy@Base 1.2.99.20100202
  ibus_serializable_deserialize@Base 1.2.99.20100202
@@ -327,24 +210,16 @@ libibus.so.2 libibus2 #MINVER#
  ibus_serializable_remove_qattachment@Base 1.2.99.20100202
  ibus_serializable_serialize@Base 1.2.99.20100202
  ibus_serializable_set_qattachment@Base 1.2.99.20100202
- ibus_server_disconnect@Base 1.2.99.20100202
- ibus_server_get_address@Base 1.2.99.20100202
- ibus_server_get_id@Base 1.2.99.20100202
- ibus_server_get_type@Base 1.2.99.20100202
- ibus_server_is_connected@Base 1.2.99.20100202
- ibus_server_listen@Base 1.2.99.20100202
- ibus_server_new@Base 1.2.99.20100202
- ibus_server_set_auth_mechanisms@Base 1.2.99.20100202
- ibus_service_add_to_connection@Base 1.2.99.20100202
- ibus_service_get_connections@Base 1.2.99.20100202
- ibus_service_get_path@Base 1.2.99.20100202
+ ibus_service_class_add_interfaces@Base 1.9.0.20101013
+ ibus_service_emit_signal@Base 1.9.0.20101013
+ ibus_service_get_connection@Base 1.9.0.20101013
+ ibus_service_get_object_path@Base 1.9.0.20101013
  ibus_service_get_type@Base 1.2.99.20100202
- ibus_service_handle_message@Base 1.2.99.20100202
  ibus_service_new@Base 1.2.99.20100202
- ibus_service_remove_from_all_connections@Base 1.2.99.20100202
- ibus_service_remove_from_connection@Base 1.2.99.20100202
- ibus_service_send_signal@Base 1.2.99.20100202
+ ibus_service_register@Base 1.9.0.20101013
+ ibus_service_unregister@Base 1.9.0.20101013
  ibus_set_display@Base 1.2.99.20100202
+ ibus_set_log_handler@Base 1.9.0.20101013
  ibus_text_append_attribute@Base 1.2.99.20100202
  ibus_text_get_length@Base 1.2.99.20100202
  ibus_text_get_type@Base 1.2.99.20100202
@@ -353,11 +228,6 @@ libibus.so.2 libibus2 #MINVER#
  ibus_text_new_from_string@Base 1.2.99.20100202
  ibus_text_new_from_ucs4@Base 1.2.99.20100202
  ibus_text_new_from_unichar@Base 1.2.99.20100202
- ibus_type_get_array@Base 1.2.99.20100202
- ibus_type_get_dict_entry@Base 1.2.99.20100202
- ibus_type_get_object_path@Base 1.2.99.20100202
- ibus_type_get_struct@Base 1.2.99.20100202
- ibus_type_get_variant@Base 1.2.99.20100202
  ibus_write_address@Base 1.2.99.20100202
  ibus_xml_free@Base 1.2.99.20100202
  ibus_xml_output@Base 1.3.5.20100705
diff --git a/debian/rules b/debian/rules
index a8b88360..84f75178 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ build: patch
 
 install:
 	dh $@ --until auto_install
-	rm -rf $(CURDIR)/debian/tmp/usr/lib/libibus.la \
+	rm -rf $(CURDIR)/debian/tmp/usr/lib/libibus*.la \
 		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.a \
 		$(CURDIR)/debian/tmp/usr/lib/gtk-2.0/2.10.0/immodules/im-ibus.la \
 		$(CURDIR)/debian/tmp/etc/xdg \