# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1170290233 0
# Node ID 5551adcf8f976fc4bcd7aacf84af23aee0b84350
# Parent  d2a41819ba6ad76f031525c86aa3b3cdafd87d88
fix overlapping in tooltips w/ large avatars

diff -r d2a41819ba6a -r 5551adcf8f97 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Thu Feb 01 00:30:21 2007 +0000
+++ b/pidgin/gtkblist.c	Thu Feb 01 00:37:13 2007 +0000
@@ -2348,13 +2348,12 @@
 		gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
 				NULL, gtkblist->tipwindow, "tooltip",
 				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height, td->name_layout);
-		current_height += td->name_height;
 
 		gtk_paint_layout (style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, FALSE,
 				NULL, gtkblist->tipwindow, "tooltip",
-				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height, td->layout);
-
-		current_height += td->height + TOOLTIP_BORDER;
+				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE, current_height + td->name_height, td->layout);
+
+		current_height += MAX(td->name_height + td->height, td->avatar_height) + TOOLTIP_BORDER;
 	}
 }