2006-08-22 [colin] 2.4.0cvs71

	* src/gtk/pluginwindow.c
		Fix layout in verbose translations (such
		as french)

diff --git a/ChangeLog b/ChangeLog
index b080e980ae26f1c0a89da98a922e35fd89b2a5ad..3fc0123265c780dd0dd6b67d38d2b1b31c8abf98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-22 [colin]     2.4.0cvs71
+
+       * src/gtk/pluginwindow.c
+               Fix layout in verbose translations (such
+               as french)
+
 2006-08-22 [paul]      2.4.0cvs70
 
        * manual/Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 13c75b5c08d93b98f007ed18824568bc70ee543f..36956e08ec1670ebddfbe6789f0bac5e95b0cc01 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1762,3 +1762,4 @@
 ( cvs diff -u -r 1.382.2.303 -r 1.382.2.304 src/compose.c;  cvs diff -u -r 1.75.2.29 -r 1.75.2.30 src/matcher.c;  cvs diff -u -r 1.16.2.34 -r 1.16.2.35 src/msgcache.c;  ) > 2.4.0cvs68.patchset
 ( cvs diff -u -r 1.14.2.35 -r 1.14.2.36 src/plugins/trayicon/trayicon.c;  ) > 2.4.0cvs69.patchset
 ( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/Makefile.am;  cvs diff -u -r 1.60.2.61 -r 1.60.2.62 src/addressbook.c;  cvs diff -u -r 1.3.2.42 -r 1.3.2.43 src/prefs_themes.c;  cvs diff -u -r 1.5.2.37 -r 1.5.2.38 src/gtk/gtkutils.c;  cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/gtk/pluginwindow.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.26 -r 1.1.2.27 src/plugins/pgpcore/sgpgme.c;  ) > 2.4.0cvs70.patchset
+( cvs diff -u -r 1.5.2.33 -r 1.5.2.34 src/gtk/pluginwindow.c;  ) > 2.4.0cvs71.patchset

diff --git a/configure.ac b/configure.ac
index 34a299af3466a10a654ab9039c3b2786270d93a8..0dfeea15c4bbe6bab38c9d5fb645cb7deac8670c 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=70
+EXTRA_VERSION=71
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 5b5986ed6bedcb86304b6071ce8c8594ad094f54..8ba5599e101f658b993c93649616787a38616bd3 100644 (file)
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -394,6 +394,8 @@ void pluginwindow_create()
        gtk_widget_set_size_request(window, prefs_common.pluginswin_width,
                                    prefs_common.pluginswin_height);
 
+       gtk_widget_set_size_request(hbuttonbox1, -1, -1);
+
        gtk_widget_show(window);
 }