diff options
author | Marco Trevisan (TreviƱo) <mail@3v1n0.net> | 2015-04-10 21:56:10 +0000 |
---|---|---|
committer | CI Train Bot <ci-train-bot@canonical.com> | 2015-04-10 21:56:10 +0000 |
commit | 7dd5e5cabcc894a09cddc839b908251ccbff77ad (patch) | |
tree | 2ded2ffd29d1ad1976af81c62180f3a3b1147474 /tests/test-json-server.c | |
parent | 79d7a4fbebebd31b8fd175e3dc5f281a101d5fb9 (diff) | |
parent | ef2e52734cfe324724acd8c855ecb5504fb24e2e (diff) | |
download | libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.tar.gz libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.tar.bz2 libdbusmenu-7dd5e5cabcc894a09cddc839b908251ccbff77ad.zip |
Parser: don't override the label for stock items if a custom one is provided Fixes: #1270486
Approved by: Timo Jyrinki, PS Jenkins bot
Diffstat (limited to 'tests/test-json-server.c')
-rw-r--r-- | tests/test-json-server.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/test-json-server.c b/tests/test-json-server.c index 9a2dd8e..2603070 100644 --- a/tests/test-json-server.c +++ b/tests/test-json-server.c @@ -36,8 +36,7 @@ root_activate (void) g_debug("Dumping callgrind data"); CALLGRIND_DUMP_STATS_AT("exported"); CALLGRIND_STOP_INSTRUMENTATION; - g_main_loop_quit(mainloop); - return; + g_timeout_add(500, (GSourceFunc)g_main_loop_quit, mainloop); } static void |