mirror of
https://github.com/profanity-im/profanity.git
synced 2024-12-04 14:46:46 -05:00
Merge branch 'master' into clear
This commit is contained in:
commit
7d524cb574
@ -256,7 +256,6 @@ end:
|
|||||||
msg = strdup(FALLBACK_MSG);
|
msg = strdup(FALLBACK_MSG);
|
||||||
}
|
}
|
||||||
win_update_entry_message(upload->window, upload->put_url, 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);
|
win_mark_received(upload->window, upload->put_url);
|
||||||
free(msg);
|
free(msg);
|
||||||
|
|
||||||
|
@ -1323,16 +1323,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
|
void
|
||||||
win_newline(ProfWin *window)
|
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_sub_newline_lazy(WINDOW *win);
|
||||||
void win_mark_received(ProfWin *window, const char *const id);
|
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_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);
|
gboolean win_has_active_subwin(ProfWin *window);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user