From 92801d1b6489b41979c7b6a21f83eed9151408e6 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 11 Jun 2010 17:51:01 +0100
Subject: [PATCH 1/2] Fix search box regression

---
 src/calibre/gui2/search_box.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index 17a815c4ce..f8d046b0b4 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -100,6 +100,9 @@ class SearchBox2(QComboBox):
         self.help_state = False
 
     def clear_to_help(self):
+        if self.help_state:
+            return
+        self.help_state = True
         self.search.emit('')
         self._in_a_search = False
         self.setEditText(self.help_text)
@@ -107,7 +110,6 @@ class SearchBox2(QComboBox):
             self.killTimer(self.timer)
             self.timer = None
         self.line_edit.home(False)
-        self.help_state = True
         self.line_edit.setStyleSheet(
                 'QLineEdit { color: gray; background-color: %s; }' %
                 self.normal_background)

From 01c13519db2e8b032d705d7f0ac15fd84bc82fcf Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 11 Jun 2010 18:10:26 +0100
Subject: [PATCH 2/2] Finish fixing regressing in search box

---
 src/calibre/gui2/search_box.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/search_box.py b/src/calibre/gui2/search_box.py
index f8d046b0b4..d35f5e0725 100644
--- a/src/calibre/gui2/search_box.py
+++ b/src/calibre/gui2/search_box.py
@@ -73,7 +73,7 @@ class SearchBox2(QComboBox):
         self.connect(self.line_edit, SIGNAL('mouse_released(PyQt_PyObject)'),
                 self.mouse_released, Qt.DirectConnection)
         self.setEditable(True)
-        self.help_state = True
+        self.help_state = False
         self.as_you_type = True
         self.prev_search = ''
         self.timer = None