1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 01:03:02 +01:00

Fix rebase mistakes

This commit is contained in:
jfreegman 2021-11-22 09:34:17 -05:00
parent e9f8293a0a
commit 493dfeff22
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 4 additions and 11 deletions

View File

@ -680,17 +680,6 @@ void line_info_print(ToxWindow *self)
} }
} }
if (type == OUT_MSG && timed_out(line->timestamp, NOREAD_FLAG_TIMEOUT)) {
wattron(win, COLOR_PAIR(RED));
wprintw(win, " x", line->msg);
wattroff(win, COLOR_PAIR(RED));
if (line->noread_flag == false) {
line->noread_flag = true;
line->len += 2;
}
}
wprintw(win, "\n", line->msg); wprintw(win, "\n", line->msg);
break; break;
} }

View File

@ -428,6 +428,8 @@ void on_group_status_change(Tox *m, uint32_t groupnumber, uint32_t peer_id, TOX_
windows[i]->onGroupStatusChange(windows[i], m, groupnumber, peer_id, status); windows[i]->onGroupStatusChange(windows[i], m, groupnumber, peer_id, status);
} }
} }
flag_interface_refresh();
} }
void on_group_peer_join(Tox *m, uint32_t groupnumber, uint32_t peer_id, void *userdata) void on_group_peer_join(Tox *m, uint32_t groupnumber, uint32_t peer_id, void *userdata)
@ -437,6 +439,8 @@ void on_group_peer_join(Tox *m, uint32_t groupnumber, uint32_t peer_id, void *us
windows[i]->onGroupPeerJoin(windows[i], m, groupnumber, peer_id); windows[i]->onGroupPeerJoin(windows[i], m, groupnumber, peer_id);
} }
} }
flag_interface_refresh();
} }
void on_group_peer_exit(Tox *m, uint32_t groupnumber, uint32_t peer_id, Tox_Group_Exit_Type exit_type, void on_group_peer_exit(Tox *m, uint32_t groupnumber, uint32_t peer_id, Tox_Group_Exit_Type exit_type,