mirror of
https://github.com/Tha14/toxic.git
synced 2024-11-22 15:33:03 +01:00
Fix rebase mistakes
This commit is contained in:
parent
0b32b985f1
commit
cd4a5e5fde
@ -683,17 +683,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;
|
||||||
}
|
}
|
||||||
|
@ -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,
|
||||||
|
Loading…
Reference in New Issue
Block a user