/pidgin/main: 78abe6e4a789: Merge heads.

Changeset: 78abe6e4a789976ead180939c54659b82b1497f9
Author:	 Elliott Sales de Andrade <[email protected]>
Date:	 2014-11-15 02:00 -0500
Branch:	 release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/78abe6e4a789

Description:

Merge heads.

diffstat:

 libpurple/protocols/irc/irc.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (22 lines):

diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -66,7 +66,7 @@ static void irc_view_motd(PurplePluginAc
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	struct irc_conn *irc;
-	char *title;
+	char *title, *body;
 
 	if (gc == NULL || gc->proto_data == NULL) {
 		purple_debug(PURPLE_DEBUG_ERROR, "irc", "got MOTD request for NULL gc\n");
@@ -79,7 +79,8 @@ static void irc_view_motd(PurplePluginAc
 		return;
 	}
 	title = g_strdup_printf(_("MOTD for %s"), irc->server);
-	purple_notify_formatted(gc, title, title, NULL, irc->motd->str, NULL, NULL);
+	body = g_strdup_printf("<span style=\"font-family: monospace;\">%s</span>", irc->motd->str);
+	purple_notify_formatted(gc, title, title, NULL, body, NULL, NULL);
 	g_free(title);
 }