r23612 - gnucash/trunk/src - Revert "Bug 720646 - New Book Tabs on Windows"

[Geert Janssens]

Author: gjanssens
Date: 2013-12-24 12:08:50 -0500 (Tue, 24 Dec 2013)
New Revision: 23612
Trac: http://svn.gnucash.org/trac/changeset/23612

Modified:
   gnucash/trunk/src/gnome-utils/dialog-utils.c
   gnucash/trunk/src/gnome-utils/dialog-utils.h
   gnucash/trunk/src/gnome/assistant-hierarchy.c
   gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c
   gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c
   gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c
   gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
   gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c
Log:
Revert "Bug 720646 - New Book Tabs on Windows"

This reverts commit 5305c7909e701fdbfca4e156d83558b36e3a35d6.

This was incomplete and not meant to be pushed yet.

Modified: gnucash/trunk/src/gnome/assistant-hierarchy.c
===================================================================
--- gnucash/trunk/src/gnome/assistant-hierarchy.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/gnome/assistant-hierarchy.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -460,7 +460,7 @@
     /* 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)
     {

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -578,15 +578,12 @@
  * 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 */

Modified: gnucash/trunk/src/gnome-utils/dialog-utils.h
===================================================================
--- gnucash/trunk/src/gnome-utils/dialog-utils.h	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/gnome-utils/dialog-utils.h	2013-12-24 17:08:50 UTC (rev 23612)
@@ -103,6 +103,6 @@
  * 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 */

Modified: gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c
===================================================================
--- gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/import-export/aqb/gnc-file-aqb-import.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -224,7 +224,7 @@
     /* 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,

Modified: gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/import-export/csv-imp/assistant-csv-account-import.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -437,7 +437,7 @@
     /* 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)
     {

Modified: gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c
===================================================================
--- gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/import-export/csv-imp/assistant-csv-trans-import.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -1445,7 +1445,7 @@
     /* 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 */

Modified: gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c
===================================================================
--- gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/import-export/ofx/gnc-ofx-import.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -901,7 +901,7 @@
          * 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);

Modified: gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c
===================================================================
--- gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c	2013-12-24 17:03:49 UTC (rev 23611)
+++ gnucash/trunk/src/import-export/qif-imp/assistant-qif-import.c	2013-12-24 17:08:50 UTC (rev 23612)
@@ -2996,7 +2996,7 @@
     /* 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();
 }