2007-08-26 [wwp] 2.10.0cvs176

	* src/alertpanel.c
	* src/messageview.c
	* src/prefs_actions.c
		Revert parts of 2.10.0cvs174: g_markup_printf_escaped()
		will have to be used when necessary *before* calling
		alertpanel functions.

diff --git a/ChangeLog b/ChangeLog
index 3588465f9c1d1ee52cd2e692106c5b3b655a2c81..85fe5c20815945a455f421be7acdf17639a88b1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-08-26 [wwp]       2.10.0cvs176
+
+       * src/alertpanel.c
+       * src/messageview.c
+       * src/prefs_actions.c
+               Revert parts of 2.10.0cvs174: g_markup_printf_escaped()
+               will have to be used when necessary *before* calling
+               alertpanel functions.
+
 2007-08-25 [paul]      2.10.0cvs175
 
        * src/prefs_actions.c

diff --git a/PATCHSETS b/PATCHSETS
index 7cfe8417ad315613d50a1c1999be1970e0dcd134..cf07fecd95b5a5c1cf63598c0a9ef1cd8a536d5f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2830,3 +2830,4 @@
 ( cvs diff -u -r 1.6.2.15 -r 1.6.2.16 src/common/log.c;  ) > 2.10.0cvs173.patchset
 ( cvs diff -u -r 1.17.2.36 -r 1.17.2.37 src/alertpanel.c;  cvs diff -u -r 1.94.2.147 -r 1.94.2.148 src/messageview.c;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/prefs_actions.c;  cvs diff -u -r 1.6.2.16 -r 1.6.2.17 src/common/log.c;  ) > 2.10.0cvs174.patchset
 ( cvs diff -u -r 1.60.2.49 -r 1.60.2.50 src/prefs_actions.c;  ) > 2.10.0cvs175.patchset
+( cvs diff -u -r 1.17.2.37 -r 1.17.2.38 src/alertpanel.c;  cvs diff -u -r 1.94.2.148 -r 1.94.2.149 src/messageview.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/prefs_actions.c;  ) > 2.10.0cvs176.patchset

diff --git a/configure.ac b/configure.ac
index ffeb9da5da4b5e1fb35e4802e966a2a16faeda26..4828396d0028bf93e2d8af2e73778dddadc8e630 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=175
+EXTRA_VERSION=176
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/alertpanel.c b/src/alertpanel.c
index 5a1d10e0b2075854fafba9e45756bfa610d30adc..2e463e78c4b3e3f56edc223d3524648e415133b0 100644 (file)
--- a/src/alertpanel.c
+++ b/src/alertpanel.c
@@ -243,7 +243,6 @@ static void alertpanel_create(const gchar *title,
        GtkWidget *button3;
        const gchar *label2;
        const gchar *label3;
-       gchar *esc_message;
        gchar *tmp = title?g_markup_printf_escaped("%s", title)
                        :g_strdup("");
        gchar *title_full = g_strdup_printf("<span weight=\"bold\" "
@@ -320,10 +319,8 @@ static void alertpanel_create(const gchar *title,
        if (font_desc)
                gtk_widget_modify_font(label, font_desc);
        g_free(title_full);
-
-       esc_message = g_markup_printf_escaped("%s", message);
-       label = gtk_label_new(esc_message);
-       g_free(esc_message);
+       
+       label = gtk_label_new(message);
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
        gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);

diff --git a/src/messageview.c b/src/messageview.c
index 78d0a5a263345d24c7d8c60853a016bf6b905b18..0f0aa29b4da99f81c62840935172f1bb8c2b2528 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -588,7 +588,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
        if (ok != 0) {
                AlertValue val;
                gchar *message;
-               message = g_strdup_printf(
+               message = g_markup_printf_escaped(
                  _("The notification address to which the return receipt is\n"
                    "to be sent does not correspond to the return path:\n"
                    "Notification address: %s\n"

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 6c1c0f180285b82d9a59d59f995a8f29d66d9727..de45174bf620f9505f4b0553eccc91ca8af1514e 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -568,7 +568,11 @@ static gint prefs_actions_clist_set_row(GtkTreeIter *row)
        }
 
        if (action_get_type(entry_text) == ACTION_ERROR) {
-               alertpanel_error(_("The command\n%s\nhas a syntax error."), entry_text);
+               gchar *message;
+               message = g_markup_printf_escaped(_("The command\n%s\nhas a syntax error."),
+                                               entry_text);
+               alertpanel_error(message);
+               g_free(message);
                return -1;
        }