pidgin/gtkconv.c

changeset 19055
43f5771c45f4
parent 18970
ef13a2231e36
child 19074
8d9434531b68
equal deleted inserted replaced
19054:1c2d94afac92 19055:43f5771c45f4
5288 5288
5289 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling")) 5289 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling"))
5290 gtk_font_options_all |= GTK_IMHTML_USE_SMOOTHSCROLLING; 5290 gtk_font_options_all |= GTK_IMHTML_USE_SMOOTHSCROLLING;
5291 5291
5292 if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml)))) 5292 if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
5293 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all); 5293 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all | GTK_IMHTML_NO_SCROLL);
5294 5294
5295 /* First message in a conversation. */ 5295 /* First message in a conversation. */
5296 if (gtkconv->newday == 0) 5296 if (gtkconv->newday == 0)
5297 pidgin_conv_calculate_newday(gtkconv, mtime); 5297 pidgin_conv_calculate_newday(gtkconv, mtime);
5298 5298
5476 "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--%s --></FONT>" 5476 "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--%s --></FONT>"
5477 "<B>%s</B></FONT> ", 5477 "<B>%s</B></FONT> ",
5478 color, sml_attrib ? sml_attrib : "", mdate, str); 5478 color, sml_attrib ? sml_attrib : "", mdate, str);
5479 } 5479 }
5480 5480
5481 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all); 5481 gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all | GTK_IMHTML_NO_SCROLL);
5482 5482
5483 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT && 5483 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
5484 !(flags & PURPLE_MESSAGE_SEND)) { 5484 !(flags & PURPLE_MESSAGE_SEND)) {
5485 5485
5486 GtkTextIter start, end; 5486 GtkTextIter start, end;

mercurial