Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jari Matilainen 2014-08-27 00:00:05 +02:00
commit 37b5bffee0
2 changed files with 2 additions and 0 deletions

View file

@ -333,6 +333,7 @@ gui-readline.c:
gui-printtext.c: gui-printtext.c:
"beep" "beep"
"gui print text after finished", WINDOW_REC, LINE_REC *line, LINE_REC *prev_line
textbuffer-view.c textbuffer-view.c
"gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line "gui textbuffer line removed", TEXTBUFFER_VIEW_REC *view, LINE_REC *line, LINE_REC *prev_line

View file

@ -120,6 +120,7 @@ void gui_printtext_after_time(TEXT_DEST_REC *dest, LINE_REC *prev, const char *s
gui->insert_after_time = time; gui->insert_after_time = time;
format_send_to_gui(dest, str); format_send_to_gui(dest, str);
gui->use_insert_after = FALSE; gui->use_insert_after = FALSE;
signal_emit("gui print text after finished", 3, dest->window, gui->insert_after, prev);
} }
void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str) void gui_printtext_after(TEXT_DEST_REC *dest, LINE_REC *prev, const char *str)