talons

commit a5208c04a8e44e7e70dad212e1fa1bebb59294bc
parent 330d00d595a84f32c7461911221267e1346d2802
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 21 Aug 2009 15:58:32 +0000

2009-08-21 [colin]	3.7.2cvs23

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

Diffstat:
M
ChangeLog
 | 
5
+++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
4
++--

4 files changed, 9 insertions(+), 3 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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);
 }