2007-07-26 [paul] 2.10.0cvs66

	* src/gtk/prefswindow.c
		fix account prefs breakage
		thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index b1cc148f213620321403d83cb8fd7fde964c4b61..95087db0fe29ecda733f0f6fb70a006261a8ece3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-26 [paul]      2.10.0cvs66
+
+       * src/gtk/prefswindow.c
+               fix account prefs breakage
+               thanks to Colin
+
 2007-07-26 [paul]      2.10.0cvs65
 
        * configure.ac

diff --git a/PATCHSETS b/PATCHSETS
index b8129cf6c6dc781087c408df00769c1b26164dca..92788ebd12de9b43859a565232406b8ffbfcdc38 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2719,3 +2719,4 @@
 ( cvs diff -u -r 1.149.2.77 -r 1.149.2.78 src/inc.c;  cvs diff -u -r 1.274.2.200 -r 1.274.2.201 src/mainwindow.c;  cvs diff -u -r 1.204.2.142 -r 1.204.2.143 src/prefs_common.c;  cvs diff -u -r 1.103.2.88 -r 1.103.2.89 src/prefs_common.h;  cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/prefs_receive.c;  cvs diff -u -r 1.3.2.7 -r 1.3.2.8 src/statusbar.h;  cvs diff -u -r 1.395.2.313 -r 1.395.2.314 src/summaryview.c;  cvs diff -u -r 1.43.2.78 -r 1.43.2.79 src/toolbar.c;  cvs diff -u -r 1.12.2.37 -r 1.12.2.38 src/gtk/prefswindow.c;  ) > 2.10.0cvs63.patchset
 ( cvs diff -u -r 1.60.2.92 -r 1.60.2.93 src/addressbook.c;  cvs diff -u -r 1.14.2.28 -r 1.14.2.29 src/editaddress.c;  ) > 2.10.0cvs64.patchset
 ( cvs diff -u -r 1.654.2.2774 -r 1.654.2.2775 configure.ac;  ) > 2.10.0cvs65.patchset
+( cvs diff -u -r 1.12.2.38 -r 1.12.2.39 src/gtk/prefswindow.c;  ) > 2.10.0cvs66.patchset

diff --git a/configure.ac b/configure.ac
index 4a19307968ba489c43c07258e2128b6856904433..30d45ac421df61f5528d32a32b07a20dc4a48ab6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=65
+EXTRA_VERSION=66
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/prefswindow.c b/src/gtk/prefswindow.c
index f9f32338902c2d68f971e3ec7942943ed75ec076..c539ed014cafb23ef3102cc8d015f9a99022b21f 100644 (file)
--- a/src/gtk/prefswindow.c
+++ b/src/gtk/prefswindow.c
@@ -524,7 +524,9 @@ void prefswindow_open_full(const gchar *title, GSList *prefs_pages,
                                      NULL,                     NULL);
 #endif
        gtk_widget_show_all(prefswindow->confirm_area);
-       gtk_widget_show_all(prefswindow->vbox);
+       gtk_widget_show(prefswindow->vbox);
+       gtk_widget_show(prefswindow->scrolledwindow1);
+       gtk_widget_show(prefswindow->scrolledwindow2);
 
        gtk_box_pack_start(GTK_BOX(prefswindow->vbox), prefswindow->confirm_area, FALSE, FALSE, 0);