comparison src/conversation.c @ 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 c7c0d2590681
comparison
equal deleted inserted replaced
687:02ef523db170 688:6b1345121dd3
404 alloc--; 404 alloc--;
405 pre_fontface = "<FONT FACE=\"Helvetica\">"; 405 pre_fontface = "<FONT FACE=\"Helvetica\">";
406 } 406 }
407 407
408 sprintf(c->fontface, "%s", newfont ? (newfont[0] ? newfont : "Helvetica") : "Helvetica"); 408 sprintf(c->fontface, "%s", newfont ? (newfont[0] ? newfont : "Helvetica") : "Helvetica");
409 c->hasfont = 1;
409 surround(c->entry, pre_fontface, "</FONT>"); 410 surround(c->entry, pre_fontface, "</FONT>");
410 gtk_widget_grab_focus(c->entry); 411 gtk_widget_grab_focus(c->entry);
411 412
412 if (alloc) 413 if (alloc)
413 g_free(pre_fontface); 414 g_free(pre_fontface);
573 if (font_options & OPT_FONT_STRIKE) { 574 if (font_options & OPT_FONT_STRIKE) {
574 g_snprintf(buf2, BUF_LONG, "<STRIKE>%s</STRIKE>", buf); 575 g_snprintf(buf2, BUF_LONG, "<STRIKE>%s</STRIKE>", buf);
575 strcpy(buf, buf2); 576 strcpy(buf, buf2);
576 } 577 }
577 578
578 if (font_options & OPT_FONT_FACE) { 579 if ((font_options & OPT_FONT_FACE) || c->hasfont) {
579 g_snprintf(buf2, BUF_LONG, "<FONT FACE=\"%s\">%s</FONT>", c->fontface, buf); 580 g_snprintf(buf2, BUF_LONG, "<FONT FACE=\"%s\">%s</FONT>", c->fontface, buf);
580 strcpy(buf, buf2); 581 strcpy(buf, buf2);
581 } 582 }
582 583
583 if (font_options & OPT_FONT_FGCOL) { 584 if (font_options & OPT_FONT_FGCOL) {
1587 c->color_dialog = NULL; 1588 c->color_dialog = NULL;
1588 c->smiley_dialog = NULL; 1589 c->smiley_dialog = NULL;
1589 c->link_dialog = NULL; 1590 c->link_dialog = NULL;
1590 c->log_dialog = NULL; 1591 c->log_dialog = NULL;
1591 sprintf(c->fontface, "%s", fontface); 1592 sprintf(c->fontface, "%s", fontface);
1593 c->hasfont = 0;
1592 c->bgcol = bgcolor; 1594 c->bgcol = bgcolor;
1593 c->fgcol = fgcolor; 1595 c->fgcol = fgcolor;
1594 1596
1595 gtk_container_add(GTK_CONTAINER(win), paned); 1597 gtk_container_add(GTK_CONTAINER(win), paned);
1596 gtk_container_border_width(GTK_CONTAINER(win), 10); 1598 gtk_container_border_width(GTK_CONTAINER(win), 10);