2007-02-22 [paul] 2.7.2cvs61

	* src/gtk/quicksearch.c
		Abandon dynamic search when pressing
		Enter

diff --git a/ChangeLog b/ChangeLog
index 01f154fd4122aece8988c1e9eb28299952511207..1f067d5f76c8758a0fce51ea59df9fd9d6ffc670 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-22 [paul]      2.7.2cvs61
+
+       * src/gtk/quicksearch.c
+               Abandon dynamic search when pressing
+               Enter
+
 2007-02-21 [colin]     2.7.2cvs60
 
        * src/procmsg.c

diff --git a/PATCHSETS b/PATCHSETS
index b494c5a7f10cd138274fcd780a4ae6dcceeb404a..bdd409107634a895673ee2ce15bd3a880326a49f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2378,3 +2378,4 @@
 ( cvs diff -u -r 1.155.2.52 -r 1.155.2.53 src/Makefile.am;  cvs diff -u -r 1.83.2.102 -r 1.83.2.103 src/mimeview.c;  cvs diff -u -r 1.25.2.32 -r 1.25.2.33 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.23 -r 1.18.2.24 src/stock_pixmap.h;  diff -u /dev/null src/pixmaps/mime_pgpsig.xpm;  ) > 2.7.2cvs58.patchset
 ( cvs diff -u -r 1.395.2.284 -r 1.395.2.285 src/summaryview.c;  ) > 2.7.2cvs59.patchset
 ( cvs diff -u -r 1.115.2.137 -r 1.115.2.138 src/main.c;  cvs diff -u -r 1.150.2.92 -r 1.150.2.93 src/procmsg.c;  cvs diff -u -r 1.1.2.62 -r 1.1.2.63 src/gtk/quicksearch.c;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/plugins/pgpcore/passphrase.c;  ) > 2.7.2cvs60.patchset
+( cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/gtk/quicksearch.c;  ) > 2.7.2cvs61.patchset

diff --git a/configure.ac b/configure.ac
index 71d81ba92a99c94904341615e966e7b1f2dffa7c..f1ef9853c916bef71a7334348816db56f3533e88 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index 4062b77b7de6a0b5e5cc941165e02efb1466fac3..7e32421e9fd3afe3663816d487586054c50d18ad 100644 (file)
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -235,6 +235,10 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
        }
 
        if (event != NULL && event->keyval == GDK_Return) {
+               if (quicksearch->press_timeout_id != -1) {
+                       g_source_remove(quicksearch->press_timeout_id);
+                       quicksearch->press_timeout_id = -1;
+               }
                quicksearch->in_typing = FALSE;
                /* add expression to history list and exec quicksearch */
                searchbar_run(quicksearch, FALSE);