gnucash maint: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/1cac1322 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/05f952db (commit)
	from  https://github.com/Gnucash/gnucash/commit/788c3ee6 (commit)



commit 1cac132214858cb4a10217568c3c8e0d9a71f8cf
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Mon Sep 19 14:17:06 2022 +0800

    [gnc-plugin-page-register] hide toolbar and menu in regular register
    
    Instead of toggling sensitivity according to xaccAccountIsPriced,
    toggle visibility instead.

diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 0719d678b..93eef4203 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -624,12 +624,6 @@ static const gchar* view_style_actions[] =
     NULL
 };
 
-static const gchar* actions_requiring_extra[] =
-{
-    "ActionsStockAssistantAction",
-    NULL
-};
-
 static const gchar* actions_requiring_priced_account[] =
 {
     "ActionsStockAssistantAction",
@@ -1289,11 +1283,10 @@ gnc_plugin_page_register_ui_initial_state (GncPluginPageRegister* page)
     gnc_plugin_update_actions (action_group, actions_requiring_account,
                                "sensitive", is_readwrite && account != NULL);
 
-    gnc_plugin_update_actions (action_group, actions_requiring_extra,
-                               "visible", gnc_prefs_is_extra_enabled ());
-
     gnc_plugin_update_actions (action_group, actions_requiring_priced_account,
-                               "sensitive", account && xaccAccountIsPriced (account));
+                               "visible", account &&
+                               gnc_prefs_is_extra_enabled () &&
+                               xaccAccountIsPriced (account));
 
     /* Set "style" radio button */
     ledger_type = gnc_ledger_display_type (priv->ledger);

commit 05f952dbe83f4718e3145768b30ed4c3b113ed32
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Thu Sep 22 18:10:47 2022 +0800

    [assistant-stock-transaction] use cpp form for struct
    
    ...and remove unused pointer in struct

diff --git a/gnucash/gnome/assistant-stock-transaction.cpp b/gnucash/gnome/assistant-stock-transaction.cpp
index 619f52347..481dc9e6a 100644
--- a/gnucash/gnome/assistant-stock-transaction.cpp
+++ b/gnucash/gnome/assistant-stock-transaction.cpp
@@ -374,10 +374,9 @@ then record the reverse split.")
     }
 };
 
-typedef struct
+struct StockTransactionInfo
 {
     GtkWidget * window;
-    GtkWidget * assistant;
 
     std::optional<TxnTypeVec> txn_types;
     // the following stores date at which the txn_types were set. If
@@ -443,7 +442,7 @@ typedef struct
     GtkWidget * finish_page;
     GtkWidget * finish_split_view;
     GtkWidget * finish_summary;
-} StockTransactionInfo;
+};
 
 
 /******* implementations ***********************************************/



Summary of changes:
 gnucash/gnome/assistant-stock-transaction.cpp |  5 ++---
 gnucash/gnome/gnc-plugin-page-register.c      | 13 +++----------
 2 files changed, 5 insertions(+), 13 deletions(-)