From 07e2106386c527beb768ac0983483c738d1f3f19 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 24 Dec 2013 17:08:50 +0000 Subject: [PATCH] Revert "Bug 720646 - New Book Tabs on Windows" This reverts commit 5305c7909e701fdbfca4e156d83558b36e3a35d6. This was incomplete and not meant to be pushed yet. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23612 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/gnome-utils/dialog-utils.c | 5 +---- src/gnome-utils/dialog-utils.h | 2 +- src/gnome/assistant-hierarchy.c | 2 +- src/import-export/aqb/gnc-file-aqb-import.c | 2 +- src/import-export/csv-imp/assistant-csv-account-import.c | 2 +- src/import-export/csv-imp/assistant-csv-trans-import.c | 2 +- src/import-export/ofx/gnc-ofx-import.c | 2 +- src/import-export/qif-imp/assistant-qif-import.c | 2 +- 8 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/gnome-utils/dialog-utils.c b/src/gnome-utils/dialog-utils.c index 8d847401b5..db947327b6 100644 --- a/src/gnome-utils/dialog-utils.c +++ b/src/gnome-utils/dialog-utils.c @@ -578,15 +578,12 @@ gnc_dialog_run (GtkDialog *dialog, const gchar *pref_name) * imported/entered, since they can affect how transactions are created * Note: This dialog is modal! */ gboolean -gnc_new_book_option_display (GtkWidget *parent) +gnc_new_book_option_display (void) { GtkWidget *window; gint result = GTK_RESPONSE_HELP; window = gnc_book_options_dialog_cb (TRUE, _( "New Book Options")); - if (parent) - gtk_window_set_transient_for (GTK_WINDOW(window), GTK_WINDOW(parent)); - if (window) { /* close dialog and proceed unless help button selected */ diff --git a/src/gnome-utils/dialog-utils.h b/src/gnome-utils/dialog-utils.h index 7c14783cca..381e967248 100644 --- a/src/gnome-utils/dialog-utils.h +++ b/src/gnome-utils/dialog-utils.h @@ -103,6 +103,6 @@ gnc_dialog_run(GtkDialog *dialog, const gchar *pref_key); * dialog so user can specify options, before any transactions can be * imported/entered, since they can affect how transactions are created * Note: This dialog is modal! */ -gboolean gnc_new_book_option_display (GtkWidget *parent); +gboolean gnc_new_book_option_display (void); #endif /* DIALOG_UTILS_H */ diff --git a/src/gnome/assistant-hierarchy.c b/src/gnome/assistant-hierarchy.c index bbe1d10034..7dfc700eeb 100644 --- a/src/gnome/assistant-hierarchy.c +++ b/src/gnome/assistant-hierarchy.c @@ -460,7 +460,7 @@ on_choose_account_categories_prepare (hierarchy_data *data) /* Before creating transactions, if this is a new book, let user specify * book options, since they affect how transactions are created */ if (data->new_book) - data->new_book = gnc_new_book_option_display (data->dialog); + data->new_book = gnc_new_book_option_display (); if (!data->account_list_added) { diff --git a/src/import-export/aqb/gnc-file-aqb-import.c b/src/import-export/aqb/gnc-file-aqb-import.c index 21188ebcf1..d69be026b2 100644 --- a/src/import-export/aqb/gnc-file-aqb-import.c +++ b/src/import-export/aqb/gnc-file-aqb-import.c @@ -224,7 +224,7 @@ gnc_file_aqbanking_import(const gchar *aqbanking_importername, /* Before importing the results, if this is a new book, let user specify * book options, since they affect how transactions are created */ if (gnc_is_new_book()) - gnc_new_book_option_display(gnc_ui_get_toplevel()); + gnc_new_book_option_display(); /* Import the results */ ieci = gnc_ab_import_context(context, AWAIT_TRANSACTIONS, diff --git a/src/import-export/csv-imp/assistant-csv-account-import.c b/src/import-export/csv-imp/assistant-csv-account-import.c index 4fc339878b..83cff6b385 100644 --- a/src/import-export/csv-imp/assistant-csv-account-import.c +++ b/src/import-export/csv-imp/assistant-csv-account-import.c @@ -437,7 +437,7 @@ csv_import_assistant_summary_page_prepare (GtkAssistant *assistant, /* Before creating accounts, if this is a new book, let user specify * book options, since they affect how transactions are created */ if (info->new_book) - info->new_book = gnc_new_book_option_display(info->window); + info->new_book = gnc_new_book_option_display(); if (!g_strcmp0(info->error, "") == 0) { diff --git a/src/import-export/csv-imp/assistant-csv-trans-import.c b/src/import-export/csv-imp/assistant-csv-trans-import.c index 66fd910bae..c78d790cf2 100644 --- a/src/import-export/csv-imp/assistant-csv-trans-import.c +++ b/src/import-export/csv-imp/assistant-csv-trans-import.c @@ -1445,7 +1445,7 @@ csv_import_trans_assistant_match_page_prepare (GtkAssistant *assistant, /* Before creating transactions, if this is a new book, let user specify * book options, since they affect how transactions are created */ if (info->new_book) - info->new_book = gnc_new_book_option_display(info->window); + info->new_book = gnc_new_book_option_display(); /* Create transactions from the parsed data, first time with FALSE Subsequent times with TRUE */ diff --git a/src/import-export/ofx/gnc-ofx-import.c b/src/import-export/ofx/gnc-ofx-import.c index 19b5f64a51..6443a81924 100644 --- a/src/import-export/ofx/gnc-ofx-import.c +++ b/src/import-export/ofx/gnc-ofx-import.c @@ -901,7 +901,7 @@ int ofx_proc_account_cb(struct OfxAccountData data, void * account_user_data) * calling 'gnc_import_select_account', allow the user to set book * options. */ if (new_book) - new_book = gnc_new_book_option_display(gnc_ui_get_toplevel()); + new_book = gnc_new_book_option_display(); gnc_utf8_strip_invalid(data.account_name); gnc_utf8_strip_invalid(data.account_id); diff --git a/src/import-export/qif-imp/assistant-qif-import.c b/src/import-export/qif-imp/assistant-qif-import.c index 5c78ab3a55..76f191075b 100644 --- a/src/import-export/qif-imp/assistant-qif-import.c +++ b/src/import-export/qif-imp/assistant-qif-import.c @@ -2996,7 +2996,7 @@ gnc_ui_qif_import_convert_progress_prepare(GtkAssistant *assistant, /* Before creating transactions, if this is a new book, let user specify * book options, since they affect how transactions are created */ if (wind->new_book) - wind->new_book = gnc_new_book_option_display(wind->window); + wind->new_book = gnc_new_book_option_display(); }