Destroy old query editor before creating new one.

2008-06-28  Christian Neumair  <cneumair@gnome.org>

	* src/nautilus-window-slot.c
	(nautilus_window_slot_update_query_editor):
	Destroy old query editor before creating new one.

svn path=/branches/multiview/; revision=14295

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index dc4f71aeb..ab5c55f24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-06-28  Christian Neumair  <cneumair@gnome.org>
 
+	* src/nautilus-window-slot.c
+	(nautilus_window_slot_update_query_editor):
+	Destroy old query editor before creating new one.
+
+2008-06-28  Christian Neumair  <cneumair@gnome.org>
+
 	* src/nautilus-navigation-window-menus.c (action_new_tab_callback):
 	* src/nautilus-navigation-window.c (hide_temporary_bars),
 	(real_sync_search_widgets),
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 47824c82a..632393f51 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -368,8 +368,10 @@ nautilus_window_slot_update_icon (NautilusWindowSlot *slot)
 void
 nautilus_window_slot_update_query_editor (NautilusWindowSlot *slot)
 {
-	/* at this point, the old query editor must have been destroyed. */
-	g_assert (slot->query_editor == NULL);
+	if (slot->query_editor != NULL) {
+		gtk_widget_destroy (GTK_WIDGET (slot->query_editor));
+		slot->query_editor = NULL;
+	}
 
         EEL_CALL_METHOD (NAUTILUS_WINDOW_SLOT_CLASS, slot,
                          update_query_editor, (slot));