diff --git a/gnucash/gnome-utils/gnc-main-window.cpp b/gnucash/gnome-utils/gnc-main-window.cpp index 897bf3bf53..c38f94fc4f 100644 --- a/gnucash/gnome-utils/gnc-main-window.cpp +++ b/gnucash/gnome-utils/gnc-main-window.cpp @@ -3992,7 +3992,7 @@ gnc_main_window_update_menu (GncMainWindow *window, GncPluginPage *page, return; gtk_widget_insert_action_group (GTK_WIDGET(window), gnc_plugin_page_get_simple_action_group_name (page), - G_ACTION_GROUP(gnc_plugin_page_get_action_groupb (page))); + G_ACTION_GROUP(gnc_plugin_page_get_action_group (page))); if ((g_strcmp0 (priv->previous_plugin_page_name, plugin_page_actions_group_name) == 0) && diff --git a/gnucash/gnome-utils/gnc-plugin-page.c b/gnucash/gnome-utils/gnc-plugin-page.c index 3cd3f729be..978978abc3 100644 --- a/gnucash/gnome-utils/gnc-plugin-page.c +++ b/gnucash/gnome-utils/gnc-plugin-page.c @@ -1187,20 +1187,8 @@ gnc_plugin_page_set_menu_qualifier (GncPluginPage *page, priv->menu_qualifier = menu_qualifier; } - -/* Retrieve the GtkActionGroup object associated with this page. */ -GtkActionGroup * -gnc_plugin_page_get_action_group(GncPluginPage *page) -{ - GncPluginPagePrivate *priv; - - g_return_val_if_fail (GNC_IS_PLUGIN_PAGE(page), NULL); - - priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page); - return priv->action_group; -} GSimpleActionGroup * -gnc_plugin_page_get_action_groupb (GncPluginPage *page) +gnc_plugin_page_get_action_group (GncPluginPage *page) { GncPluginPagePrivate *priv; @@ -1210,22 +1198,8 @@ gnc_plugin_page_get_action_groupb (GncPluginPage *page) return priv->simple_action_group; } -/* Create the GtkActionGroup object associated with this page. */ -GtkActionGroup * -gnc_plugin_page_create_action_group (GncPluginPage *page, const gchar *group_name) -{ - GncPluginPagePrivate *priv; - GtkActionGroup *group; - - priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page); - group = gtk_action_group_new (group_name); - gtk_action_group_set_translation_domain (group, PROJECT_NAME); - priv->action_group = group; - return group; -} - GSimpleActionGroup * -gnc_plugin_page_create_action_groupb (GncPluginPage *page, const gchar *group_name) +gnc_plugin_page_create_action_group (GncPluginPage *page, const gchar *group_name) { GncPluginPagePrivate *priv = GNC_PLUGIN_PAGE_GET_PRIVATE(page); diff --git a/gnucash/gnome-utils/gnc-plugin-page.h b/gnucash/gnome-utils/gnc-plugin-page.h index 30a64ecf4b..bf079734b9 100644 --- a/gnucash/gnome-utils/gnc-plugin-page.h +++ b/gnucash/gnome-utils/gnc-plugin-page.h @@ -543,21 +543,20 @@ const gchar * gnc_plugin_page_get_menu_qualifier (GncPluginPage *page); //FIXMEb void gnc_plugin_page_set_menu_qualifier (GncPluginPage *page, const char *menu_qualifier); //FIXMEb added -/** Retrieve the GtkActionGroup object associated with this page. +/** Retrieve the GSimpleActionGroup object associated with this page. * * @param page The page whose menu/toolbar action group should be * retrieved. * - * @return A pointer to the GtkActionGroup object for this page. + * @return A pointer to the GSimpleActionGroup object for this page. */ -GtkActionGroup *gnc_plugin_page_get_action_group (GncPluginPage *page); -GSimpleActionGroup *gnc_plugin_page_get_action_groupb (GncPluginPage *page); //FIXMEb added +GSimpleActionGroup *gnc_plugin_page_get_action_group (GncPluginPage *page); //FIXMEb added GtkAccelGroup *gnc_plugin_page_get_accel_group (GncPluginPage *page); //FIXMEb added -/** Create the GtkActionGroup object associated with this page. +/** Create the GSimpleActionGroup object associated with this page. * * @param page The page whose menu/toolbar action group should be * created. @@ -566,13 +565,12 @@ GtkAccelGroup *gnc_plugin_page_get_accel_group (GncPluginPage *page); //FIXMEb a * name is used to associate key bindings with actions, so it should * be consistent across all pages of the same type. * - * @return A pointer to the newly created GtkActionGroup object for + * @return A pointer to the newly created GSimpleActionGroup object for * this page. */ -GtkActionGroup * gnc_plugin_page_create_action_group (GncPluginPage *page, - const gchar *group_name); -GSimpleActionGroup * gnc_plugin_page_create_action_groupb (GncPluginPage *page, - const gchar *group_name); //FIXMEb added +GSimpleActionGroup * gnc_plugin_page_create_action_group (GncPluginPage *page, + const gchar *group_name); //FIXMEb added + /** Retrieve a GtkAction object associated with this page. * * @param page The page whose menu/toolbar action group should be diff --git a/gnucash/gnome/dialog-sx-editor.c b/gnucash/gnome/dialog-sx-editor.c index d749b4f5ed..e11d96c6c3 100644 --- a/gnucash/gnome/dialog-sx-editor.c +++ b/gnucash/gnome/dialog-sx-editor.c @@ -1369,7 +1369,7 @@ schedXact_editor_create_ledger (GncSxEditorDialog *sxed) gtk_widget_insert_action_group (GTK_WIDGET(sxed->embed_window), gnc_plugin_page_get_simple_action_group_name (sxed->plugin_page), - G_ACTION_GROUP(gnc_plugin_page_get_action_groupb (sxed->plugin_page))); + G_ACTION_GROUP(gnc_plugin_page_get_action_group (sxed->plugin_page))); gnc_plugin_page_register_set_options (sxed->plugin_page, NUM_LEDGER_LINES_DEFAULT, FALSE); diff --git a/gnucash/gnome/gnc-plugin-page-account-tree.c b/gnucash/gnome/gnc-plugin-page-account-tree.c index 3723a3c26a..ecbf1a1566 100644 --- a/gnucash/gnome/gnc-plugin-page-account-tree.c +++ b/gnucash/gnome/gnc-plugin-page-account-tree.c @@ -522,7 +522,7 @@ gnc_plugin_page_account_tree_init (GncPluginPageAccountTree *plugin_page) } /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageAccountTreeActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageAccountTreeActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_account_tree_actions, gnc_plugin_page_account_tree_n_actions, @@ -901,7 +901,7 @@ update_inactive_actions (GncPluginPage *plugin_page) } /* Get the action group */ - simple_action_group = gnc_plugin_page_get_action_groupb (plugin_page); + simple_action_group = gnc_plugin_page_get_action_group (plugin_page); g_return_if_fail (G_IS_SIMPLE_ACTION_GROUP (simple_action_group)); /* Set the action's sensitivity */ diff --git a/gnucash/gnome/gnc-plugin-page-budget.c b/gnucash/gnome/gnc-plugin-page-budget.c index a901c6ff2f..cc739b7705 100644 --- a/gnucash/gnome/gnc-plugin-page-budget.c +++ b/gnucash/gnome/gnc-plugin-page-budget.c @@ -369,7 +369,7 @@ gnc_plugin_page_budget_init (GncPluginPageBudget *plugin_page) gnc_plugin_page_add_book (parent, gnc_get_current_book()); /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageBudgetActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageBudgetActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_budget_actions, gnc_plugin_page_budget_n_actions, diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index a9f6179a71..4496c72000 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -593,7 +593,7 @@ gnc_plugin_page_invoice_init (GncPluginPageInvoice *plugin_page) gnc_plugin_page_add_book (parent, gnc_get_current_book()); /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent,"GncPluginPageInvoiceActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent,"GncPluginPageInvoiceActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_invoice_actions, gnc_plugin_page_invoice_n_actions, @@ -764,7 +764,7 @@ gnc_plugin_page_invoice_update_menus (GncPluginPage *page, gboolean is_posted, g action = gnc_main_window_find_action (window, "FilePrintAction"); g_simple_action_set_enabled (G_SIMPLE_ACTION(action), TRUE); - simple_action_group = gnc_plugin_page_get_action_groupb (page); + simple_action_group = gnc_plugin_page_get_action_group (page); gnc_plugin_update_actions (simple_action_group, posted_actions, "sensitive", is_posted); gnc_plugin_update_actions (simple_action_group, unposted_actions, diff --git a/gnucash/gnome/gnc-plugin-page-owner-tree.c b/gnucash/gnome/gnc-plugin-page-owner-tree.c index 501321b691..add750aa02 100644 --- a/gnucash/gnome/gnc-plugin-page-owner-tree.c +++ b/gnucash/gnome/gnc-plugin-page-owner-tree.c @@ -477,7 +477,7 @@ gnc_plugin_page_owner_tree_init (GncPluginPageOwnerTree *plugin_page) gnc_plugin_page_add_book (parent, gnc_get_current_book()); /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageOwnerTreeActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageOwnerTreeActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_owner_tree_actions, gnc_plugin_page_owner_tree_n_actions, @@ -518,7 +518,7 @@ update_inactive_actions(GncPluginPage *plugin_page) g_return_if_fail(GNC_IS_PLUGIN_PAGE(plugin_page)); /* Get the action group */ - simple_action_group = gnc_plugin_page_get_action_groupb (plugin_page); + simple_action_group = gnc_plugin_page_get_action_group (plugin_page); g_return_if_fail (G_IS_SIMPLE_ACTION_GROUP(simple_action_group)); /* Set the action's sensitivity */ @@ -933,7 +933,7 @@ gnc_plugin_page_owner_tree_selection_changed_cb (GtkTreeSelection *selection, sensitive = (owner != NULL); } - simple_action_group = gnc_plugin_page_get_action_groupb (GNC_PLUGIN_PAGE(page)); + simple_action_group = gnc_plugin_page_get_action_group (GNC_PLUGIN_PAGE(page)); gnc_plugin_update_actions (simple_action_group, actions_requiring_owner_always, "sensitive", sensitive); gnc_plugin_update_actions (simple_action_group, actions_requiring_owner_rw, diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c index ed2b434c82..829f2606f5 100644 --- a/gnucash/gnome/gnc-plugin-page-register.c +++ b/gnucash/gnome/gnc-plugin-page-register.c @@ -869,7 +869,7 @@ gnc_plugin_page_register_init (GncPluginPageRegister* plugin_page) NULL); /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageRegisterActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageRegisterActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_register_actions, gnc_plugin_page_register_n_actions, @@ -1104,11 +1104,11 @@ gnc_plugin_page_register_ui_update (gpointer various, account = gnc_plugin_page_register_get_account (page); - gnc_plugin_update_actions (gnc_plugin_page_get_action_groupb (GNC_PLUGIN_PAGE(page)), + gnc_plugin_update_actions (gnc_plugin_page_get_action_group (GNC_PLUGIN_PAGE(page)), actions_requiring_account, "sensitive", !read_only_reg && account != NULL); - gnc_plugin_update_actions (gnc_plugin_page_get_action_groupb (GNC_PLUGIN_PAGE(page)), + gnc_plugin_update_actions (gnc_plugin_page_get_action_group (GNC_PLUGIN_PAGE(page)), actions_requiring_priced_account, "sensitive", account && xaccAccountIsPriced (account)); @@ -1296,7 +1296,7 @@ gnc_plugin_page_register_ui_initial_state (GncPluginPageRegister* page) account = gnc_plugin_page_register_get_account (page); /* Get the action group */ - simple_action_group = gnc_plugin_page_get_action_groupb (GNC_PLUGIN_PAGE(page)); + simple_action_group = gnc_plugin_page_get_action_group (GNC_PLUGIN_PAGE(page)); g_return_if_fail (G_IS_SIMPLE_ACTION_GROUP(simple_action_group)); gnc_plugin_update_actions (simple_action_group, actions_requiring_account, diff --git a/gnucash/gnome/gnc-plugin-page-report.cpp b/gnucash/gnome/gnc-plugin-page-report.cpp index b34d0168e3..7a71b69194 100644 --- a/gnucash/gnome/gnc-plugin-page-report.cpp +++ b/gnucash/gnome/gnc-plugin-page-report.cpp @@ -1379,7 +1379,7 @@ gnc_plugin_page_report_constr_init (GncPluginPageReport *plugin_page, gint repor gnc_plugin_page_add_book (parent, gnc_get_current_book()); /* Create menu and toolbar information */ - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageReportActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageReportActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), report_actions, num_report_actions, diff --git a/gnucash/gnome/gnc-plugin-page-sx-list.c b/gnucash/gnome/gnc-plugin-page-sx-list.c index 7e77a36d63..55f2b6b40e 100644 --- a/gnucash/gnome/gnc-plugin-page-sx-list.c +++ b/gnucash/gnome/gnc-plugin-page-sx-list.c @@ -256,7 +256,7 @@ gnc_plugin_page_sx_list_init (GncPluginPageSxList *plugin_page) NULL); gnc_plugin_page_add_book (parent, gnc_get_current_book()); - simple_action_group = gnc_plugin_page_create_action_groupb (parent, "GncPluginPageSxListActions"); + simple_action_group = gnc_plugin_page_create_action_group (parent, "GncPluginPageSxListActions"); g_action_map_add_action_entries (G_ACTION_MAP(simple_action_group), gnc_plugin_page_sx_list_actions, gnc_plugin_page_sx_list_n_actions,