src/gtkconv.c

changeset 10503
6f6f0b990441
parent 10500
b1d1b55682d7
child 10504
eae130eefbfe
equal deleted inserted replaced
10502:fc7c2365aa88 10503:6f6f0b990441
4742 4742
4743 if(gc) 4743 if(gc)
4744 sml_attrib = g_strdup_printf("sml=\"%s\"", 4744 sml_attrib = g_strdup_printf("sml=\"%s\"",
4745 gaim_account_get_protocol_name(conv->account)); 4745 gaim_account_get_protocol_name(conv->account));
4746 4746
4747 gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; 4747 gtk_font_options |= GTK_IMHTML_NO_COMMENTS;
4748 4748
4749 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) 4749 if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting"))
4750 gtk_font_options ^= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES; 4750 gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES;
4751 4751
4752 /* this is gonna crash one day, I can feel it. */ 4752 /* this is gonna crash one day, I can feel it. */
4753 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & 4753 if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options &
4754 OPT_PROTO_USE_POINTSIZE) { 4754 OPT_PROTO_USE_POINTSIZE) {
4755 gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE; 4755 gtk_font_options |= GTK_IMHTML_USE_POINTSIZE;
4756 } 4756 }
4757 4757
4758 if (flags & GAIM_MESSAGE_SYSTEM) { 4758 if (flags & GAIM_MESSAGE_SYSTEM) {
4759 g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s)</FONT> <B>%s</B>", 4759 g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s)</FONT> <B>%s</B>",
4760 mdate, message); 4760 mdate, message);
4761 4761
4762 g_snprintf(buf2, sizeof(buf2), 4762 g_snprintf(buf2, sizeof(buf2),
4763 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", 4763 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
4764 sml_attrib, mdate, message); 4764 sml_attrib, mdate, message);
4765 4765
4766 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0); 4766 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);
4770 conv->history = g_string_append(conv->history, "<BR>\n"); 4770 conv->history = g_string_append(conv->history, "<BR>\n");
4771 4771
4772 } else if (flags & GAIM_MESSAGE_ERROR) { 4772 } else if (flags & GAIM_MESSAGE_ERROR) {
4773 g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"#ff0000\"><FONT SIZE=\"2\">(%s)</FONT> <B>%s</B></FONT>", 4773 g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"#ff0000\"><FONT SIZE=\"2\">(%s)</FONT> <B>%s</B></FONT>",
4774 mdate, message); 4774 mdate, message);
4775 4775
4776 g_snprintf(buf2, sizeof(buf2), 4776 g_snprintf(buf2, sizeof(buf2),
4777 "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>", 4777 "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
4778 sml_attrib, mdate, message); 4778 sml_attrib, mdate, message);
4779 4779
4780 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0); 4780 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, 0);

mercurial