gnucash maint: Multiple changes pushed

[Robert Fewell]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e21de2fc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/8f667536 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/75cf25c9 (commit)
	from  https://github.com/Gnucash/gnucash/commit/8822476d (commit)



commit e21de2fc5fd26d07119dabaebb0977e85faca6df
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 11 14:29:30 2021 +0000

    Realign source file dialog-find-account.c

diff --git a/gnucash/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c
index c4d1885ec..f92426934 100644
--- a/gnucash/gnome/dialog-find-account.c
+++ b/gnucash/gnome/dialog-find-account.c
@@ -108,7 +108,9 @@ gnc_find_account_dialog_window_destroy_cb (GtkWidget *object, gpointer user_data
 }
 
 static gboolean
-gnc_find_account_dialog_window_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+gnc_find_account_dialog_window_key_press_cb (GtkWidget *widget,
+                                             GdkEventKey *event,
+                                             gpointer user_data)
 {
     FindAccountDialog *facc_dialog = user_data;
 
@@ -375,11 +377,11 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo
                       G_CALLBACK(filter_button_cb), (gpointer)facc_dialog);
 
     button = GTK_WIDGET(gtk_builder_get_object (builder, "jumpto_button"));
-        g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_jump_button_cb), facc_dialog);
+    g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_jump_button_cb), facc_dialog);
     button = GTK_WIDGET(gtk_builder_get_object (builder, "check_button"));
-        g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_check_button_cb), facc_dialog);
+    g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_check_button_cb), facc_dialog);
     button = GTK_WIDGET(gtk_builder_get_object (builder, "close_button"));
-        g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_close_button_cb), facc_dialog);
+    g_signal_connect(button, "clicked", G_CALLBACK(gnc_find_account_dialog_close_button_cb), facc_dialog);
 
     facc_dialog->view = GTK_WIDGET(gtk_builder_get_object (builder, "treeview"));
     g_signal_connect (facc_dialog->view, "row-activated",

commit 8f6675367ebe2c3c00e21a6f6c655a54c6cf8f04
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 11 14:28:16 2021 +0000

    Allow the find account dialog position to be saved when using 'X'

diff --git a/gnucash/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c
index 12dda7af9..c4d1885ec 100644
--- a/gnucash/gnome/dialog-find-account.c
+++ b/gnucash/gnome/dialog-find-account.c
@@ -69,6 +69,18 @@ static QofLogModule log_module = GNC_MOD_GUI;
 
 static void close_handler (gpointer user_data);
 
+static gboolean
+gnc_find_account_dialog_window_delete_event_cb (GtkWidget *widget,
+                                                GdkEvent  *event,
+                                                gpointer   user_data)
+{
+    FindAccountDialog *facc_dialog = user_data;
+    // this cb allows the window size to be saved on closing with the X
+    gnc_save_window_size (GNC_PREFS_GROUP,
+                          GTK_WINDOW(facc_dialog->window));
+    return FALSE;
+}
+
 static void
 gnc_find_account_dialog_window_destroy_cb (GtkWidget *object, gpointer user_data)
 {
@@ -438,6 +450,9 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo
     g_signal_connect (facc_dialog->window, "destroy",
                       G_CALLBACK(gnc_find_account_dialog_window_destroy_cb), facc_dialog);
 
+    g_signal_connect (facc_dialog->window, "delete-event",
+                      G_CALLBACK(gnc_find_account_dialog_window_delete_event_cb), facc_dialog);
+
     g_signal_connect (facc_dialog->window, "key_press_event",
                       G_CALLBACK(gnc_find_account_dialog_window_key_press_cb), facc_dialog);
 

commit 75cf25c9a8680dbf1c1b1557a115b8bd7034d904
Author: Robert Fewell <14uBobIT at gmail.com>
Date:   Thu Mar 11 14:26:50 2021 +0000

    Need to g_free the g_strdup_printf in dialog-find-account.c

diff --git a/gnucash/gnome/dialog-find-account.c b/gnucash/gnome/dialog-find-account.c
index 86e5578fe..12dda7af9 100644
--- a/gnucash/gnome/dialog-find-account.c
+++ b/gnucash/gnome/dialog-find-account.c
@@ -452,13 +452,15 @@ gnc_find_account_dialog_create (GtkWidget *parent, FindAccountDialog *facc_dialo
     if (facc_dialog->account != NULL)
     {
         gchar *sub_full_name = gnc_account_get_full_name (facc_dialog->account);
-        gtk_button_set_label (GTK_BUTTON(facc_dialog->radio_subroot),
-                      /* Translators: %s is a full account name.
-                         This is a label in Search Account from context menu. */
-                              g_strdup_printf (_("Su_b-accounts of '%s'"),
-                              sub_full_name));
+        /* Translators: %s is a full account name.
+           This is a label in Search Account from context menu. */
+        gchar *sub_label = g_strdup_printf (_("Su_b-accounts of '%s'"),
+                                            sub_full_name);
+
+        gtk_button_set_label (GTK_BUTTON(facc_dialog->radio_subroot), sub_label);
 
         g_free (sub_full_name);
+        g_free (sub_label);
 
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(facc_dialog->radio_subroot), TRUE);
     }



Summary of changes:
 gnucash/gnome/dialog-find-account.c | 37 ++++++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 9 deletions(-)