1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

Simplify history handling in key_send_line.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4745 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-03-09 23:03:45 +00:00 committed by exg
parent ef47cde2b9
commit 37381fe1bc

View File

@ -535,13 +535,14 @@ static void sig_gui_key_pressed(gpointer keyp)
static void key_send_line(void) static void key_send_line(void)
{ {
HISTORY_REC *history; HISTORY_REC *history;
char *str, *add_history; char *str;
int add_history;
str = gui_entry_get_text(active_entry); str = gui_entry_get_text(active_entry);
/* we can't use gui_entry_get_text() later, since the entry might /* we can't use gui_entry_get_text() later, since the entry might
have been destroyed after we get back */ have been destroyed after we get back */
add_history = *str == '\0' ? NULL : g_strdup(str); add_history = *str != '\0';
history = command_history_current(active_win); history = command_history_current(active_win);
if (redir == NULL) { if (redir == NULL) {
@ -550,15 +551,14 @@ static void key_send_line(void)
active_win->active); active_win->active);
} else { } else {
if (redir->flags & ENTRY_REDIRECT_FLAG_HIDDEN) if (redir->flags & ENTRY_REDIRECT_FLAG_HIDDEN)
g_free_and_null(add_history); add_history = 0;
handle_entry_redirect(str); handle_entry_redirect(str);
} }
if (add_history != NULL) { if (add_history) {
history = command_history_find(history); history = command_history_find(history);
if (history != NULL) if (history != NULL)
command_history_add(history, add_history); command_history_add(history, str);
g_free(add_history);
} }
if (active_entry != NULL) if (active_entry != NULL)