Minor changes as per review

This commit is contained in:
Jari Matilainen 2017-01-13 21:06:32 +00:00
commit e80b659767
3 changed files with 7 additions and 8 deletions

View file

@ -178,7 +178,6 @@ int strarray_find_prefix(char **array, const char *item)
index = 0; index = 0;
for (tmp = array; *tmp != NULL; tmp++, index++) { 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) if (g_ascii_strncasecmp(*tmp, item, strlen(item)) == 0)
return index; return index;
} }

View file

@ -495,16 +495,16 @@ gboolean strarray_find_dest(char **array, const TEXT_DEST_REC *dest)
g_free(prefix); g_free(prefix);
// create a list of types to look for // 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) { if (type & WI_TYPE_CHANNEL) {
targets = g_slist_append(targets, g_strdup("#")); targets = g_slist_append(targets, "#");
targets = g_slist_append(targets, g_strdup(dest->target)); targets = g_slist_append(targets, dest->target);
} }
else if (type & WI_TYPE_QUERY) { else if (type & WI_TYPE_QUERY) {
if (type & WI_TYPE_DCCCHAT) if (type & WI_TYPE_DCCCHAT)
targets = g_slist_append(targets, g_strdup("=")); targets = g_slist_append(targets, "=");
else else
targets = g_slist_append(targets, g_strdup("@")); targets = g_slist_append(targets, "@");
} }
for (iterator = targets; iterator; iterator = iterator->next) { for (iterator = targets; iterator; iterator = iterator->next) {

View file

@ -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) 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); 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; return WI_TYPE_CHANNEL;
else if (g_ascii_strcasecmp(type, "QUERY") == 0) { else if (g_ascii_strcasecmp(type, "QUERY") == 0) {
if (g_str_has_prefix("=", item->name)) if (g_str_has_prefix("=", item->name))