Call ibus_hotkey_profile_remove_hotkey_by_event in bus_ibus_impl_set_trigger before...
authorYusuke Sato <yusukes@chromium.org>
Wed, 5 Jan 2011 23:44:49 +0000 (08:44 +0900)
committerYusuke Sato <yusukes@chromium.org>
Wed, 5 Jan 2011 23:44:49 +0000 (08:44 +0900)
commit44e94a3d0c7812fd24bd0548601682a1c0b043d7
treec5f3b3a532fb10dbb9d579d4a0cc164b07debc66
parentaf1460aea63a65877544e65a335398bd670ad6ee
Call ibus_hotkey_profile_remove_hotkey_by_event in bus_ibus_impl_set_trigger before registering the fallback hotkey, just in case.

Probably it's better to call the remove function in bus_ibus_impl_set_trigger just as bus_ibus_impl_set_hotkey already does, so that a wierd error message like 'IBUS-CRITICAL **: ...: file ibushotkey.c: line 381 (ibus_hotkey_profile_add_hotkey): should not be reached' will not be shown.

The fallback hotkey could be registered twice, via bus_ibus_impl_init and _dbus_name_owner_changed_cb, if the --timeout parameter is too small to talk to the configuration daemon, for example.

BUG=none
TEST=ran ibus-daemon with --timeout=1 and verified that the IBUS-CRITICAL message above was not shown.

Review URL: http://codereview.appspot.com/3796044
bus/ibusimpl.c