summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2013-12-17 08:29:05 +0100
committerSebastien Helleu <flashcode@flashtux.org>2013-12-17 08:29:05 +0100
commit17052c0c6766543d0e81e1ac41a2ca75ff5c2427 (patch)
treed4dec8ea0f6ae7b483e06cb94c0b576e0eccf892
parent4a88caa1f2cf6018b44eadace1f37ac8dafd11ef (diff)
downloadweechat-17052c0c6766543d0e81e1ac41a2ca75ff5c2427.zip
irc: remove display of channel in channel notices, display "PvNotice" for channel welcome notices
-rw-r--r--ChangeLog2
-rw-r--r--src/plugins/irc/irc-protocol.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 2419e091b..3f1f79a49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* aspell: fix detection of nicks with non-alphanumeric chars
* guile: disable guile gmp allocator (fix crash on unload of relay plugin)
(bug #40628)
+* irc: remove display of channel in channel notices, display "PvNotice" for
+ channel welcome notices
* irc: add option irc.look.smart_filter_mode (task #12499)
* irc: add option irc.network.ban_mask_default (bug #26571)
* irc: add option irc.network.lag_max
diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c
index cf0735b24..0e8a656d4 100644
--- a/src/plugins/irc/irc-protocol.c
+++ b/src/plugins/irc/irc-protocol.c
@@ -1182,9 +1182,10 @@ IRC_PROTOCOL_CALLBACK(notice)
"notify_message" :
weechat_config_string (irc_config_look_notice_welcome_tags),
nick),
- "%s%s%s%s%s(%s%s%s)%s%s%s%s%s: %s",
+ "%s%s%s%s%s%s(%s%s%s)%s: %s",
weechat_prefix ("network"),
IRC_COLOR_NOTICE,
+ (is_channel_orig) ? "" : "Pv",
/* TRANSLATORS: "Notice" is command name in IRC protocol (translation is frequently the same word) */
_("Notice"),
(notice_op) ? "Op" : ((notice_voice) ? "Voice" : ""),
@@ -1193,10 +1194,6 @@ IRC_PROTOCOL_CALLBACK(notice)
(nick && nick[0]) ? nick : "?",
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
- (is_channel_orig) ? " -> " : "",
- (is_channel_orig) ? IRC_COLOR_CHAT_CHANNEL : "",
- (is_channel_orig) ? pos_target : "",
- IRC_COLOR_RESET,
pos_args);
}
else