Mercurial > pidgin
comparison src/gtkconv.c @ 8690:b3b3384bc1e6
[gaim-migrate @ 9443]
(21:31:24) marv: LSchiere2: i have a patch that fixes the extra new lines for system messages
(21:31:29) LSchiere2: cool
(21:32:43) marv: can i just dcc it to you?
(21:33:09) LSchiere2: can gaim recieve dcc?
(21:33:18) marv: yes
(21:33:20) LSchiere2: then yes
(21:33:27) LSchiere2: oh and i miss the empty line ;-)
(21:34:17) marv: heh
(21:35:16) marv: i could bring it back by popular demand
(21:35:35) marv: or just add a bottom margin
(21:36:10) LSchiere2: what did i just accept? i hate that about file transfer. i always forget the name
(21:36:28) marv: you could turn off clear finished transfers :P
(21:36:34) marv: gtkconv.extranewlines.fixed.diff
(21:36:45) LSchiere2: thanks
committer: Tailor Script <tailor@pidgin.im>
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Sun, 18 Apr 2004 01:37:19 +0000 |
parents | cc2ce209cc46 |
children | 0eb5161ef333 |
comparison
equal
deleted
inserted
replaced
8689:b3eae94bd560 | 8690:b3b3384bc1e6 |
---|---|
4567 mdate, message); | 4567 mdate, message); |
4568 else | 4568 else |
4569 g_snprintf(buf, BUF_LONG, "<B>%s</B>", message); | 4569 g_snprintf(buf, BUF_LONG, "<B>%s</B>", message); |
4570 | 4570 |
4571 g_snprintf(buf2, sizeof(buf2), | 4571 g_snprintf(buf2, sizeof(buf2), |
4572 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT><BR>", | 4572 "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>", |
4573 sml_attrib, mdate, message); | 4573 sml_attrib, mdate, message); |
4574 | 4574 |
4575 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), | 4575 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), |
4576 buf2, 0, images); | 4576 buf2, 0, images); |
4577 | 4577 |
4579 conv->history = g_string_append(conv->history, buf); | 4579 conv->history = g_string_append(conv->history, buf); |
4580 conv->history = g_string_append(conv->history, "<BR>\n"); | 4580 conv->history = g_string_append(conv->history, "<BR>\n"); |
4581 | 4581 |
4582 } else if (flags & GAIM_MESSAGE_NO_LOG) { | 4582 } else if (flags & GAIM_MESSAGE_NO_LOG) { |
4583 g_snprintf(buf, BUF_LONG, | 4583 g_snprintf(buf, BUF_LONG, |
4584 "<B><FONT %s COLOR=\"#777777\">%s</FONT></B><BR>", | 4584 "<B><FONT %s COLOR=\"#777777\">%s</FONT></B>", |
4585 sml_attrib, message); | 4585 sml_attrib, message); |
4586 | 4586 |
4587 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), | 4587 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), |
4588 buf, 0, images); | 4588 buf, 0, images); |
4589 } | 4589 } |
4683 else | 4683 else |
4684 with_font_tag = g_memdup(new_message, length); | 4684 with_font_tag = g_memdup(new_message, length); |
4685 | 4685 |
4686 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), | 4686 gtk_imhtml_append_text_with_images(GTK_IMHTML(gtkconv->imhtml), |
4687 with_font_tag, gtk_font_options, images); | 4687 with_font_tag, gtk_font_options, images); |
4688 | |
4689 //gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", 0); | |
4690 | 4688 |
4691 conv->history = g_string_append(conv->history, buf); | 4689 conv->history = g_string_append(conv->history, buf); |
4692 conv->history = g_string_append(conv->history, new_message); | 4690 conv->history = g_string_append(conv->history, new_message); |
4693 conv->history = g_string_append(conv->history, "<BR>\n"); | 4691 conv->history = g_string_append(conv->history, "<BR>\n"); |
4694 | 4692 |