# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1195131317 0
# Node ID f3e3c604ea0ecd567bd338379962d8e639a7b361
# Parent  5123f25788f2b6dd0f9424156efd31c8e1d58a10# Parent  9640d9c80e1e7f57fb7fbb74450a2928bb102b51
merge of '61d876a57f30f4e29a91a8411d259e8aaa4355ea'
     and '8f4c83ded385e01c8c6b04edd91d02dac0c09571'

diff -r 9640d9c80e1e -r f3e3c604ea0e pidgin/minidialog.c
--- a/pidgin/minidialog.c	Thu Nov 15 11:10:24 2007 +0000
+++ b/pidgin/minidialog.c	Thu Nov 15 12:55:17 2007 +0000
@@ -53,6 +53,8 @@
 	GtkLabel *title;
 	GtkLabel *desc;
 	GtkBox *buttons;
+
+	guint idle_destroy_cb_id;
 } PidginMiniDialogPrivate;
 
 #define PIDGIN_MINI_DIALOG_GET_PRIVATE(dialog) \
@@ -118,10 +120,18 @@
                               gpointer user_data)
 {
 	struct _mini_dialog_button_clicked_cb_data *data = user_data;
+	PidginMiniDialogPrivate *priv =
+		PIDGIN_MINI_DIALOG_GET_PRIVATE(data->mini_dialog);
+
+	/* Set up the destruction callback before calling the clicked callback,
+	 * so that if the mini-dialog gets destroyed during the clicked callback
+	 * the idle_destroy_cb is correctly removed by _finalize.
+	 */
+	priv->idle_destroy_cb_id =
+		g_idle_add((GSourceFunc) idle_destroy_cb, data->mini_dialog);
 
 	data->callback(data->mini_dialog, button, data->user_data);
 
-	g_idle_add((GSourceFunc) idle_destroy_cb, data->mini_dialog);
 }
 
 static void
@@ -272,6 +282,9 @@
 	PidginMiniDialog *self = PIDGIN_MINI_DIALOG(object);
 	PidginMiniDialogPrivate *priv = PIDGIN_MINI_DIALOG_GET_PRIVATE(self);
 
+	if (priv->idle_destroy_cb_id)
+		g_source_remove(priv->idle_destroy_cb_id);
+
 	g_free(priv);
 	self->priv = NULL;