gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/fcce3ec9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/fa318556 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d667cf14 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1170d7b0 (commit)



commit fcce3ec9a4390b8574f510fcb0b663cb3242a4a3
Merge: 1170d7b0d fa3185564
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Sep 16 09:52:17 2021 -0700

    Merge Chris Good's 'maintBug798235RecEndBal' into maint.


commit fa318556400bbe125ff6d356bc19b923522a716b
Author: goodvibes2 <goodchris96 at gmail.com>
Date:   Mon Sep 6 18:26:38 2021 +1000

    Rename 2 non public functions to remove leading gnc_
    
    gnc_start_recn_update_cb is now amount_edit_focus_out_cb and
    gnc_start_recn_date_changed is now recn_date_changed_cb.
    Also add Doxygen comments for amount_edit_focus_out_cb and convert
    recn_date_changed_cb comments to Doxygen format.

diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index 38b1938c9..dd7f7e7b6 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -313,8 +313,21 @@ recnRecalculateBalance (RecnWindow *recnData)
 }
 
 
+/* amount_edit_focus_out_cb
+ *   Callback on focus-out event for statement Ending Balance.
+ *   Sets the user_set_value flag true if the amount entered is
+ *   different to the calculated Ending Balance as at the default
+ *   Statement Date. This prevents the entered Ending Balance
+ *   being recalculated if the Statement Date is changed.
+ *
+ * Args:   widget         - Ending Balance widget
+ *         event          - event triggering this callback
+ *         data           - structure containing info about this
+ *                          reconciliation process.
+ * Returns:  False - propagate the event to the widget's parent.
+ */
 static gboolean
-gnc_start_recn_update_cb(GtkWidget *widget, GdkEventFocus *event,
+amount_edit_focus_out_cb(GtkWidget *widget, GdkEventFocus *event,
                          startRecnWindowData *data)
 {
     gnc_numeric value;
@@ -336,12 +349,19 @@ gnc_start_recn_update_cb(GtkWidget *widget, GdkEventFocus *event,
 }
 
 
-/* If the user changed the date edit widget, update the
- * ending balance to reflect the ending balance of the account
- * on the date that the date edit was changed to.
+/* recn_date_changed_cb
+ *   Callback on date_changed event for Statement Date.
+ *   If the user changed the date edit widget, and the Ending
+ *   Balance wasn't entered, update the Ending Balance to reflect
+ *   the ending balance of the account as at Statement Date.
+ *
+ * Args:   widget         - Statement Date edit widget
+ *         data           - structure containing info about this
+ *                          reconciliation.
+ * Returns:  none.
  */
 static void
-gnc_start_recn_date_changed (GtkWidget *widget, startRecnWindowData *data)
+recn_date_changed_cb (GtkWidget *widget, startRecnWindowData *data)
 {
     GNCDateEdit *gde = GNC_DATE_EDIT (widget);
     gnc_numeric new_balance;
@@ -412,7 +432,7 @@ gnc_start_recn_children_changed (GtkWidget *widget, startRecnWindowData *data)
         gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 
     /* Force an update of the ending balance */
-    gnc_start_recn_date_changed (data->date_value, data);
+    recn_date_changed_cb (data->date_value, data);
 }
 
 
@@ -748,7 +768,7 @@ startRecnWindow(GtkWidget *parent, Account *account,
 
         /* need to get a callback on date changes to update the recn balance */
         g_signal_connect ( G_OBJECT (date_value), "date_changed",
-                           G_CALLBACK (gnc_start_recn_date_changed), (gpointer) &data );
+                           G_CALLBACK (recn_date_changed_cb), (gpointer) &data );
 
         print_info.use_symbol = 0;
         gnc_amount_edit_set_print_info (GNC_AMOUNT_EDIT (end_value), print_info);
@@ -760,7 +780,7 @@ startRecnWindow(GtkWidget *parent, Account *account,
         entry = gnc_amount_edit_gtk_entry (GNC_AMOUNT_EDIT (end_value));
         gtk_editable_select_region (GTK_EDITABLE(entry), 0, -1);
         fo_handler_id = g_signal_connect (G_OBJECT(entry), "focus-out-event",
-                                          G_CALLBACK(gnc_start_recn_update_cb),
+                                          G_CALLBACK(amount_edit_focus_out_cb),
                                           (gpointer) &data);
         gtk_entry_set_activates_default(GTK_ENTRY(entry), TRUE);
 

commit d667cf14adfe93d70879b73cc87f4268ebf96e67
Author: goodvibes2 <goodchris96 at gmail.com>
Date:   Thu Sep 2 11:39:15 2021 +1000

    Bug 798235 Reconciliation Ending Balance not recalculated the 2nd and
    
    subsequent times Statement Date is updated.
    This was because at end of gnc_start_recn_date_changed(),
    gnc_start_recn_update_cb() was called when it should not have been.
    
    This caused the user_set_value flag to be set True (indicating statement
    end amount was manually entered - which it wasn't) after the date is
    changed. This causes the ending balance to NOT be recalculated when the
    end date is subsequently changed.

diff --git a/gnucash/gnome/window-reconcile.c b/gnucash/gnome/window-reconcile.c
index 417707228..38b1938c9 100644
--- a/gnucash/gnome/window-reconcile.c
+++ b/gnucash/gnome/window-reconcile.c
@@ -402,8 +402,6 @@ actions on this account. Please double-check this is the date you intended."));
     /* update the amount edit with the amount */
     gnc_amount_edit_set_amount (GNC_AMOUNT_EDIT (data->end_value),
                                 new_balance);
-
-    gnc_start_recn_update_cb (GTK_WIDGET(data->end_value), NULL, data);
 }
 
 



Summary of changes:
 gnucash/gnome/window-reconcile.c | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)