Branch: refs/heads/master
Home:   https://github.com/ibus/ibus

Commit: 44e94a3d0c7812fd24bd0548601682a1c0b043d7
    https://github.com/ibus/ibus/commit/44e94a3d0c7812fd24bd0548601682a1c0b043d7
Author: Yusuke Sato <[email protected]>
Date:   2011-01-05 (Wed, 05 Jan 2011)

Changed paths:
  M bus/ibusimpl.c

Log Message:
-----------
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


-- 
You received this message because you are subscribed to the Google
Groups "ibus-devel" group.
iBus project web page: http://code.google.com/p/ibus/
iBus dev group: http://groups.google.com/group/ibus-devel?hl=en

回复