From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 10 Oct 2007 17:03:31 +0000 (+0000)
Subject: 2007-10-10 [paul]	3.0.2cvs54
X-Git-Tag: rel_3_1_0~100
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=dc6301507725c3257e054fd298161eefece3d68d

2007-10-10 [paul]	3.0.2cvs54

	* src/prefs_filtering_action.c
	* src/gtk/description_window.c
	* src/gtk/foldersort.c
	* src/gtk/quicksearch.c
		get rid of some pointless new lines and
		make the descripton labels wrap better
---

diff --git a/ChangeLog b/ChangeLog
index 92dfe20c8..3839f4b8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-10 [paul]	3.0.2cvs54
+
+	* src/prefs_filtering_action.c
+	* src/gtk/description_window.c
+	* src/gtk/foldersort.c
+	* src/gtk/quicksearch.c
+		get rid of some pointless new lines and
+		make the descripton labels wrap better
+
 2007-10-10 [colin]	3.0.2cvs53
 
 	* src/addressadd.c
diff --git a/PATCHSETS b/PATCHSETS
index 86537326b..e0bd847b3 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2966,3 +2966,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/addrduplicates.c;  ) > 3.0.2cvs51.patchset
 ( cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/printing.c;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/printing.h;  ) > 3.0.2cvs52.patchset
 ( cvs diff -u -r 1.9.2.19 -r 1.9.2.20 src/addressadd.c;  cvs diff -u -r 1.14.2.35 -r 1.14.2.36 src/editaddress.c;  cvs diff -u -r 1.8.2.25 -r 1.8.2.26 src/headerview.c;  cvs diff -u -r 1.96.2.186 -r 1.96.2.187 src/textview.c;  ) > 3.0.2cvs53.patchset
+( cvs diff -u -r 1.1.4.40 -r 1.1.4.41 src/prefs_filtering_action.c;  cvs diff -u -r 1.5.2.23 -r 1.5.2.24 src/gtk/description_window.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/gtk/foldersort.c;  cvs diff -u -r 1.1.2.79 -r 1.1.2.80 src/gtk/quicksearch.c;  ) > 3.0.2cvs54.patchset
diff --git a/configure.ac b/configure.ac
index 7f517e950..2726b693e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=53
+EXTRA_VERSION=54
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/gtk/description_window.c b/src/gtk/description_window.c
index d4e0c8e2d..8cc394680 100644
--- a/src/gtk/description_window.c
+++ b/src/gtk/description_window.c
@@ -162,11 +162,9 @@ static void description_create(DescriptionWindow * dwindow)
 
 	label = gtk_label_new(gettext(dwindow->description));
 	gtk_widget_show(label);
+	gtk_widget_set_size_request(GTK_WIDGET(label), max_width-2, -1);
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
-	gtk_widget_size_request(label, &req);
-	if(req.width > max_width)
-		max_width = req.width + 20;
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
 
 	gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(scrolledwin),
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
index 931f3b392..b2cd3088c 100644
--- a/src/gtk/foldersort.c
+++ b/src/gtk/foldersort.c
@@ -187,8 +187,10 @@ void foldersort_open()
 	gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
 
 	label1 = gtk_label_new(_
-		("Move folders up or down to change the sort order in the folder list."));
+		("Move folders up or down to change the sort order "
+		 "in the folder list."));
 	gtk_widget_show(label1);
+	gtk_widget_set_size_request(GTK_WIDGET(label1), 392, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label1), TRUE);
 	gtk_box_pack_start(GTK_BOX(hbox), label1, FALSE, FALSE, 0);
 
diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c
index d3e566977..baf212e09 100644
--- a/src/gtk/quicksearch.c
+++ b/src/gtk/quicksearch.c
@@ -465,7 +465,7 @@ static DescriptionWindow search_descr = {
 	2,
 	N_("Extended Search"),
 	N_("Extended Search allows the user to define criteria that messages must "
-           "have in order to match and be displayed in the message list.\n\n"
+           "have in order to match and be displayed in the message list.\n"
 	   "The following symbols can be used:"),
 	search_descr_strings
 };
diff --git a/src/prefs_filtering_action.c b/src/prefs_filtering_action.c
index 687f2c78d..79574def3 100644
--- a/src/prefs_filtering_action.c
+++ b/src/prefs_filtering_action.c
@@ -1249,7 +1249,7 @@ static DescriptionWindow exec_desc_win = {
         2,
         N_("Filtering Action: 'Execute'"),
 	N_("'Execute' allows you to send a message or message element "
-	   "to an external program or script.\n\n"
+	   "to an external program or script.\n"
 	   "The following symbols can be used:"),
        exec_desc_strings
 };