aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-06-23 06:35:36 +00:00
Code

Revert "Flag topic as unset if it is zero length"

Browse Source
This commit is contained in:
ailin-nemui 2018-08-13 14:43:25 +02:00 committed by GitHub
parent 85df01d133
commit 817179a760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -59,7 +59,6 @@ tests/irc/core/test-irc.trs
*.la
*.lo
*.o
*.swp
*~
*.tar.bz2

22
src/irc/core/channel-events.c
View File

@ -126,25 +126,23 @@ static void channel_change_topic(IRC_SERVER_REC *server, const char *channel,
chanrec = channel_find(SERVER(server), channel);
if (chanrec == NULL) return;
g_free_and_null(chanrec->topic);
g_free_and_null(chanrec->topic_by);
chanrec->topic_time = 0;
/* the topic may be sent out encoded, so we need to
/* the topic may be send out encoded, so we need to
recode it back or /topic <tab> will not work properly */
recoded = recode_in(SERVER(server), topic, channel);
if (recoded == NULL || *recoded == '\0') {
signal_emit("channel topic changed", 1, chanrec);
g_free(recoded);
return;
if (topic != NULL) {
g_free_not_null(chanrec->topic);
chanrec->topic = recoded == NULL ? NULL : g_strdup(recoded);
}
g_free(recoded);
chanrec->topic = recoded;
g_free_not_null(chanrec->topic_by);
chanrec->topic_by = g_strdup(setby);
if (chanrec->topic_by != NULL) {
if (chanrec->topic_by == NULL) {
/* ensure invariant topic_time > 0 <=> topic_by != NULL.
this could be triggered by a topic command without sender */
chanrec->topic_time = 0;
} else {
chanrec->topic_time = settime;
}