gaim/gaim

Backporting the log smiley fix from HEAD.
oldstatus
2005-08-16, Richard Laager
de56bc048637
Parents 0d3ccd5c04f4
Children 3b752540e993
Backporting the log smiley fix from HEAD.
2 files changed, 10 insertions(+), 9 deletions(-)
  • +2 -0
    src/gtklog.c
  • +8 -9
    src/log.c
    • --- a/src/gtklog.c Tue Aug 16 11:40:27 2005 -0400
    +++ b/src/gtklog.c Tue Aug 16 13:53:37 2005 -0400
    @@ -198,6 +198,8 @@
    title = title_utf8;
    gtk_window_set_title(GTK_WINDOW(viewer->window), title);
    gtk_imhtml_clear(GTK_IMHTML(viewer->imhtml));
    + gtk_imhtml_set_protocol_name(GTK_IMHTML(viewer->imhtml),
    + gaim_account_get_protocol_name(log->account));
    gtk_imhtml_append_text(GTK_IMHTML(viewer->imhtml), read,
    GTK_IMHTML_NO_COMMENTS | GTK_IMHTML_NO_TITLE | GTK_IMHTML_NO_SCROLL |
    ((flags & GAIM_LOG_READ_NO_NEWLINE) ? GTK_IMHTML_NO_NEWLINE : 0));
    --- a/src/log.c Tue Aug 16 11:40:27 2005 -0400
    +++ b/src/log.c Tue Aug 16 13:53:37 2005 -0400
    @@ -562,7 +562,6 @@
    char *msg_fixed;
    char date[64];
    GaimPlugin *plugin = gaim_find_prpl(gaim_account_get_protocol_id(log->account));
    - const char *prpl_name = plugin->info->name;
    struct generic_logger_data *data = log->logger_data;
    if(!data) {
    @@ -612,18 +611,18 @@
    fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
    } else if (type & GAIM_MESSAGE_RECV) {
    if(gaim_message_meify(msg_fixed, -1))
    - fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
    - date, from, prpl_name, msg_fixed);
    + fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
    + date, from, msg_fixed);
    else
    - fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
    - date, from, prpl_name, msg_fixed);
    + fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
    + date, from, msg_fixed);
    } else if (type & GAIM_MESSAGE_SEND) {
    if(gaim_message_meify(msg_fixed, -1))
    - fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> <font sml=\"%s\">%s</font><br/>\n",
    - date, from, prpl_name, msg_fixed);
    + fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
    + date, from, msg_fixed);
    else
    - fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> <font sml=\"%s\">%s</font><br/>\n",
    - date, from, prpl_name, msg_fixed);
    + fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
    + date, from, msg_fixed);
    }
    }