mirror of
https://github.com/profanity-im/profanity.git
synced 2024-09-22 19:45:54 -04:00
Merge branch 'master' into xep0308-last-message-correction
This commit is contained in:
commit
186b53680e
@ -1953,7 +1953,7 @@ static struct cmd_t command_defs[] =
|
||||
{ "clear", cmd_account_clear })
|
||||
CMD_MAINFUNC(cmd_account)
|
||||
CMD_TAGS(
|
||||
CMD_TAG_CONNECTION
|
||||
CMD_TAG_CONNECTION,
|
||||
CMD_TAG_PRESENCE,
|
||||
CMD_TAG_CHAT,
|
||||
CMD_TAG_GROUPCHAT)
|
||||
|
@ -256,7 +256,6 @@ end:
|
||||
msg = strdup(FALLBACK_MSG);
|
||||
}
|
||||
win_update_entry_message(upload->window, upload->put_url, msg);
|
||||
//win_update_entry_theme(upload->window, upload->put_url, THEME_THEM);
|
||||
win_mark_received(upload->window, upload->put_url);
|
||||
free(msg);
|
||||
|
||||
|
@ -1283,16 +1283,6 @@ win_update_entry_message(ProfWin *window, const char *const id, const char *cons
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
win_update_entry_theme(ProfWin *window, const char *const id, theme_item_t theme_item)
|
||||
{
|
||||
ProfBuffEntry *entry = buffer_get_entry_by_id(window->layout->buffer, id);
|
||||
if (entry) {
|
||||
entry->theme_item = theme_item;
|
||||
win_redraw(window);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
win_newline(ProfWin *window)
|
||||
{
|
||||
|
@ -82,7 +82,6 @@ void win_sub_print(WINDOW *win, char *msg, gboolean newline, gboolean wrap, int
|
||||
void win_sub_newline_lazy(WINDOW *win);
|
||||
void win_mark_received(ProfWin *window, const char *const id);
|
||||
void win_update_entry_message(ProfWin *window, const char *const id, const char *const message);
|
||||
void win_update_entry_theme(ProfWin *window, const char *const id, theme_item_t theme_item);
|
||||
|
||||
gboolean win_has_active_subwin(ProfWin *window);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user