From: Paul Mangan <paul@claws-mail.org>
Date: Tue, 20 Jun 2006 13:04:37 +0000 (+0000)
Subject: 2006-06-20 [paul]	2.3.1cvs2
X-Git-Tag: rel_2_4_0~101
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=674d5bdaac4f2fd512035a475d3ec8b165a87437

2006-06-20 [paul]	2.3.1cvs2

	* src/alertpanel.c
	* src/textview.c
		improve legibility of phishing attempt
		dialog
---

diff --git a/ChangeLog b/ChangeLog
index 9a022e54e..08d1622d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-20 [paul]	2.3.1cvs2
+
+	* src/alertpanel.c
+	* src/textview.c
+		improve legibility of phishing attempt
+		dialog
+
 2006-06-20 [paul]	2.3.1cvs1
 
 	* NEWS
diff --git a/PATCHSETS b/PATCHSETS
index 9946beee4..d5eaa4b69 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1602,3 +1602,4 @@
 ( cvs diff -u -r 1.1.4.42 -r 1.1.4.43 src/etpan/imap-thread.c;  ) > 2.3.0cvs25.patchset
 ( cvs diff -u -r 1.382.2.280 -r 1.382.2.281 src/compose.c;  ) > 2.3.0cvs26.patchset
 ( cvs diff -u -r 1.42.2.12 -r 1.42.2.13 NEWS;  cvs diff -u -r 1.8.2.12 -r 1.8.2.13 README;  cvs diff -u -r 1.654.2.1647 -r 1.654.2.1648 configure.ac;  ) > 2.3.1cvs1.patchset
+( cvs diff -u -r 1.17.2.22 -r 1.17.2.23 src/alertpanel.c;  cvs diff -u -r 1.96.2.117 -r 1.96.2.118 src/textview.c;  ) > 2.3.1cvs2.patchset
diff --git a/configure.ac b/configure.ac
index a656992f4..ace2b903e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/alertpanel.c b/src/alertpanel.c
index 3692a8ac2..1535f1c51 100644
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -316,6 +316,7 @@ static void alertpanel_create(const gchar *title,
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_label_set_selectable(GTK_LABEL(label), TRUE);
+	gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
 	GTK_WIDGET_UNSET_FLAGS(label, GTK_CAN_FOCUS);
 	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
diff --git a/src/textview.c b/src/textview.c
index 3354b350e..e44716a1f 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -2146,12 +2146,16 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
 		gchar *msg;
 		AlertValue aval;
 
-		msg = g_strdup_printf(_("The real URL (%s) is different from\n"
-					"the apparent URL (%s).\n"
-					"\n"
-					"Open it anyway?"),
-				      uri->uri, visible_str);
-		aval = alertpanel_full(_("Fake URL warning"), msg,
+		msg = g_markup_printf_escaped(_("The real URL is different from "
+						"the displayed URL.\n"
+						"\n"
+						"<b>Displayed URL:</b> %s\n"
+						"\n"
+						"<b>Real URL:</b> %s\n"
+						"\n"
+						"Open it anyway?"),
+				       	       visible_str,uri->uri);
+		aval = alertpanel_full(_("Phishing attempt warning"), msg,
 				       GTK_STOCK_CANCEL, _("_Open URL"), NULL, FALSE,
 				       NULL, ALERT_WARNING, G_ALERTDEFAULT);
 		g_free(msg);