From be4b65a88e997bb7cdafdf784fc06e158fe100e5 Mon Sep 17 00:00:00 2001 From: Josh Rickmar Date: Thu, 10 May 2012 11:23:17 -0400 Subject: [PATCH] Fix the behavior of search_string so it matches the manpage. An empty search_string now will not cause the search box to be drawn, and if search_string is dynamically changed at runtime to "\0", a show_oops warning is shown instead of loading the "broken" page. --- xxxterm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xxxterm.c b/xxxterm.c index 4455743..35cdde7 100644 --- a/xxxterm.c +++ b/xxxterm.c @@ -3318,7 +3318,7 @@ activate_search_entry_cb(GtkWidget* entry, struct tab *t) return; } - if (search_string == NULL) { + if (search_string == NULL || strlen(search_string) == 0) { show_oops(t, "no search_string"); return; } @@ -6468,7 +6468,7 @@ create_toolbar(struct tab *t) gtk_box_pack_start(GTK_BOX(b), eb1, TRUE, TRUE, 0); /* search entry */ - if (search_string) { + if (search_string != NULL && strlen(search_string) != 0) { GtkWidget *eb2; t->search_entry = gtk_entry_new(); gtk_entry_set_width_chars(GTK_ENTRY(t->search_entry), 30); -- 2.11.4.GIT