aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

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

Browse Source 
This reverts commit 817179a760.
This commit is contained in:
Will Storey 2018-08-27 20:50:17 -07:00
parent 1bbd9f393c
commit bbca1a5a0f
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

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

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