# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190992824 0
# Node ID 56a6d78c661348e0a0f373447dc75cf1715ab714
# Parent  454b2b7b333e879d90794a6bf82e3ff46d0fe06f
applied changes from ff2a2004566a5c90047811f96ab84ebec8402d14
             through 21eb65cc653f96fb176d3c2f9aba336578f53e61

diff -r 454b2b7b333e -r 56a6d78c6613 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Fri Sep 28 15:11:53 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Sep 28 15:20:24 2007 +0000
@@ -4425,7 +4425,7 @@
 	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);
@@ -4553,10 +4553,8 @@
 
 	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);