2006-04-05 [colin] 2.0.0cvs183

[claws.git] / src / gtk / quicksearch.c

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 83ac0e198f2a63525193681cba7b197ad654d450..ca59d150d6566e20daf107d3b6d26d838a4e7604 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -183,6 +183,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
 static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
 {
        QuickSearch *quicksearch = (QuickSearch *)data;
+       const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
        prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
                                   G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
@@ -191,6 +192,10 @@ static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
        /* Show extended search description button, only when Extended is selected */
        update_extended_buttons(quicksearch);
 
+       if (!search_string || strlen(search_string) == 0) {
+               return TRUE;
+       }
+
        prepare_matcher(quicksearch);
 
        quicksearch_set_running(quicksearch, TRUE);
@@ -204,6 +209,7 @@ static gboolean searchtype_recursive_changed(GtkMenuItem *widget, gpointer data)
 {
        QuickSearch *quicksearch = (QuickSearch *)data;
        gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
+       const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
 
        prefs_common.summary_quicksearch_recurse = checked;
 
@@ -211,6 +217,10 @@ static gboolean searchtype_recursive_changed(GtkMenuItem *widget, gpointer data)
        gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
                                    prefs_common.summary_quicksearch_type);
 
+       if (!search_string || strlen(search_string) == 0) {
+               return TRUE;
+       }
+
        prepare_matcher(quicksearch);
 
        quicksearch_set_running(quicksearch, TRUE);