[gnumeric] GUI: Fix cell format destruction.

[Morten Welinder <mortenw src gnome org>]

commit 6ab9ccd9b2a9139f24577df0d66c6be6667dfefb
Author: Morten Welinder <terra gnome org>
Date:   Wed Oct 27 15:09:40 2010 -0400

    GUI: Fix cell format destruction.

 src/dialogs/ChangeLog            |    6 +++++-
 src/dialogs/dialog-cell-format.c |    9 +++++++++
 2 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index 2f64e90..fc01a20 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-27  Morten Welinder  <terra gnome org>
+
+	* dialog-cell-format.c (fmt_dialog_impl): Fix destruction.
+
 2010-10-27  Jean Brefort  <jean brefort normalesup org>
 
 	* dialog-stf-csv-page.c (stf_dialog_csv_page_init): add back the text
@@ -9,7 +13,7 @@
 	* dialog-cell-sort.c (dialog_cell_sort_load_sort_setup): set button
 	  sensitivity
 	(dialog_init): move cb_sort_selection_changed to the end
-	
+
 2010-10-24  Jean Brefort  <jean brefort normalesup org>
 
 	* dialog-printer-setup.c: do not destroy the GtkBuilder after intializing
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 3c71f14..bf78800 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -2349,6 +2349,13 @@ cb_fmt_dialog_set_focus (G_GNUC_UNUSED GtkWidget *window,
 		validation_rebuild_validation (state);
 }
 
+static void
+cb_dialog_destroy (GtkDialog *dialog)
+{
+	g_object_set_data (G_OBJECT (dialog), "state", NULL);
+}
+
+
 /* Set initial focus */
 static void
 set_initial_focus (FormatState *s)
@@ -2652,6 +2659,8 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno)
 	wbc_gtk_attach_guru (state->wbcg, GTK_WIDGET (state->dialog));
 	g_object_set_data_full (G_OBJECT (state->dialog),
 		"state", state, (GDestroyNotify)cb_fmt_dialog_dialog_destroy);
+	g_signal_connect (G_OBJECT (dialog), "destroy",
+			  G_CALLBACK (cb_dialog_destroy), NULL);
 
 	gnumeric_restore_window_geometry (GTK_WINDOW (state->dialog),
 					  CELL_FORMAT_KEY);