Mercurial > pidgin.yaz
changeset 20199:56a6d78c6613
applied changes from ff2a2004566a5c90047811f96ab84ebec8402d14
through 21eb65cc653f96fb176d3c2f9aba336578f53e61
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 15:20:24 +0000 |
| parents | 454b2b7b333e |
| children | 440a2d75e976 |
| files | pidgin/gtkconv.c |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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);