From 99d8bc14806361f562a107486fad5f2a4045f96f Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Fri, 26 Jan 2001 22:00:23 +0000
Subject: [PATCH] Fix bugs.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@3534 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/gnome/druid-commodity.c | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/gnome/druid-commodity.c b/src/gnome/druid-commodity.c
index f7aa34c81a..b025b4f0b6 100644
--- a/src/gnome/druid-commodity.c
+++ b/src/gnome/druid-commodity.c
@@ -86,6 +86,23 @@ gnc_import_legacy_commodities(const char * filename) {
 }
 
 
+static gboolean
+window_delete_cb(GtkWidget *widget,
+                 GdkEvent  *event,
+                 gpointer  user_data)
+{
+  CommodityDruid *cd = user_data;
+
+  /* unload the current file (can't have out-of-date commodities) */
+  gncFileQuit();
+
+  gnc_ui_commodity_druid_destroy (cd);
+
+  /* Don't delete the window, we'll handle things ourselves. */
+  return TRUE;
+}
+
+
 /********************************************************************
  * gnc_ui_commodity_druid_create()
  ********************************************************************/
@@ -105,6 +122,9 @@ gnc_ui_commodity_druid_create(const char * filename) {
   d->window = create_New_Commodity_Format_Druid();
   dobj = GTK_OBJECT(d->window);
 
+  gtk_signal_connect (dobj, "delete_event",
+                      GTK_SIGNAL_FUNC (window_delete_cb), d);
+
   d->druid           = gtk_object_get_data(dobj, "commodity_druid");
   d->intro_page      = gtk_object_get_data(dobj, "start_page");
   d->finish_page     = gtk_object_get_data(dobj, "finish_page");
@@ -294,13 +314,17 @@ gnc_ui_commodity_druid_destroy(CommodityDruid * cd) {
 
   GList * p;
   CommodityDruidPage * cdp;
-  
+
+  /* remove the old commodities no matter how we exit */
+  gnc_commodity_table_delete_namespace(gnc_engine_commodities(),
+                                       GNC_COMMODITY_NS_LEGACY);
+
   for(p=cd->pages; p; p=p->next) {
     cdp = (CommodityDruidPage *)p->data;
     g_free(cdp->old_name);
     g_free(cdp);
   }
-  
+
   g_list_free(cd->pages);
   g_hash_table_destroy(cd->new_map);
   g_hash_table_destroy(cd->old_map);
@@ -323,6 +347,7 @@ gnc_ui_commodity_druid_cancel_cb(GnomeDruidPage * page, gpointer druid,
   CommodityDruid * cd = 
     (CommodityDruid *)gtk_object_get_data(GTK_OBJECT(user_data),
                                           "commodity_druid_struct");
+
   /* unload the current file (can't have out-of-date commodities) */
   gncFileQuit();
 
@@ -418,9 +443,6 @@ gnc_ui_commodity_druid_finish_cb(GnomeDruidPage * page, gpointer druid,
    * replace the account commodity pointers */
   g_hash_table_foreach(cd->new_map, &finish_helper, (gpointer)cd);
 
-  gnc_commodity_table_delete_namespace(gnc_engine_commodities(),
-                                       GNC_COMMODITY_NS_LEGACY);
-
   /* destroy the dialog */
   gnc_ui_commodity_druid_destroy(cd);
 }