# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1170143797 0
# Node ID 20cd2ea47648843b72891d90101f9a8b529482be
# Parent  fdba26a13731b67fe04b259301f51db009df8c72
tooltip tweaks

diff -r fdba26a13731 -r 20cd2ea47648 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Tue Jan 30 07:48:57 2007 +0000
+++ b/pidgin/gtkblist.c	Tue Jan 30 07:56:37 2007 +0000
@@ -2272,11 +2272,12 @@
 	pango_layout_get_size (td->name_layout, &td->name_width, &td->name_height);
 	td->name_width = PANGO_PIXELS(td->name_width) + SMALL_SPACE + PRPL_SIZE;
 	td->name_height = MAX(PANGO_PIXELS(td->name_height), PRPL_SIZE + SMALL_SPACE);
-
+#if 0  /* PRPL Icon as avatar */
 	if(!td->avatar && full) {
 		td->avatar = gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_LARGE);
 		td->avatar_is_prpl_icon = TRUE;
 	}
+#endif
 	td->avatar_width = gdk_pixbuf_get_width(td->avatar);
 	td->avatar_height = gdk_pixbuf_get_height(td->avatar);
 
@@ -2289,6 +2290,7 @@
 	GtkStyle *style;
 	int current_height, max_width;
 	GList *l;
+	int prpl_col = 0;
 
 	if(gtkblist->tooltipdata == NULL)
 		return;
@@ -2304,6 +2306,8 @@
 		max_width = MAX(max_width,
 				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE +
 				MAX(td->width, td->name_width) + SMALL_SPACE + td->avatar_width + TOOLTIP_BORDER);
+		prpl_col = MAX(prpl_col, 
+				TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + td->name_width - PRPL_SIZE);
 	}
 
 	current_height = 12;
@@ -2328,7 +2332,7 @@
 		if (!td->avatar_is_prpl_icon)
 			gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->prpl_icon,
 					0, 0,
-					TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + td->name_width - PRPL_SIZE,
+					prpl_col,
 					current_height + ((td->name_height / 2) - (PRPL_SIZE / 2)),
 					-1 , -1, GDK_RGB_DITHER_NONE, 0, 0);