gnumeric r16984 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Sun Nov 30 18:29:56 2008
New Revision: 16984
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16984&view=rev

Log:
2008-11-30  Morten Welinder  <terra gnome org>

	* src/wbc-gtk.c (wbcg_sheet_remove_all): Don't destroy the
	notebook -- we will need it later when we replace a pristine
	workbook with a new.  Fixes #562662.



Modified:
   trunk/ChangeLog
   trunk/src/wbc-gtk.c

Modified: trunk/src/wbc-gtk.c
==============================================================================
--- trunk/src/wbc-gtk.c	(original)
+++ trunk/src/wbc-gtk.c	Sun Nov 30 18:29:56 2008
@@ -1292,7 +1292,7 @@
 	WBCGtk *wbcg = (WBCGtk *)wbc;
 
 	if (wbcg->snotebook != NULL) {
-		GtkWidget *tmp = GTK_WIDGET (wbcg->snotebook);
+		GtkNotebook *tmp = wbcg->snotebook;
 		GList *l, *all = get_all_scgs (wbcg);
 
 		/* Clear notebook to disable updates as focus changes for pages
@@ -1305,11 +1305,14 @@
 		for (l = all; l; l = l->next) {
 			SheetControlGUI *scg = l->data;
 			disconnect_sheet_signals (scg);
+
+			gtk_widget_destroy (GTK_WIDGET (scg->label));
+			gtk_widget_destroy (GTK_WIDGET (scg->table));
 		}
 
 		g_list_free (all);
 
-		gtk_widget_destroy (tmp);
+		wbcg->snotebook = tmp;
 	}
 }