Mercurial > pidgin.yaz
changeset 688:6b1345121dd3
[gaim-migrate @ 698]
:)
committer: Tailor Script <tailor@pidgin.im>
| author | Eric Warmenhoven <eric@warmenhoven.org> |
|---|---|
| date | Tue, 15 Aug 2000 22:24:04 +0000 |
| parents | 02ef523db170 |
| children | 4e3f5d9cacd5 |
| files | src/conversation.c src/gaim.h |
| diffstat | 2 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/conversation.c Tue Aug 15 22:12:14 2000 +0000 +++ b/src/conversation.c Tue Aug 15 22:24:04 2000 +0000 @@ -406,6 +406,7 @@ } sprintf(c->fontface, "%s", newfont ? (newfont[0] ? newfont : "Helvetica") : "Helvetica"); + c->hasfont = 1; surround(c->entry, pre_fontface, "</FONT>"); gtk_widget_grab_focus(c->entry); @@ -575,7 +576,7 @@ strcpy(buf, buf2); } - if (font_options & OPT_FONT_FACE) { + if ((font_options & OPT_FONT_FACE) || c->hasfont) { g_snprintf(buf2, BUF_LONG, "<FONT FACE=\"%s\">%s</FONT>", c->fontface, buf); strcpy(buf, buf2); } @@ -1589,6 +1590,7 @@ c->link_dialog = NULL; c->log_dialog = NULL; sprintf(c->fontface, "%s", fontface); + c->hasfont = 0; c->bgcol = bgcolor; c->fgcol = fgcolor;
--- a/src/gaim.h Tue Aug 15 22:12:14 2000 +0000 +++ b/src/gaim.h Tue Aug 15 22:24:04 2000 +0000 @@ -276,6 +276,7 @@ GtkWidget *log_dialog; int makesound; char fontface[128]; + int hasfont; int bgcol; int fgcol; @@ -396,7 +397,7 @@ #define TYPE_SIGNOFF 4 #define TYPE_KEEPALIVE 5 -#define REVISION "gaim:$Revision: 697 $" +#define REVISION "gaim:$Revision: 698 $" #define FLAPON "FLAPON\r\n\r\n" #define ROAST "Tic/Toc"