2007-11-23 [paul] 3.1.0cvs21

	* src/prefs_summaries.c
		don't wrap the label or put linebreaks

diff --git a/ChangeLog b/ChangeLog
index a7838e3e154ed6d520e86d6b4365a964a9440e3a..ec702ff37fe22562af22d35daead4fa69fc9f5fc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-23 [paul]      3.1.0cvs21
+
+       * src/prefs_summaries.c
+               don't wrap the label or put linebreaks
+
 2007-11-22 [colin]     3.1.0cvs20
 
        * src/plugins/pgpinline/pgpinline.c

diff --git a/PATCHSETS b/PATCHSETS
index 50c8c0150ff55e6e2161eb7339a902e362e4be96..170627a4e772b15a4e046717589c009b5d363552 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3078,3 +3078,4 @@
 ( cvs diff -u -r 1.25.2.49 -r 1.25.2.50 src/stock_pixmap.c;  ) > 3.1.0cvs18.patchset
 ( cvs diff -u -r 1.3.2.53 -r 1.3.2.54 src/prefs_themes.c;  ) > 3.1.0cvs19.patchset
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpinline/pgpinline.c;  ) > 3.1.0cvs20.patchset
+( cvs diff -u -r 1.1.2.50 -r 1.1.2.51 src/prefs_summaries.c;  ) > 3.1.0cvs21.patchset

diff --git a/configure.ac b/configure.ac
index 0c142b21851194111738abe1e58631d5df6f8149..e6b14f6f3180d2dd741a0ff754efd782f2935bd6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=20
+EXTRA_VERSION=21
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index ca58da0da62f4186759fac952f5ef12e41e34c96..ca2081e2e146e60f7f2b95d618db38219bd911a3 100644 (file)
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -360,8 +360,6 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_box_pack_start(GTK_BOX (vbox2), hbox0, FALSE, FALSE, 0);
 
        label = gtk_label_new (_("Display message number next to folder name"));
-       gtk_widget_set_size_request(label, 200, -1);
-       gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
        gtk_widget_show (label);
        gtk_box_pack_start(GTK_BOX(hbox0), label, FALSE, FALSE, 0);