pidgin: 7b8c7827: Fix a null pointer deref (hopefully). I...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 7b8c78270e8505ab07661388a27be78911fe2856
Ancestor: b3c7a4b983fddcec244f9d9146dccc84651acee8
Author: datallah at pidgin.im
Date: 2008-04-16T21:34:38
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7b8c78270e8505ab07661388a27be78911fe2856

Modified files:
        pidgin/gtkblist.c

ChangeLog: 

Fix a null pointer deref (hopefully).  I haven't been able to consistently
recreate this, but I think this is the problem.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	ebf5556bccb8f0cf8ee8069a7b39b2251e50c8db
+++ pidgin/gtkblist.c	95ee66b3fdd31098ade1dcd124dd3e7b85a3797a
@@ -4436,9 +4436,10 @@ static gboolean
 }
 
 static gboolean
-headline_click_callback(gpointer data)
+headline_click_callback(gpointer unused)
 {
-	((GSourceFunc)gtkblist->headline_callback)(gtkblist->headline_data);
+	if (gtkblist->headline_callback)
+		((GSourceFunc) gtkblist->headline_callback)(gtkblist->headline_data);
 	reset_headline(gtkblist);
 	return FALSE;
 }
@@ -4448,7 +4449,7 @@ headline_box_press_cb(GtkWidget *widget,
 {
 	gtk_widget_hide(gtkblist->headline_hbox);
 	if (gtkblist->headline_callback && !headline_hover_close((int)event->x, (int)event->y))
-		g_idle_add((GSourceFunc)headline_click_callback, gtkblist->headline_data);
+		g_idle_add(headline_click_callback, NULL);
 	else {
 		if (gtkblist->headline_destroy)
 			gtkblist->headline_destroy(gtkblist->headline_data);