Escape text in strings using Pango markup. Fixes bug #528529 (Frederic Peters).

svn path=/trunk/; revision=959

diff --git a/libempathy-gtk/empathy-accounts-dialog.c b/libempathy-gtk/empathy-accounts-dialog.c
index be0f67a8ea11ab1056106b99f9af8c12789a6eb6..b57766521ca7dfc88d0dbf9fe94ba91ee1681d1e 100644 (file)
--- a/libempathy-gtk/empathy-accounts-dialog.c
+++ b/libempathy-gtk/empathy-accounts-dialog.c
@@ -317,7 +317,8 @@ accounts_dialog_update_account (EmpathyAccountsDialog *dialog,
                gtk_widget_set_tooltip_text (dialog->image_type,
                                             mc_profile_get_display_name (profile));
 
-               text = g_strdup_printf ("<big><b>%s</b></big>", mc_account_get_display_name (account));
+               text = g_markup_printf_escaped ("<big><b>%s</b></big>",
+                               mc_account_get_display_name (account));
                gtk_label_set_markup (GTK_LABEL (dialog->label_name), text);
                g_free (text);
        }

diff --git a/libempathy-gtk/empathy-spell-dialog.c b/libempathy-gtk/empathy-spell-dialog.c
index 830cfd0fa4f9bd099e10af330ea9d2e81739db03..d7701d19cdf3c139685736bc7c64f378663009db 100644 (file)
--- a/libempathy-gtk/empathy-spell-dialog.c
+++ b/libempathy-gtk/empathy-spell-dialog.c
@@ -261,7 +261,7 @@ empathy_spell_dialog_show (EmpathyChat  *chat,
 
        g_object_unref (gui);
 
-       str = g_strdup_printf ("%s:\n<b>%s</b>",
+       str = g_markup_printf_escaped ("%s:\n<b>%s</b>",
                               _("Suggestions for the word"),
                               word);
 

diff --git a/libempathy-gtk/empathy-theme-boxes.c b/libempathy-gtk/empathy-theme-boxes.c
index 06c35cae8b93df2214ac4767005fd3ea8e8687f3..94f7abaf9fca376d03859a0e01ac4a94b1630a08 100644 (file)
--- a/libempathy-gtk/empathy-theme-boxes.c
+++ b/libempathy-gtk/empathy-theme-boxes.c
@@ -590,7 +590,7 @@ theme_boxes_maybe_append_header (EmpathyTheme        *theme,
                                 G_CALLBACK (table_size_allocate_cb),
                                 box, 0);
 
-       str = g_strdup_printf ("<b>%s</b>", name);
+       str = g_markup_printf_escaped ("<b>%s</b>", name);
 
        label1 = g_object_new (GTK_TYPE_LABEL,
                               "label", str,