changeset 21915:b3240d483fd9

merge of '1f8afab1886606b0936e80a00245ff532d77086f' and '846b73cefc86ff41042181a41f8ceaae6699c1f6'
author Will Thompson <will.thompson@collabora.co.uk>
date Fri, 21 Dec 2007 18:58:59 +0000
parents 6765b2b65d30 (diff) eb2e2585f917 (current diff)
children bff738a70098
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Fri Dec 21 18:57:48 2007 +0000
+++ b/pidgin/gtkblist.c	Fri Dec 21 18:58:59 2007 +0000
@@ -2970,7 +2970,7 @@
 	return FALSE;
 }
 
-static void pidgin_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
+static gboolean pidgin_blist_leave_cb (GtkWidget *w, GdkEventCrossing *e, gpointer n)
 {
 	if (gtkblist->timeout) {
 		g_source_remove(gtkblist->timeout);
@@ -2988,6 +2988,7 @@
 			pidgin_blist_collapse_contact_cb(NULL, gtkblist->mouseover_contact);
 		gtkblist->mouseover_contact = NULL;
 	}
+	return FALSE;
 }
 
 static void