Revert "Bug 745101 - No warning when quitting with unsaved file"

This reverts commit 568bfa0.
Gnucash · Dec 10, 2015 · c559d28 · c559d28
1 parent 568bfa0
commit c559d28
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 31 deletions.
diff --git a/src/libqof/qof/qofsession.c b/src/libqof/qof/qofsession.c
@@ -96,12 +96,6 @@ unregister_all_providers (void)
     }
 }
 
-#define DEFAULT_BACKEND "xml"
-
-static void
-qof_session_load_backend(QofSession * session, const char * access_method);
-
-
 /* ====================================================================== */
 
 void
@@ -264,7 +258,6 @@ qof_session_init (QofSession *session)
     session->backend = NULL;
     session->lock = 1;
 
-    qof_session_load_backend(session, DEFAULT_BACKEND);
     qof_session_clear_error (session);
 }
 
@@ -362,34 +355,25 @@ qof_session_load_backend(QofSession * session, const char * access_method)
         /* Does this provider handle the desired access method? */
         if (0 == g_ascii_strcasecmp (access_method, prov->access_method))
         {
-            /* If this is a completely new session (that is, not associated with a file or db yet)
-             * go for the default backend and skip further type checking.
-             * This should prevent unintended data loss when a user starts a new book without
-             * going via the hierarchy assistant.
-             * See https://bugzilla.gnome.org/show_bug.cgi?id=745101
-             */
-            if (session->book_id || (0 != g_ascii_strcasecmp (DEFAULT_BACKEND, prov->access_method)))
+            /* More than one backend could provide this
+            access method, check file type compatibility. */
+            type_check = (gboolean (*)(const char*)) prov->check_data_type;
+            if (type_check)
             {
-                /* More than one backend could provide this
-                   access method, check file type compatibility. */
-                type_check = (gboolean (*)(const char*)) prov->check_data_type;
-                if (type_check)
-                {
-                    prov_type = (type_check)(session->book_id);
-                    if (!prov_type)
-                    {
-                        PINFO(" %s not usable", prov->provider_name);
-                        p = p->next;
-                        continue;
-                    }
-                }
-                PINFO (" selected %s", prov->provider_name);
-                if (NULL == prov->backend_new)
+                prov_type = (type_check)(session->book_id);
+                if (!prov_type)
                 {
+                    PINFO(" %s not usable", prov->provider_name);
                     p = p->next;
                     continue;
                 }
             }
+            PINFO (" selected %s", prov->provider_name);
+            if (NULL == prov->backend_new)
+            {
+                p = p->next;
+                continue;
+            }
             /* Use the providers creation callback */
             session->backend = (*(prov->backend_new))();
             session->backend->provider = prov;

diff --git a/src/python/init.py b/src/python/init.py
@@ -24,13 +24,15 @@
     print "test", sys.modules.keys()
     print "test2", dir(_sw_app_utils)
 
-    root = _sw_app_utils.gnc_get_current_root_account()
+root = _sw_app_utils.gnc_get_current_root_account()
 
+if noisy:
     print "test", dir(root), root.__class__
     print "test2", dir(gnucash_core_c)
 
-    acct = Account(instance = root)
+acct = Account(instance = root)
 
+if noisy:
     print "test3", dir(acct)
    #print acct.GetName()
    #print acct.GetBalance()