summaryrefslogtreecommitdiff
path: root/src/fe-common/irc
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2000-07-31 22:01:56 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2000-07-31 22:01:56 +0000
commit3c594edf07486dcbdab10f06aae108e9e628bb6f (patch)
tree112925d566ac24c548a6fdba28700a38c85fe9aa /src/fe-common/irc
parent01a4f9fe041f29ad39fd3b6ada2f81f312eafded (diff)
downloadirssi-3c594edf07486dcbdab10f06aae108e9e628bb6f.zip
Added names_nick format.
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@564 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/fe-common/irc')
-rw-r--r--src/fe-common/irc/fe-events-numeric.c11
-rw-r--r--src/fe-common/irc/module-formats.c1
-rw-r--r--src/fe-common/irc/module-formats.h1
3 files changed, 10 insertions, 3 deletions
diff --git a/src/fe-common/irc/fe-events-numeric.c b/src/fe-common/irc/fe-events-numeric.c
index 2f481190..828374ee 100644
--- a/src/fe-common/irc/fe-events-numeric.c
+++ b/src/fe-common/irc/fe-events-numeric.c
@@ -91,11 +91,16 @@ static void display_sorted_nicks(CHANNEL_REC *channel, GSList *nicklist, gint it
if (--skip == 0)
{
+ char *ret, nickmode[2] = { 0, 0 };
skip = lines;
memset(linebuf, ' ', max);
- linebuf[0] = rec->op ? '@' : rec->voice ? '+' : ' ';
- memcpy(linebuf+1, rec->nick, strlen(rec->nick));
- g_string_sprintfa(str, "%%K[%%n%%_%c%%_%s%%K] ", linebuf[0], linebuf+1);
+ nickmode[0] = rec->op ? '@' : rec->voice ? '+' : ' ';
+ memcpy(linebuf, rec->nick, strlen(rec->nick));
+ ret = output_format_get_text(MODULE_NAME, NULL,
+ channel->server, channel->name,
+ IRCTXT_NAMES_NICK, nickmode, linebuf);
+ g_string_append(str, ret);
+ g_free(ret);
cols++;
}
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 668df93a..12ce484a 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -75,6 +75,7 @@ FORMAT_REC fecommon_irc_formats[] = {
{ "inviting", "Inviting $0 to %_$1", 2, { 0, 0 } },
{ "not_invited", "You have not been invited to a channel!", 0 },
{ "names", "%K[%g%_Users%_%K(%g$0%K)]%n $1", 2, { 0, 0 } },
+ { "names_nick", "%K[%n%_$0%_$1%K] ", 2, { 0, 0 } },
{ "endofnames", "%g%_$0%_%K:%n Total of %_$1%_ nicks %K[%n%_$2%_ ops, %_$3%_ voices, %_$4%_ normal%K]", 5, { 0, 1, 1, 1, 1 } },
{ "channel_created", "Channel %_$0%_ created $1", 2, { 0, 0 } },
{ "topic", "Topic for %c$0%K:%n $1", 2, { 0, 0 } },
diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h
index c1adf04e..120d3e74 100644
--- a/src/fe-common/irc/module-formats.h
+++ b/src/fe-common/irc/module-formats.h
@@ -52,6 +52,7 @@ enum {
IRCTXT_INVITING,
IRCTXT_NOT_INVITED,
IRCTXT_NAMES,
+ IRCTXT_NAMES_NICK,
IRCTXT_ENDOFNAMES,
IRCTXT_CHANNEL_CREATED,
IRCTXT_TOPIC,