2006-08-14 [paul] 2.4.0cvs48

	* src/gtk/prefswindow.c
		re-set scrolled window on opening
		Patch by Ticho

diff --git a/ChangeLog b/ChangeLog
index 8840add95dff055d0cd451534cc8f0262649becb..588cdc4001dcc59d0dd0ec6de4020a8f3a2c7f48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-14 [paul]      2.4.0cvs48
+
+       * src/gtk/prefswindow.c
+               re-set scrolled window on opening
+               Patch by Ticho
+
 2006-08-14 [paul]
 
        2.5.0-rc1 released

diff --git a/PATCHSETS b/PATCHSETS
index c1fd9c8b44e7eccdc8833d88a9fd4b916ab08a4f..15ca417fac18eae75a8bc032938e7e844331dfa0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1739,3 +1739,4 @@
 ( cvs diff -u -r 1.36.2.73 -r 1.36.2.74 src/common/utils.c;  ) > 2.4.0cvs45.patchset
 ( cvs diff -u -r 1.105.2.64 -r 1.105.2.65 src/prefs_account.c;  ) > 2.4.0cvs46.patchset
 ( cvs diff -u -r 1.16.2.19 -r 1.16.2.20 src/prefs_display_header.c;  ) > 2.4.0cvs47.patchset
+( cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/gtk/prefswindow.c;  ) > 2.4.0cvs48.patchset

diff --git a/configure.ac b/configure.ac
index 523eca9d5d34430f9f0d784ea29b046c6e294925..36850a52f7890adbe3fcfd442af1f9bf9142d618 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=47
+EXTRA_VERSION=48
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index c58794da3e15749e6abc76d0163637fafa40a0ab..71419d40097376629ace6929c3c0b807860b363b 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -543,6 +543,7 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
        gchar *labeltext;
        gint pagenum, i;
        GtkTreeIter iter;
+       GtkAdjustment *adj;
 
        if (currently_selected) 
                return TRUE;
@@ -580,6 +581,10 @@ static gboolean prefswindow_row_selected(GtkTreeSelection *selector,
                                        page->widget);
        gtk_notebook_set_page(GTK_NOTEBOOK(prefswindow->notebook), pagenum);
 
+       adj = gtk_scrolled_window_get_vadjustment(
+                       GTK_SCROLLED_WINDOW(prefswindow->scrolledwindow2));
+       gtk_adjustment_set_value(adj, 0);
+
        return TRUE;
 }