From e80b659767cdbd278aec29136be1bd18ecfadb25 Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Fri, 13 Jan 2017 21:06:32 +0000 Subject: [PATCH] Minor changes as per review --- src/core/misc.c | 1 - src/fe-common/core/fe-common-core.c | 10 +++++----- src/fe-common/core/window-items.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/core/misc.c b/src/core/misc.c index 67298fa5..c61c90c9 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -178,7 +178,6 @@ int strarray_find_prefix(char **array, const char *item) index = 0; for (tmp = array; *tmp != NULL; tmp++, index++) { - //if (g_str_has_prefix(g_ascii_strdown(*tmp, -1), item)) if (g_ascii_strncasecmp(*tmp, item, strlen(item)) == 0) return index; } diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 176be7a0..b491d55d 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -495,16 +495,16 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) g_free(prefix); // create a list of types to look for - targets = g_slist_append(targets, g_strdup("*")); + targets = g_slist_append(targets, "*"); if (type & WI_TYPE_CHANNEL) { - targets = g_slist_append(targets, g_strdup("#")); - targets = g_slist_append(targets, g_strdup(dest->target)); + targets = g_slist_append(targets, "#"); + targets = g_slist_append(targets, dest->target); } else if (type & WI_TYPE_QUERY) { if (type & WI_TYPE_DCCCHAT) - targets = g_slist_append(targets, g_strdup("=")); + targets = g_slist_append(targets, "="); else - targets = g_slist_append(targets, g_strdup("@")); + targets = g_slist_append(targets, "@"); } for (iterator = targets; iterator; iterator = iterator->next) { diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index 90545ea3..e322383b 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -140,10 +140,10 @@ void window_item_set_active(WINDOW_REC *window, WI_ITEM_REC *item) WindowType window_item_get_type(WI_ITEM_REC *item) { - g_return_val_if_fail(item != NULL, WI_TYPE_OTHER); + g_return_val_if_fail(item != NULL, WI_TYPE_OTHER); const char *type = module_find_id_str("WINDOW ITEM TYPE", item->type); - if (g_ascii_strcasecmp(type, "CHANNEL") == 0) + if (g_ascii_strcasecmp(type, "CHANNEL") == 0) return WI_TYPE_CHANNEL; else if (g_ascii_strcasecmp(type, "QUERY") == 0) { if (g_str_has_prefix("=", item->name))