2009-08-21 [colin] 3.7.2cvs23

	* src/compose.c
		Fix scrolling when adding an header

diff --git a/ChangeLog b/ChangeLog
index 7be1fc35818cb22e554ac647aa2e6859579d034a..13e6f049bacbf4517a69caa95db27cf78af494f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-21 [colin]     3.7.2cvs23
+
+       * src/compose.c
+               Fix scrolling when adding an header
+
 2009-08-21 [colin]     3.7.2cvs22
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 16b95303de2ff6d8183032b0d0b7f13481873d4d..952e586871e3e8daf7c4f1a39de5822fb4da6243 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3847,3 +3847,4 @@
 ( cvs diff -u -r 1.65.2.68 -r 1.65.2.69 src/codeconv.c;  cvs diff -u -r 1.15.2.22 -r 1.15.2.23 src/codeconv.h;  ) > 3.7.2cvs20.patchset
 ( cvs diff -u -r 1.100.2.72 -r 1.100.2.73 AUTHORS;  cvs diff -u -r 1.1.2.60 -r 1.1.2.61 src/gtk/authors.h;  cvs diff -u -r 1.36.2.172 -r 1.36.2.173 src/common/utils.c;  ) > 3.7.2cvs21.patchset
 ( cvs diff -u -r 1.382.2.520 -r 1.382.2.521 src/compose.c;  cvs diff -u -r 1.204.2.191 -r 1.204.2.192 src/prefs_common.c;  cvs diff -u -r 1.103.2.124 -r 1.103.2.125 src/prefs_common.h;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/prefs_compose_writing.c;  cvs diff -u -r 1.36.2.173 -r 1.36.2.174 src/common/utils.c;  ) > 3.7.2cvs22.patchset
+( cvs diff -u -r 1.382.2.521 -r 1.382.2.522 src/compose.c;  ) > 3.7.2cvs23.patchset

diff --git a/configure.ac b/configure.ac
index 7411836465b4d4ddd58df759489443342cc9c6c5..eed608df2ffb40a97c2dac0d4954a51d4ac02b56 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 45a0e11058952c431203689c68744817c16fc70c..ef3a331f8c5e3965cdb558b04f6457a081b47270 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -10518,6 +10518,7 @@ static gboolean compose_headerentry_changed_cb(GtkWidget *entry,
                         0, 0, NULL, NULL, headerentry);
                
                /* Automatically scroll down */
+               GTK_EVENTS_FLUSH();
                compose_show_first_last_header(headerentry->compose, FALSE);
                
        }
@@ -10531,9 +10532,8 @@ static void compose_show_first_last_header(Compose *compose, gboolean show_first
        cm_return_if_fail(compose);
        cm_return_if_fail(GTK_IS_WIDGET(compose->header_table));
        cm_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
-
        vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
-       gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
+       gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : (vadj->upper - vadj->page_size)));
        gtk_adjustment_changed(vadj);
 }