zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-22 18:12:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Hopefully the final changes!

Browse source
This commit is contained in:
Jari Matilainen 2017-01-13 21:23:37 +00:00
commit 9288eed73a
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/fe-common/core/fe-common-core.c
View file

@ -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) else if (type & WI_TYPE_PRIVMSG && strarray_find(array, "@") != -1)
return TRUE; 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); char *prefix = g_strdup_printf("%s/", dest->server_tag);
if (strarray_find_prefix(array, prefix) == -1) { 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, "*"); targets = g_slist_append(targets, "*");
if (type & WI_TYPE_CHANNEL) { if (type & WI_TYPE_CHANNEL) {
targets = g_slist_append(targets, "#"); 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) { else if (type & WI_TYPE_QUERY) {
if (type & WI_TYPE_DCCCHAT) if (type & WI_TYPE_DCCCHAT)

6
src/fe-common/core/window-items.c
View file

@ -143,10 +143,10 @@ 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"))
return WI_TYPE_CHANNEL; return WI_TYPE_CHANNEL;
else if (g_ascii_strcasecmp(type, "QUERY") == 0) { else if (!g_ascii_strcasecmp(type, "QUERY")) {
if (g_str_has_prefix("=", item->name)) if (item->name[0] == '=')
return WI_TYPE_QUERY | WI_TYPE_DCCCHAT; return WI_TYPE_QUERY | WI_TYPE_DCCCHAT;
else else
return WI_TYPE_QUERY | WI_TYPE_PRIVMSG; return WI_TYPE_QUERY | WI_TYPE_PRIVMSG;