gnome-keyring r1580 - in trunk: . daemon/ui

[mboman svn gnome org]

Author: mboman
Date: Sat Feb 14 06:29:03 2009
New Revision: 1580
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1580&view=rev

Log:
Correctly escape markup

Modified:
   trunk/ChangeLog
   trunk/daemon/ui/gkr-ask-tool.c

Modified: trunk/daemon/ui/gkr-ask-tool.c
==============================================================================
--- trunk/daemon/ui/gkr-ask-tool.c	(original)
+++ trunk/daemon/ui/gkr-ask-tool.c	Sat Feb 14 06:29:03 2009
@@ -221,8 +221,9 @@
 create_markup (const gchar *primary, const gchar *secondary)
 {
 	/* We're passed markup for both of these */
-	return g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s", 
-	                        primary, secondary ? secondary : "");
+	return g_markup_printf_escaped ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
+					primary, secondary ? secondary : "");
+
 }
 
 static gchar*
@@ -447,9 +448,10 @@
 	g_free (value);
 	g_free (value2);
 	
-	message_widget = GTK_LABEL (gtk_label_new (message));
-	g_free (message);
+	message_widget = GTK_LABEL (gtk_label_new (NULL));
 	gtk_label_set_use_markup (message_widget, TRUE);
+	gtk_label_set_markup (message_widget, message);
+	g_free (message);
 	gtk_misc_set_alignment (GTK_MISC (message_widget), 0.0, 0.5);
 	gtk_label_set_line_wrap (message_widget, TRUE);
 	gtk_label_set_justify (message_widget,