From 9288eed73a20082b6b53bee7f4bdf72b033629d8 Mon Sep 17 00:00:00 2001 From: Jari Matilainen Date: Fri, 13 Jan 2017 21:23:37 +0000 Subject: [PATCH] Hopefully the final changes! --- src/fe-common/core/fe-common-core.c | 5 +++-- src/fe-common/core/window-items.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/fe-common/core/fe-common-core.c b/src/fe-common/core/fe-common-core.c index 7bb7c9fb..4f6d8907 100644 --- a/src/fe-common/core/fe-common-core.c +++ b/src/fe-common/core/fe-common-core.c @@ -484,7 +484,8 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) else if (type & WI_TYPE_PRIVMSG && strarray_find(array, "@") != -1) return TRUE; - g_return_val_if_fail(dest->server_tag != NULL, FALSE); + if (dest->server_tag == NULL) + return FALSE; char *prefix = g_strdup_printf("%s/", dest->server_tag); if (strarray_find_prefix(array, prefix) == -1) { @@ -498,7 +499,7 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest) targets = g_slist_append(targets, "*"); if (type & WI_TYPE_CHANNEL) { targets = g_slist_append(targets, "#"); - targets = g_slist_append(targets, g_strdup(dest->target)); + targets = g_slist_append(targets, (gpointer) dest->target); } else if (type & WI_TYPE_QUERY) { if (type & WI_TYPE_DCCCHAT) diff --git a/src/fe-common/core/window-items.c b/src/fe-common/core/window-items.c index e322383b..5523b61e 100644 --- a/src/fe-common/core/window-items.c +++ b/src/fe-common/core/window-items.c @@ -143,10 +143,10 @@ WindowType window_item_get_type(WI_ITEM_REC *item) 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")) return WI_TYPE_CHANNEL; - else if (g_ascii_strcasecmp(type, "QUERY") == 0) { - if (g_str_has_prefix("=", item->name)) + else if (!g_ascii_strcasecmp(type, "QUERY")) { + if (item->name[0] == '=') return WI_TYPE_QUERY | WI_TYPE_DCCCHAT; else return WI_TYPE_QUERY | WI_TYPE_PRIVMSG;