-----------------------------------------------------------------
Revision: 21eb65cc653f96fb176d3c2f9aba336578f53e61
Ancestor: ff2a2004566a5c90047811f96ab84ebec8402d14
Author: nosnilmot@pidgin.im
Date: 2007-09-18T20:14:55
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

Fix an annoying bug where chat userlist tooltips would show up when the
mouse pointer leaves the conversation window.

============================================================
--- pidgin/gtkconv.c	ae2a582300ca2f4789b9f0981a2884cf2b3f39fc
+++ pidgin/gtkconv.c	981eb411a6aa58d72585ac1d81099e69382582d9
@@ -4490,7 +4490,7 @@ setup_chat_userlist(PidginConversation *
 	g_signal_connect(G_OBJECT(list), "motion-notify-event",
 					 G_CALLBACK(pidgin_userlist_motion_cb), gtkconv);
 	g_signal_connect(G_OBJECT(list), "leave-notify-event",
-					 G_CALLBACK(pidgin_userlist_motion_cb), gtkconv);
+					 G_CALLBACK(pidgin_conv_leave_cb), gtkconv);
 	g_signal_connect(G_OBJECT(list), "popup-menu",
 			 G_CALLBACK(gtkconv_chat_popup_menu_cb), gtkconv);
 	g_signal_connect(G_OBJECT(lbox), "size-allocate", G_CALLBACK(lbox_size_allocate_cb), gtkconv);
@@ -4618,10 +4618,8 @@ pidgin_userlist_tooltip_timeout(PidginCo
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(gtkchat->list));
 
-	gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(gtkchat->list),
-								  tooltip.userlistx, tooltip.userlisty, &path, &column, &x, &y);
-
-	if (path == NULL)
+	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(gtkchat->list),
+								  tooltip.userlistx, tooltip.userlisty, &path, &column, &x, &y))
 		return FALSE;
 
 	gtk_tree_model_get_iter(GTK_TREE_MODEL(model), &iter, path);