Mercurial > pidgin.yaz

diff pidgin/gtkblist.c @ 21945:3fc5862b834a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use the new tooltip functions to draw the tooltips in the conversation window.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 28 Dec 2007 01:38:41 +0000
parents a368ee78a798
children d1f282dbbda1
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Thu Dec 27 16:29:58 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Dec 28 01:38:41 2007 +0000
@@ -2659,8 +2659,6 @@
 		return FALSE;
 
 	style = gtkblist->tipwindow->style;
-	gtk_paint_flat_box(style, gtkblist->tipwindow->window, GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-			NULL, gtkblist->tipwindow, "tooltip", 0, 0, -1, -1);
 
 	max_text_width = 0;
 	max_avatar_width = 0;
@@ -2707,6 +2705,7 @@
 				gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->status_icon,
 				                0, 0, TOOLTIP_BORDER, current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
 		}
+
 		if(td->avatar) {
 			if (dir == GTK_TEXT_DIR_RTL)
 				gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL,
@@ -2717,7 +2716,7 @@
 						current_height, -1 , -1, GDK_RGB_DITHER_NONE, 0, 0);
 		}
 
-		if (!td->avatar_is_prpl_icon)
+		if (!td->avatar_is_prpl_icon && td->prpl_icon)
 			gdk_draw_pixbuf(GDK_DRAWABLE(gtkblist->tipwindow->window), NULL, td->prpl_icon,
 					0, 0,
 					prpl_col,
@@ -2792,6 +2791,11 @@
 	PurpleBlistNode *node = data;
 	int width, height;
 
+	if (gtkblist->tooltipdata) {
+		gtkblist->tipwindow = NULL;
+		pidgin_blist_destroy_tooltip_data();
+	}
+
 	gtkblist->tipwindow = widget;
 	if(PURPLE_BLIST_NODE_IS_CHAT(node) ||
 	   PURPLE_BLIST_NODE_IS_BUDDY(node) ||