2007-01-07 [paul] 2.6.1cvs115

	* src/prefs_matcher.c
		make the hbox content fit better under
		various languages

diff --git a/ChangeLog b/ChangeLog
index ea3185649bc8de232b888b82452f315d25493341..eca325568d71b7992be123164e47a402adce1790 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-07 [paul]      2.6.1cvs115
+
+       * src/prefs_matcher.c
+               make the hbox content fit better under
+               various languages
+
 2007-01-07 [colin]     2.6.1cvs114
 
        * src/messageview.c

diff --git a/PATCHSETS b/PATCHSETS
index 6fa30aec23b1bcc7b99d1fd478b0a87d2bd89761..d20a0e407db25ccf92dfd268f798a5f219e5a1a9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2222,3 +2222,4 @@
 ( cvs diff -u -r 1.94.2.115 -r 1.94.2.116 src/messageview.c;  ) > 2.6.1cvs112.patchset
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/imap_gtk.c;  cvs diff -u -r 1.274.2.160 -r 1.274.2.161 src/mainwindow.c;  cvs diff -u -r 1.39.2.28 -r 1.39.2.29 src/mainwindow.h;  cvs diff -u -r 1.2.2.20 -r 1.2.2.21 src/news_gtk.c;  cvs diff -u -r 1.52.2.33 -r 1.52.2.34 src/prefs_folder_item.c;  cvs diff -u -r 1.1.4.62 -r 1.1.4.63 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/pgpcore/sgpgme.c;  ) > 2.6.1cvs113.patchset
 ( cvs diff -u -r 1.94.2.116 -r 1.94.2.117 src/messageview.c;  ) > 2.6.1cvs114.patchset
+( cvs diff -u -r 1.43.2.50 -r 1.43.2.51 src/prefs_matcher.c;  ) > 2.6.1cvs115.patchset

diff --git a/configure.ac b/configure.ac
index c447d4e0a5ffd4402b16e7ce3dd73dde24e0ca87..d1fc2d48ba0e2b40037d1ae21dbcda786ab0ccc6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=114
+EXTRA_VERSION=115
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_matcher.c b/src/prefs_matcher.c
index 5f2b38618285476b2ce96de467c8eef3c842be7a..f2066a22195d224ded0dee8597d21344a5e94159 100644 (file)
--- a/src/prefs_matcher.c
+++ b/src/prefs_matcher.c
@@ -660,7 +660,7 @@ static void prefs_matcher_create(void)
        gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
        gtk_widget_set_size_request(arrow, -1, 16);
 
-       btn_hbox = gtk_hbox_new(TRUE, 4);
+       btn_hbox = gtk_hbox_new(FALSE, 4);
        gtk_widget_show(btn_hbox);
        gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);