/pidgin/main: 669cb2286130: Remove "'fontdesc' attribute not all...

[Ankit Vani]

Changeset: 669cb22861306e02c0f8e0f2d0909bce59a5b5e1
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-01 10:57 +0530
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/669cb2286130

Description:

Remove "'fontdesc' attribute not allowed in <span>" warnings
gtk_label_set_markup_with_mnemonic parses _ as a mnemonic in font_desc, and escaping with another _ doesn't work as pango docs suggest.
However, face should work fine as we are only using the font name.

diffstat:

 pidgin/gtkimhtmltoolbar.c  |  2 +-
 pidgin/gtkwebviewtoolbar.c |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -1040,7 +1040,7 @@ static void update_buttons(GtkIMHtmlTool
 	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->font),
 								   (tmp != NULL), toolbar);
 	if (tmp != NULL) {
-		gchar *markup = g_strdup_printf("<span font_desc=\"%s\">%s</span>",
+		gchar *markup = g_strdup_printf("<span face=\"%s\">%s</span>",
 				tmp, gtk_label_get_label(label));
 		gtk_label_set_markup_with_mnemonic(label, markup);
 		g_free(markup);
diff --git a/pidgin/gtkwebviewtoolbar.c b/pidgin/gtkwebviewtoolbar.c
--- a/pidgin/gtkwebviewtoolbar.c
+++ b/pidgin/gtkwebviewtoolbar.c
@@ -1085,7 +1085,7 @@ update_buttons(GtkWebViewToolbar *toolba
 	toggle_action_set_active_block(GTK_TOGGLE_ACTION(priv->font),
 	                               (tmp && *tmp), toolbar);
 	if (tmp && *tmp) {
-		gchar *markup = g_strdup_printf("<span font_desc=\"%s\">%s</span>",
+		gchar *markup = g_strdup_printf("<span face=\"%s\">%s</span>",
 		                                tmp, label);
 		g_free(label);
 		label = markup;