From 6d36d1d7eea8aad3182084448b00e8357e5f3aed Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Thu, 26 Jan 2023 13:27:43 -0800
Subject: [PATCH] [asst-stock-trans] Rename primary callbacks to clarify their
 purpose.

---
 gnucash/gnome/assistant-stock-transaction.cpp    | 16 +++++++++-------
 .../gtkbuilder/assistant-stock-transaction.glade |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnucash/gnome/assistant-stock-transaction.cpp b/gnucash/gnome/assistant-stock-transaction.cpp
index ec3e479b3f..84d739cd4c 100644
--- a/gnucash/gnome/assistant-stock-transaction.cpp
+++ b/gnucash/gnome/assistant-stock-transaction.cpp
@@ -48,10 +48,12 @@ static QofLogModule log_module = GNC_MOD_ASSISTANT;
 
 extern "C"
 {
-void stock_assistant_prepare (GtkAssistant  *assistant, GtkWidget *page,
-                              gpointer user_data);
-void stock_assistant_finish  (GtkAssistant *assistant, gpointer user_data);
-void stock_assistant_cancel  (GtkAssistant *gtkassistant, gpointer user_data);
+// These functions are the GtkAssistant primary button callbacks. They're
+// connected to their signals in assistant-stock-transaction.glade.
+void stock_assistant_prepare_cb (GtkAssistant  *assistant, GtkWidget *page,
+                                 gpointer user_data);
+void stock_assistant_finish_cb  (GtkAssistant *assistant, gpointer user_data);
+void stock_assistant_cancel_cb  (GtkAssistant *gtkassistant, gpointer user_data);
 }
 
 enum class FieldMask : unsigned;
@@ -1337,7 +1339,7 @@ controller_capitalize_fees (GtkWidget *widget, StockAssistantController* info)
 }
 
 void
-stock_assistant_prepare (GtkAssistant  *assistant, GtkWidget *page,
+stock_assistant_prepare_cb (GtkAssistant  *assistant, GtkWidget *page,
                          gpointer user_data)
 {
     auto info = static_cast<StockAssistantController*>(user_data);
@@ -1434,7 +1436,7 @@ forward_page_func (gint current_page, StockAssistantController* info)
 }
 
 void
-stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
+stock_assistant_finish_cb (GtkAssistant *assistant, gpointer user_data)
 {
     auto info = static_cast<StockAssistantController*>(user_data);
     g_return_if_fail (info->model->txn_type);
@@ -1447,7 +1449,7 @@ stock_assistant_finish (GtkAssistant *assistant, gpointer user_data)
 
 
 void
-stock_assistant_cancel (GtkAssistant *assistant, gpointer user_data)
+stock_assistant_cancel_cb (GtkAssistant *assistant, gpointer user_data)
 {
     auto info = static_cast<StockAssistantController*>(user_data);
     gnc_close_gui_component_by_data (ASSISTANT_STOCK_TRANSACTION_CM_CLASS, info);
diff --git a/gnucash/gtkbuilder/assistant-stock-transaction.glade b/gnucash/gtkbuilder/assistant-stock-transaction.glade
index 08370ccf4f..013a3f8c3e 100644
--- a/gnucash/gtkbuilder/assistant-stock-transaction.glade
+++ b/gnucash/gtkbuilder/assistant-stock-transaction.glade
@@ -9,9 +9,9 @@
     <property name="title" translatable="yes">Stock Transaction Assistant</property>
     <property name="window-position">center</property>
     <property name="default-width">500</property>
-    <signal name="cancel" handler="stock_assistant_cancel" swapped="no"/>
-    <signal name="close" handler="stock_assistant_finish" swapped="no"/>
-    <signal name="prepare" handler="stock_assistant_prepare" swapped="no"/>
+    <signal name="cancel" handler="stock_assistant_cancel_cb" swapped="no"/>
+    <signal name="close" handler="stock_assistant_finish_cb" swapped="no"/>
+    <signal name="prepare" handler="stock_assistant_prepare_cb" swapped="no"/>
     <child>
       <object class="GtkLabel" id="intro_page_label">
         <property name="visible">True</property>