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 9a022e54e3df01303ce09462769c6fba2920581e..08d1622d487658051389b80c7e292e4ea62f13a9 100644 (file)
--- 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 9946beee47f66fd432cfa50939e0e40523dccfa1..d5eaa4b69ed2b0415615fc7d174b304c4bd088bd 100644 (file)
--- 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 a656992f4fb013c7570be163da71ea21c64aaee7..ace2b903ed0c2bf3812d3fae0d0f2b42e97ae121 100644 (file)
--- 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 3692a8ac2ff15b86f5ac93ed49c6f2bed8a7d9a5..1535f1c511eee8248421b8133429d4d070ee5819 100644 (file)
--- 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 3354b350ef48caf965f257e49bcf662c9587e61c..e44716a1f43c429fc6fea269cffba67e4b0ba97f 100644 (file)
--- 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);