From 121a4971e61176e326ee3d2f71867e87732f4519 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Sat, 6 Jan 2018 20:17:51 +0100 Subject: [PATCH] Update fe-common-core.c fix mixed decls --- src/fe-common/core/fe-common-core.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 4f2d210a..a8726314 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -461,16 +461,19 @@ void fe_common_core_finish_init(void) gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) { - int channel_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL"); - int query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY"); + WI_ITEM_REC *item; + int server_tag_len, channel_type, query_type; char **tmp; + channel_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "CHANNEL"); + query_type = module_get_uniq_id_str("WINDOW ITEM TYPE", "QUERY"); + g_return_val_if_fail(array != NULL, FALSE); g_return_val_if_fail(dest != NULL, FALSE); g_return_val_if_fail(dest->window != NULL, FALSE); g_return_val_if_fail(dest->target != NULL, FALSE); - WI_ITEM_REC *item = window_item_find_window(dest->window, dest->server, dest->target); + item = window_item_find_window(dest->window, dest->server, dest->target); if (item == NULL) { return FALSE; }