2011-10-31 [paul] 3.7.10cvs63

	* src/prefs_template.c
		revert part of 3.7.10cvs60 - it was a subjective change, all widgets
		fit at 540 here, for those where they don't the dialogue can be made
		larger by the user

diff --git a/ChangeLog b/ChangeLog
index 883e0fe82676694686175c5c8170580d21e07bd9..01feb1de01e48a188cb636351abc6672f858acc4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-31 [paul]      3.7.10cvs63
+
+       * src/prefs_template.c
+               revert part of 3.7.10cvs60 - it was a subjective change, all widgets
+               fit at 540 here, for those where they don't the dialogue can be made
+               larger by the user
+

 2011-10-31 [paul]      3.7.10cvs62
 
        * src/compose.c
 2011-10-31 [paul]      3.7.10cvs62
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 16ba913dbb7b6191454f7d0460855ec59361e4ed..c2bf4a239b4a67e0446e3a06a991eba978543c25 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4266,3 +4266,4 @@
 ( cvs diff -u -r 1.12.2.77 -r 1.12.2.78 src/prefs_template.c;  ) > 3.7.10cvs60.patchset
 ( cvs diff -u -r 1.382.2.589 -r 1.382.2.590 src/compose.c;  ) > 3.7.10cvs61.patchset
 ( cvs diff -u -r 1.382.2.590 -r 1.382.2.591 src/compose.c;  ) > 3.7.10cvs62.patchset
 ( cvs diff -u -r 1.12.2.77 -r 1.12.2.78 src/prefs_template.c;  ) > 3.7.10cvs60.patchset
 ( cvs diff -u -r 1.382.2.589 -r 1.382.2.590 src/compose.c;  ) > 3.7.10cvs61.patchset
 ( cvs diff -u -r 1.382.2.590 -r 1.382.2.591 src/compose.c;  ) > 3.7.10cvs62.patchset

+( cvs diff -u -r 1.12.2.78 -r 1.12.2.79 src/prefs_template.c;  ) > 3.7.10cvs63.patchset

diff --git a/configure.ac b/configure.ac
index 5702883d27b32b1e23e115a837840978dca716b6..46edffc35a519eb31a9ae6d873a0e09d2e3e726d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=62
+EXTRA_VERSION=63

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_template.c b/src/prefs_template.c
index a4dc4fadb7f8f4e9dec2505379d475dd931335b6..2d9f98e75a3d233e14896669b1818cc0ec366fca 100644 (file)
--- a/src/prefs_template.c
+++ b/src/prefs_template.c
@@ -423,7 +423,7 @@ static void prefs_template_window_create(void)
 
        if (!geometry.min_height) {
                geometry.min_width = 500;
 
        if (!geometry.min_height) {
                geometry.min_width = 500;

-               geometry.min_height = 560;
+               geometry.min_height = 540;

        }
 
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,
        }
 
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL, &geometry,