2007-01-13 [colin] 2.7.0cvs20

	* src/message_search.c
	* src/summary_search.c
		Fix Enter in search windows
	* src/messageview.c
		Fix body search starting at the
		end of the mail (and asking for loop)

diff --git a/ChangeLog b/ChangeLog
index 49cb993829290af5f78dc101ae91238bf8e6c6b6..4f4ea401151edff2d9620a5d388748c49af7e211 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-13 [colin]     2.7.0cvs20
+
+       * src/message_search.c
+       * src/summary_search.c
+               Fix Enter in search windows
+       * src/messageview.c
+               Fix body search starting at the
+               end of the mail (and asking for loop)
+
 2007-01-13 [colin]     2.7.0cvs19
 
        * src/etpan/imap-thread.c

diff --git a/PATCHSETS b/PATCHSETS
index 0e60f781ad4acda913e4a1ac750bcf6f3f497f9e..5a62a9c057fee7be2e1b7e015841ecb43a6894b1 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2246,3 +2246,4 @@
 ( cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/etpan/imap-thread.c;  ) > 2.7.0cvs17.patchset
 ( cvs diff -u -r 1.1.2.33 -r 1.1.2.34 commitHelper;  ) > 2.7.0cvs18.patchset
 ( cvs diff -u -r 1.1.4.64 -r 1.1.4.65 src/etpan/imap-thread.c;  ) > 2.7.0cvs19.patchset
+( cvs diff -u -r 1.3.12.22 -r 1.3.12.23 src/message_search.c;  cvs diff -u -r 1.94.2.117 -r 1.94.2.118 src/messageview.c;  cvs diff -u -r 1.15.2.42 -r 1.15.2.43 src/summary_search.c;  ) > 2.7.0cvs20.patchset

diff --git a/configure.ac b/configure.ac
index 63acaa54f17e4d886248a50d4d74c6da13bf64e4..f7354f3e88a36a519965b4b225cf99ef70060abf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/message_search.c b/src/message_search.c
index 3b924d8e1839909606336101cdc5af92c16fa72c..6a59ca0644100027baa2daa9051b42667428ab30 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -393,6 +393,10 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_hide(search_window.window);
        }
 
+       if (event && (event->keyval == GDK_Return)) {
+               message_search_execute(FALSE);
+       }
+
        if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
                if (search_window.body_entry_has_focus) {
                        combobox_set_value_from_arrow_key(

diff --git a/src/messageview.c b/src/messageview.c
index a7f95b96d4f910ff188a4da77604dc6663daea18..627e0303082bcb34c7851839335c1639ed125c93 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -856,6 +856,8 @@ gint messageview_show(MessageView *messageview, MsgInfo *msginfo,
 
        mimeview_show_message(messageview->mimeview, mimeinfo, file);
        
+       messageview_set_position(messageview, 0);
+
        if (messageview->window)
                gtk_window_set_title(GTK_WINDOW(messageview->window), 
                                _("Claws Mail - Message View"));

diff --git a/src/summary_search.c b/src/summary_search.c
index 15db08f1834b10a1137d15ca322c2704d29bd3c6..f9628e4a16aa0ad7cc097ce91846510287466f01 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -960,6 +960,12 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
        }
 
+       if (event && (event->keyval == GDK_Return)) {
+               if (!search_window.is_searching) {
+                       summary_search_execute(FALSE, FALSE);
+               }
+       }
+
        if (event && (event->keyval == GDK_Down || event->keyval == GDK_Up)) {
                if (search_window.from_entry_has_focus) {
                        combobox_set_value_from_arrow_key(