merge of '42e804b6db56c12ddfb2f7307423883bfebf94d3'

Sun, 24 Feb 2008 01:47:42 +0000

author
John Bailey <rekkanoryo@rekkanoryo.org>
date
Sun, 24 Feb 2008 01:47:42 +0000
changeset 22460
1645a2a1b3fb
parent 22458
42e804b6db56 (current diff)
parent 22459
ebbf40e23d64 (diff)
child 22461
845cdf310f86
child 22462
aebf8eeaa9f2

merge of '42e804b6db56c12ddfb2f7307423883bfebf94d3'
and 'ebbf40e23d644fa595f42af8cfa9fbda1f20d01b'

--- a/pidgin/minidialog.c	Fri Feb 22 00:11:25 2008 +0000
+++ b/pidgin/minidialog.c	Sun Feb 24 01:47:42 2008 +0000
@@ -164,7 +164,8 @@
 	priv->idle_destroy_cb_id =
 		g_idle_add((GSourceFunc) idle_destroy_cb, data->mini_dialog);
 
-	data->callback(data->mini_dialog, button, data->user_data);
+	if (data->callback != NULL)
+		data->callback(data->mini_dialog, button, data->user_data);
 
 }
 

mercurial