pidgin/pidgin

Merge heads.
release-2.x.y
2014-11-15, Elliott Sales de Andrade
78abe6e4a789
Parents 7d5c6f16095488ce4f534696
Children 14555e001a59
Merge heads.
1 files changed, 3 insertions(+), 2 deletions(-)
  • +3 -2
    libpurple/protocols/irc/irc.c
    • --- a/libpurple/protocols/irc/irc.c Thu Nov 13 19:03:19 2014 -0500
    +++ b/libpurple/protocols/irc/irc.c Sat Nov 15 02:00:24 2014 -0500
    @@ -66,7 +66,7 @@
    {
    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 @@
    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);
    }