From f94b27f9157a96ee3503e7631a317a7cef06471c Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Mon, 23 Dec 2013 20:32:52 +0000 Subject: [PATCH] Prevent account hierarchy assistant from opening a second account hierarchy upon completion git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23600 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome/assistant-hierarchy.c | 7 ++----- src/gnome/dialog-new-user.c | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index 34eeed7c21..7dfc700eeb 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -1160,11 +1160,8 @@ gnc_ui_hierarchy_assistant_with_callback(gboolean use_defaults, } static void -create_account_page(void) +after_assistant(void) { - GncPluginPage *page; - page = gnc_plugin_page_account_tree_new(); - gnc_main_window_open_page(NULL, page); qof_book_mark_session_dirty(gnc_get_current_book()); gnc_ui_file_access_for_save_as(); } @@ -1174,7 +1171,7 @@ gnc_ui_hierarchy_assistant_hook (void) { if (gnc_prefs_get_bool(GNC_PREFS_GROUP, GNC_PREF_SHOW_ON_NEW_FILE)) { - gnc_ui_hierarchy_assistant_with_callback(TRUE, create_account_page); + gnc_ui_hierarchy_assistant_with_callback(TRUE, after_assistant); } } diff --git a/src/gnome/dialog-new-user.c b/src/gnome/dialog-new-user.c index d594b5de72..448989c5c8 100644 --- a/src/gnome/dialog-new-user.c +++ b/src/gnome/dialog-new-user.c @@ -63,13 +63,9 @@ gnc_set_first_startup (gboolean first_startup) static void after_hierarchy_assistant(void) { - GncPluginPage *page; - gncp_new_user_finish (); gnc_set_first_startup (FALSE); - page = gnc_plugin_page_account_tree_new(); - gnc_main_window_open_page(NULL, page); qof_book_mark_session_dirty(gnc_get_current_book()); gnc_ui_file_access_for_save_as(); }