From 078d7875d3aef5246dd5c8a6d47154bc964d7f3b Mon Sep 17 00:00:00 2001 From: Robert Fewell <14uBobIT@gmail.com> Date: Fri, 28 Oct 2022 16:36:51 +0100 Subject: [PATCH] Change all references to plugin_class->actionsb Change all references to plugin_class->actionsb and n_actionsb to plugin_class->actions and n_actions --- gnucash/gnome-utils/gnc-plugin-file-history.c | 4 ++-- gnucash/gnome-utils/gnc-plugin-menu-additions.c | 4 ++-- gnucash/gnome-utils/gnc-plugin.c | 2 +- gnucash/gnome-utils/gnc-plugin.h | 8 ++------ gnucash/gnome/gnc-plugin-account-tree.c | 4 ++-- gnucash/gnome/gnc-plugin-basic-commands.c | 4 ++-- gnucash/gnome/gnc-plugin-budget.c | 4 ++-- gnucash/gnome/gnc-plugin-business.c | 6 +++--- gnucash/gnome/gnc-plugin-register.c | 4 ++-- gnucash/gnome/gnc-plugin-report-system.c | 4 ++-- gnucash/import-export/aqb/gnc-plugin-aqbanking.c | 4 ++-- gnucash/import-export/bi-import/gnc-plugin-bi-import.c | 6 +++--- gnucash/import-export/csv-exp/gnc-plugin-csv-export.c | 4 ++-- gnucash/import-export/csv-imp/gnc-plugin-csv-import.c | 4 ++-- .../customer-import/gnc-plugin-customer-import.c | 4 ++-- gnucash/import-export/log-replay/gnc-plugin-log-replay.c | 4 ++-- gnucash/import-export/ofx/gnc-plugin-ofx.c | 4 ++-- gnucash/import-export/qif-imp/gnc-plugin-qif-import.c | 4 ++-- libgnucash/gnc-module/example/gnc-plugin.example.c | 4 ++-- 19 files changed, 39 insertions(+), 43 deletions(-) diff --git a/gnucash/gnome-utils/gnc-plugin-file-history.c b/gnucash/gnome-utils/gnc-plugin-file-history.c index b42726ed85..3116ce5794 100644 --- a/gnucash/gnome-utils/gnc-plugin-file-history.c +++ b/gnucash/gnome-utils/gnc-plugin-file-history.c @@ -575,8 +575,8 @@ gnc_plugin_file_history_class_init (GncPluginFileHistoryClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c index 4cca8b300c..b5303126d1 100644 --- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c +++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c @@ -120,8 +120,8 @@ gnc_plugin_menu_additions_class_init (GncPluginMenuAdditionsClass *klass) plugin_class->add_to_window = gnc_plugin_menu_additions_add_to_window; plugin_class->remove_from_window = gnc_plugin_menu_additions_remove_from_window; plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; } static void diff --git a/gnucash/gnome-utils/gnc-plugin.c b/gnucash/gnome-utils/gnc-plugin.c index 2c103d894d..0229eca6a0 100644 --- a/gnucash/gnome-utils/gnc-plugin.c +++ b/gnucash/gnome-utils/gnc-plugin.c @@ -146,7 +146,7 @@ gnc_plugin_add_to_window (GncPlugin *plugin, DEBUG ("%s: %d actions to merge with gui from %s", klass->actions_name, klass->n_actions, klass->ui_filename); gnc_main_window_merge_actions (window, klass->actions_name, - klass->actionsb, klass->n_actionsb, + klass->actions, klass->n_actions, klass->display_items, klass->n_display_items, klass->ui_updates, klass->ui_filename, plugin); diff --git a/gnucash/gnome-utils/gnc-plugin.h b/gnucash/gnome-utils/gnc-plugin.h index 3e91d7f8fa..eab3e421c8 100644 --- a/gnucash/gnome-utils/gnc-plugin.h +++ b/gnucash/gnome-utils/gnc-plugin.h @@ -119,9 +119,9 @@ typedef struct const gchar *actions_name; /** An array of actions that should automatically be added to * any GnuCash "main" content window that is opened. */ - GActionEntry *actionsb; //FIXMEb added + GActionEntry *actions; //FIXMEb added /** The number of actions in the actions array. */ - guint n_actionsb; //FIXMEb added + guint n_actions; //FIXMEb added /** An array of display items (menu / toolbar entries) */ GncDisplayItem *display_items; //FIXMEb added @@ -131,10 +131,6 @@ typedef struct /** An array of ui updates for the menu model */ const gchar **ui_updates; //FIXMEb added - - GtkActionEntry *actions; - /** The number of actions in the actions array. */ - guint n_actions; /** The relative name of the XML file describing the * menu/toolbar action items. */ const gchar *ui_filename; diff --git a/gnucash/gnome/gnc-plugin-account-tree.c b/gnucash/gnome/gnc-plugin-account-tree.c index 4f392a1894..b9a78b67e5 100644 --- a/gnucash/gnome/gnc-plugin-account-tree.c +++ b/gnucash/gnome/gnc-plugin-account-tree.c @@ -120,8 +120,8 @@ gnc_plugin_account_tree_class_init (GncPluginAccountTreeClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/gnome/gnc-plugin-basic-commands.c b/gnucash/gnome/gnc-plugin-basic-commands.c index d4e6cff6fe..8d1ba7bfeb 100644 --- a/gnucash/gnome/gnc-plugin-basic-commands.c +++ b/gnucash/gnome/gnc-plugin-basic-commands.c @@ -301,8 +301,8 @@ gnc_plugin_basic_commands_class_init (GncPluginBasicCommandsClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/gnome/gnc-plugin-budget.c b/gnucash/gnome/gnc-plugin-budget.c index 36a570251c..5bf1192399 100644 --- a/gnucash/gnome/gnc-plugin-budget.c +++ b/gnucash/gnome/gnc-plugin-budget.c @@ -144,8 +144,8 @@ gnc_plugin_budget_class_init (GncPluginBudgetClass *klass) plugin_class->plugin_name = GNC_PLUGIN_BUDGET_NAME; plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; plugin_class->add_to_window = add_to_window; diff --git a/gnucash/gnome/gnc-plugin-business.c b/gnucash/gnome/gnc-plugin-business.c index bf29abdf04..af2f316e17 100644 --- a/gnucash/gnome/gnc-plugin-business.c +++ b/gnucash/gnome/gnc-plugin-business.c @@ -221,10 +221,10 @@ gnc_plugin_business_class_init (GncPluginBusinessClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; - plugin_class->ui_updates = gnc_plugin_load_ui_items; + plugin_class->ui_updates = gnc_plugin_load_ui_items; } static void diff --git a/gnucash/gnome/gnc-plugin-register.c b/gnucash/gnome/gnc-plugin-register.c index bb0c580e91..9e0b5c715b 100644 --- a/gnucash/gnome/gnc-plugin-register.c +++ b/gnucash/gnome/gnc-plugin-register.c @@ -138,8 +138,8 @@ gnc_plugin_register_class_init (GncPluginRegisterClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/gnome/gnc-plugin-report-system.c b/gnucash/gnome/gnc-plugin-report-system.c index e9d55b61f4..c42a9f6472 100644 --- a/gnucash/gnome/gnc-plugin-report-system.c +++ b/gnucash/gnome/gnc-plugin-report-system.c @@ -94,8 +94,8 @@ gnc_plugin_report_system_class_init (GncPluginReportSystemClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/aqb/gnc-plugin-aqbanking.c b/gnucash/import-export/aqb/gnc-plugin-aqbanking.c index 7fc2caeaae..1d195832b5 100644 --- a/gnucash/import-export/aqb/gnc-plugin-aqbanking.c +++ b/gnucash/import-export/aqb/gnc-plugin-aqbanking.c @@ -167,8 +167,8 @@ gnc_plugin_aqbanking_class_init(GncPluginAqBankingClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; plugin_class->add_to_window = gnc_plugin_aqbanking_add_to_window; diff --git a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c index dd8c60e5ba..88e1d2192b 100644 --- a/gnucash/import-export/bi-import/gnc-plugin-bi-import.c +++ b/gnucash/import-export/bi-import/gnc-plugin-bi-import.c @@ -90,10 +90,10 @@ gnc_plugin_bi_import_class_init (GncPluginbi_importClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; - plugin_class->ui_updates = gnc_plugin_load_ui_items; + plugin_class->ui_updates = gnc_plugin_load_ui_items; } static void diff --git a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c index 85666ca9a8..37e83566f8 100644 --- a/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c +++ b/gnucash/import-export/csv-exp/gnc-plugin-csv-export.c @@ -94,8 +94,8 @@ gnc_plugin_csv_export_class_init (GncPluginCsvExportClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c index c2a08e8993..6a3afdad14 100644 --- a/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c +++ b/gnucash/import-export/csv-imp/gnc-plugin-csv-import.c @@ -93,8 +93,8 @@ gnc_plugin_csv_import_class_init (GncPluginCsvImportClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c index b1886b7a74..e78794031f 100644 --- a/gnucash/import-export/customer-import/gnc-plugin-customer-import.c +++ b/gnucash/import-export/customer-import/gnc-plugin-customer-import.c @@ -90,8 +90,8 @@ gnc_plugin_customer_import_class_init (GncPlugincustomer_importClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c index 5e63e59b8c..526a3e1600 100644 --- a/gnucash/import-export/log-replay/gnc-plugin-log-replay.c +++ b/gnucash/import-export/log-replay/gnc-plugin-log-replay.c @@ -89,8 +89,8 @@ gnc_plugin_log_replay_class_init (GncPluginLogreplayClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/ofx/gnc-plugin-ofx.c b/gnucash/import-export/ofx/gnc-plugin-ofx.c index 61cf493026..4d72b8d978 100644 --- a/gnucash/import-export/ofx/gnc-plugin-ofx.c +++ b/gnucash/import-export/ofx/gnc-plugin-ofx.c @@ -87,8 +87,8 @@ gnc_plugin_ofx_class_init (GncPluginOfxClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c index 3718286272..451cbf9edb 100644 --- a/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c +++ b/gnucash/import-export/qif-imp/gnc-plugin-qif-import.c @@ -89,8 +89,8 @@ gnc_plugin_qif_import_class_init (GncPluginQifImportClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->ui_filename = PLUGIN_UI_FILENAME; plugin_class->ui_updates = gnc_plugin_load_ui_items; } diff --git a/libgnucash/gnc-module/example/gnc-plugin.example.c b/libgnucash/gnc-module/example/gnc-plugin.example.c index 3be4ce1174..491b305e8f 100644 --- a/libgnucash/gnc-module/example/gnc-plugin.example.c +++ b/libgnucash/gnc-module/example/gnc-plugin.example.c @@ -88,8 +88,8 @@ gnc_plugin_example_class_init (GncPluginexampleClass *klass) /* widget addition/removal */ plugin_class->actions_name = PLUGIN_ACTIONS_NAME; - plugin_class->actionsb = gnc_plugin_actions; - plugin_class->n_actionsb = gnc_plugin_n_actions; + plugin_class->actions = gnc_plugin_actions; + plugin_class->n_actions = gnc_plugin_n_actions; plugin_class->display_items = gnc_plugin_display_items; plugin_class->n_display_items = gnc_plugin_n_display_items; plugin_class->ui_filename = PLUGIN_UI_FILENAME;