diff options
author | LemonBoy <thatlemon@gmail.com> | 2015-09-20 23:13:43 +0200 |
---|---|---|
committer | LemonBoy <thatlemon@gmail.com> | 2015-09-21 00:04:37 +0200 |
commit | 203c00938acad1da4a91a2c21afdac4ede08572a (patch) | |
tree | 5ad0a8e29f756511369929cfd2e676aae79f8e23 /src/fe-common | |
parent | 06040fb30bc0503696794ff6097cd55eff332bb5 (diff) | |
download | irssi-203c00938acad1da4a91a2c21afdac4ede08572a.zip |
Use formats instead of g_warning
Add some copyright headers here and there too.
Diffstat (limited to 'src/fe-common')
-rw-r--r-- | src/fe-common/irc/Makefile.am | 1 | ||||
-rw-r--r-- | src/fe-common/irc/fe-common-irc.c | 5 | ||||
-rw-r--r-- | src/fe-common/irc/fe-sasl.c | 48 | ||||
-rw-r--r-- | src/fe-common/irc/module-formats.c | 2 | ||||
-rw-r--r-- | src/fe-common/irc/module-formats.h | 2 |
5 files changed, 58 insertions, 0 deletions
diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index 463f145c..a5dd4c77 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -26,6 +26,7 @@ real_sources = \ fe-netsplit.c \ fe-common-irc.c \ fe-whois.c \ + fe-sasl.c \ irc-completion.c \ module-formats.c diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c index d6ab30ce..4a3ef1d3 100644 --- a/src/fe-common/irc/fe-common-irc.c +++ b/src/fe-common/irc/fe-common-irc.c @@ -69,6 +69,9 @@ void fe_netjoin_deinit(void); void fe_whois_init(void); void fe_whois_deinit(void); +void fe_sasl_init(void); +void fe_sasl_deinit(void); + void irc_completion_init(void); void irc_completion_deinit(void); @@ -91,6 +94,7 @@ void fe_common_irc_init(void) fe_netsplit_init(); fe_netjoin_init(); fe_whois_init(); + fe_sasl_init(); irc_completion_init(); settings_check(); @@ -116,6 +120,7 @@ void fe_common_irc_deinit(void) fe_netsplit_deinit(); fe_netjoin_deinit(); fe_whois_deinit(); + fe_sasl_deinit(); irc_completion_deinit(); theme_unregister(); diff --git a/src/fe-common/irc/fe-sasl.c b/src/fe-common/irc/fe-sasl.c new file mode 100644 index 00000000..331b38b0 --- /dev/null +++ b/src/fe-common/irc/fe-sasl.c @@ -0,0 +1,48 @@ +/* + fe-sasl.c : irssi + + Copyright (C) 2015 The Lemon Man + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "module.h" +#include "module-formats.h" +#include "signals.h" +#include "levels.h" + +#include "printtext.h" + +static void sig_sasl_success(IRC_SERVER_REC *server) +{ + printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_SUCCESS); +} + +static void sig_sasl_failure(IRC_SERVER_REC *server, const char *reason) +{ + printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_SASL_ERROR, reason); +} + +void fe_sasl_init(void) +{ + signal_add("server sasl success", (SIGNAL_FUNC) sig_sasl_success); + signal_add("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure); +} + +void fe_sasl_deinit(void) +{ + signal_remove("server sasl success", (SIGNAL_FUNC) sig_sasl_success); + signal_remove("server sasl failure", (SIGNAL_FUNC) sig_sasl_failure); +} diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index 6eaf18e8..f7b074ec 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -44,6 +44,8 @@ FORMAT_REC fecommon_irc_formats[] = { { "setupserver_header", "%#Server Port Network Settings", 0 }, { "setupserver_line", "%#%|$[!20]0 $[5]1 $[10]2 $3", 4, { 0, 1, 0, 0 } }, { "setupserver_footer", "", 0 }, + { "sasl_success", "SASL authentication succeeded", 0 }, + { "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } }, /* ---- */ { NULL, "Channels", 0 }, diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h index 34dd3efc..c45f4562 100644 --- a/src/fe-common/irc/module-formats.h +++ b/src/fe-common/irc/module-formats.h @@ -22,6 +22,8 @@ enum { IRCTXT_SETUPSERVER_HEADER, IRCTXT_SETUPSERVER_LINE, IRCTXT_SETUPSERVER_FOOTER, + IRCTXT_SASL_SUCCESS, + IRCTXT_SASL_ERROR, IRCTXT_FILL_2, |