Mercurial > pidgin
changeset 10503:776586d647e3
[gaim-migrate @ 11795]
These should be like this, right?
But it really doesn't matter, right?
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 11 Jan 2005 02:00:44 +0000 |
parents | 6cd5cca9c451 |
children | 1a97d5e88d12 |
files | src/gtkconv.c src/gtknotify.c |
diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkconv.c Tue Jan 11 00:23:12 2005 +0000 +++ b/src/gtkconv.c Tue Jan 11 02:00:44 2005 +0000 @@ -4744,21 +4744,21 @@ sml_attrib = g_strdup_printf("sml=\"%s\"", gaim_account_get_protocol_name(conv->account)); - gtk_font_options ^= GTK_IMHTML_NO_COMMENTS; + gtk_font_options |= GTK_IMHTML_NO_COMMENTS; if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) - gtk_font_options ^= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES; + gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES; /* this is gonna crash one day, I can feel it. */ if (GAIM_PLUGIN_PROTOCOL_INFO(gaim_find_prpl(gaim_account_get_protocol_id(conv->account)))->options & OPT_PROTO_USE_POINTSIZE) { - gtk_font_options ^= GTK_IMHTML_USE_POINTSIZE; + gtk_font_options |= GTK_IMHTML_USE_POINTSIZE; } if (flags & GAIM_MESSAGE_SYSTEM) { g_snprintf(buf, BUF_LONG, "<FONT SIZE=\"2\">(%s)</FONT> <B>%s</B>", mdate, message); - + g_snprintf(buf2, sizeof(buf2), "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", sml_attrib, mdate, message); @@ -4772,7 +4772,7 @@ } else if (flags & GAIM_MESSAGE_ERROR) { g_snprintf(buf, BUF_LONG, "<FONT COLOR=\"#ff0000\"><FONT SIZE=\"2\">(%s)</FONT> <B>%s</B></FONT>", mdate, message); - + g_snprintf(buf2, sizeof(buf2), "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>", sml_attrib, mdate, message);
--- a/src/gtknotify.c Tue Jan 11 00:23:12 2005 +0000 +++ b/src/gtknotify.c Tue Jan 11 02:00:44 2005 +0000 @@ -401,10 +401,10 @@ if (gaim_prefs_get_bool("/gaim/gtk/conversations/ignore_formatting")) options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES; - options ^= GTK_IMHTML_NO_COMMENTS; - options ^= GTK_IMHTML_NO_TITLE; - options ^= GTK_IMHTML_NO_NEWLINE; - options ^= GTK_IMHTML_NO_SCROLL; + options |= GTK_IMHTML_NO_COMMENTS; + options |= GTK_IMHTML_NO_TITLE; + options |= GTK_IMHTML_NO_NEWLINE; + options |= GTK_IMHTML_NO_SCROLL; /* Make sure URLs are clickable */ linked_text = gaim_markup_linkify(text);