empathy r959 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Apr 17 14:11:02 2008
New Revision: 959
URL: http://svn.gnome.org/viewvc/empathy?rev=959&view=rev

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


Modified:
   trunk/libempathy-gtk/empathy-accounts-dialog.c
   trunk/libempathy-gtk/empathy-spell-dialog.c
   trunk/libempathy-gtk/empathy-theme-boxes.c

Modified: trunk/libempathy-gtk/empathy-accounts-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-accounts-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-accounts-dialog.c	Thu Apr 17 14:11:02 2008
@@ -317,7 +317,8 @@
 		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);
 	}

Modified: trunk/libempathy-gtk/empathy-spell-dialog.c
==============================================================================
--- trunk/libempathy-gtk/empathy-spell-dialog.c	(original)
+++ trunk/libempathy-gtk/empathy-spell-dialog.c	Thu Apr 17 14:11:02 2008
@@ -261,7 +261,7 @@
 
 	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);
 

Modified: trunk/libempathy-gtk/empathy-theme-boxes.c
==============================================================================
--- trunk/libempathy-gtk/empathy-theme-boxes.c	(original)
+++ trunk/libempathy-gtk/empathy-theme-boxes.c	Thu Apr 17 14:11:02 2008
@@ -590,7 +590,7 @@
 				 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,