tests/ibus-config Fix timeout_id handling

tests/ibus-config Fix timeout_id handling

tests/ibus-config queues a timeout whose callback calls
g_main_loop_quit() before returning FALSE. After exiting the mainloop,
g_source_remove(timeout_id) is called, but if the mainloop was exited
through the timeout callback, the source will already have been removed.

This commit makes sure we only try to call g_source_remove() on that
timeout if we did not exit the mainloop through the timeout callback.

BUG=http://code.google.com/p/ibus/issues/detail?id=1712

[Peng, 2014-06-05 14:27:17]

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c
File src/tests/ibus-config.c (right):

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c#newco...
src/tests/ibus-config.c:138: guint timeout_id;
If the timeout_cb always returns false, and the mainloop will not exist without
running timeout_cb. Probably we do not need record timeout_id.

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c#newco...
src/tests/ibus-config.c:298: data->timeout_id = g_timeout_add (1, timeout_cb,
data);
Can we use g_timeout_add(1, g_main_loop_quit, data->loop) here directly?

[teuf, 2014-06-05 19:57:28]

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c
File src/tests/ibus-config.c (right):

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c#newco...
src/tests/ibus-config.c:298: data->timeout_id = g_timeout_add (1, timeout_cb,
data);
On 2014/06/05 14:27:17, Peng wrote:
> Can we use g_timeout_add(1, g_main_loop_quit, data->loop) here directly?

I think it's cleaner to remove it after the 1st g_main_loop_run() call,
otherwise if the timeout did not trigger, the associated GSource will still
exist, and then when we run the second g_main_loop_run() call, the timeout which
was setup for the 1st g_main_loop_run() call will still exist and could trigger.

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c#newco...
src/tests/ibus-config.c:308: data->timeout_id = g_timeout_add (1, timeout_cb,
data);
For this timeout, we don't really need to keep its id nor to remove it after
exiting the mainloop, but keeping it makes the code identical to how we ran the
first mainloop.

[Peng, 2014-06-06 15:03:34]

lgtm

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c
File src/tests/ibus-config.c (right):

https://codereview.appspot.com/108730044/diff/1/src/tests/ibus-config.c#newco...
src/tests/ibus-config.c:298: data->timeout_id = g_timeout_add (1, timeout_cb,
data);
On 2014/06/05 19:57:28, teuf wrote:
> On 2014/06/05 14:27:17, Peng wrote:
> > Can we use g_timeout_add(1, g_main_loop_quit, data->loop) here directly?
> 
> I think it's cleaner to remove it after the 1st g_main_loop_run() call,
> otherwise if the timeout did not trigger, the associated GSource will still
> exist, and then when we run the second g_main_loop_run() call, the timeout
which
> was setup for the 1st g_main_loop_run() call will still exist and could
trigger.

I see.