# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1196736644 0
# Node ID 61725f2eb4a6472bbb2554b32d1144c11a3eca5b
# Parent  e9760c22bab57288cd1c83e37a1099a245aa6981# Parent  866e139a79ef558c4aab4db5f566443017b2a417
merge of 'e7865d4ee742f49f097c7f9c5b14b95b1ec15b5e'
     and 'ed1ac2fd1572c0126f1f2890053e45f55d21c48e'

diff -r e9760c22bab5 -r 61725f2eb4a6 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Dec 03 22:57:49 2007 +0000
+++ b/pidgin/gtkconv.c	Tue Dec 04 02:50:44 2007 +0000
@@ -4349,7 +4349,7 @@
 	pad_bottom = gtk_text_view_get_pixels_below_lines(GTK_TEXT_VIEW(gtkconv->entry));
 	pad_inside = gtk_text_view_get_pixels_inside_wrap(GTK_TEXT_VIEW(gtkconv->entry));
 
-	height = (oneline.height + pad_top + pad_bottom) * lines;
+	height = (oneline.height + pad_top + pad_bottom) * (lines + 1);
 	height += (oneline.height + pad_inside) * (wrapped_lines - lines);
 
 	gtkconv->auto_resize = TRUE;
@@ -7817,7 +7817,7 @@
 		} styles[] = {
 			{"pidgin_tab_label_typing_default", "tab-label-typing", "#4e9a06"},
 			{"pidgin_tab_label_typed_default", "tab-label-typed", "#c4a000"},
-			{"pidgin_tab_label_attention_default", "tab-label-attention", "#204a87"},
+			{"pidgin_tab_label_attention_default", "tab-label-attention", "#006aff"},
 			{"pidgin_tab_label_unreadchat_default", "tab-label-unreadchat", "#cc0000"},
 			{"pidgin_tab_label_event_default", "tab-label-event", "#888a85"},
 			{NULL, NULL, NULL}