changeset 22318:10f9cc2808ec

merge of '7a17d421ad7600c57d0ecdb59f7881de03bf2027' and 'c34575b85d4a4375e63c5bd64126082a708d46f7'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 24 Feb 2008 01:47:42 +0000
parents 6fc8f0c825e0 (current diff) 4345e7aaa7d4 (diff)
children ee7f81391b45 d4998f31bc1a
files
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);
 
 }