diff options
| author | ailin-nemui <ailin-nemui@users.noreply.github.com> | 2018-04-24 13:58:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-24 13:58:04 +0200 |
| commit | 13b2f349b68bbef2550238c62519ab2acf013855 (patch) | |
| tree | 5f0c7d22ab01be67f947fe621cb211dd35da4d8d /src/irc/core/irc-cap.c | |
| parent | 68302f2d1fb1908ccac56b50ddf70abdb02f9aa5 (diff) | |
| parent | d0151fd5a21cf026afa67239ad79f23bc26f0a10 (diff) | |
| download | irssi-13b2f349b68bbef2550238c62519ab2acf013855.zip | |
Merge pull request #870 from dequis/fe-cap
Add fe-cap to show messages for CAP-related events in the UI
Diffstat (limited to 'src/irc/core/irc-cap.c')
| -rw-r--r-- | src/irc/core/irc-cap.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index 1a60d99b..bcaeb10d 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -48,11 +48,17 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable) if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL)) return FALSE; + signal_emit("server cap req", 2, server, cap); irc_send_cmdv(server, "CAP REQ %s", cap); return TRUE; } else if (!enable && gslist_find_string(server->cap_active, cap)) { - irc_send_cmdv(server, "CAP REQ -%s", cap); + char *negcap = g_strdup_printf("-%s", cap); + + signal_emit("server cap req", 2, server, negcap); + irc_send_cmdv(server, "CAP REQ %s", negcap); + + g_free(negcap); return TRUE; } @@ -194,10 +200,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add server->cap_queue = NULL; /* If the server doesn't support any cap we requested close the negotiation here */ - if (avail_caps > 0) + if (avail_caps > 0) { + signal_emit("server cap req", 2, server, cmd->str + sizeof("CAP REQ :") - 1); irc_send_cmd_now(server, cmd->str); - else + } else { cap_finish_negotiation(server); + } g_string_free(cmd, TRUE); } |