gnucash master: Multiple changes pushed

[Christopher Lam]

Updated	 via  https://github.com/Gnucash/gnucash/commit/89e2bef4 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/89e63ef6 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/abcce500 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6ab7b16d (commit)



commit 89e2bef4279b1e70dd027d61150db2ccc5b15c5d
Merge: 6ab7b16d6 89e63ef67
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Feb 26 13:51:33 2023 +0800

    Merge branch 'maint'


commit 89e63ef67235d231d242f018894295a6cb38cfc3
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sun Feb 26 08:29:56 2023 +0800

    Bug 798754 - Build fails with gcc 13 and glib > 2.76, ter

diff --git a/libgnucash/gnc-module/gnc-module.c b/libgnucash/gnc-module/gnc-module.c
index bef690678..0856c2566 100644
--- a/libgnucash/gnc-module/gnc-module.c
+++ b/libgnucash/gnc-module/gnc-module.c
@@ -107,8 +107,8 @@ gnc_module_system_search_dirs(void)
         case G_SEARCHPATH_SEPARATOR:
             if (!escchar)
             {
-                list = g_list_append(list, token->str);
-                g_string_free(token, TRUE);
+                char *token_str = g_string_free (token, FALSE);
+                list = g_list_append (list, token_str);
                 token = g_string_new(NULL);
             }
             else

commit abcce5000ca72bf943ca8951867729942388848e
Author: Christopher Lam <christopher.lck at gmail.com>
Date:   Sat Feb 25 13:12:35 2023 +0800

    Bug 798754 - Build fails with gcc 13 and glib > 2.76, bis

diff --git a/gnucash/gnome/assistant-loan.cpp b/gnucash/gnome/assistant-loan.cpp
index 580f9d7d5..e529551db 100644
--- a/gnucash/gnome/assistant-loan.cpp
+++ b/gnucash/gnome/assistant-loan.cpp
@@ -1340,8 +1340,7 @@ loan_rep_prep( GtkAssistant *assistant, gpointer user_data )
 
     str = g_string_sized_new( 64 );
     loan_get_pmt_formula( ldd, str);
-    ldd->ld.repAmount = str->str;
-    g_string_free( str, FALSE );
+    ldd->ld.repAmount = g_string_free (str, false);
 
     if ( ldd->ld.repMemo )
         gtk_entry_set_text( ldd->repTxnName, ldd->ld.repMemo );
diff --git a/gnucash/html/gnc-html.c b/gnucash/html/gnc-html.c
index d1f0feecf..c13c2cd39 100644
--- a/gnucash/html/gnc-html.c
+++ b/gnucash/html/gnc-html.c
@@ -768,9 +768,7 @@ gnc_html_encode_string(const char * str)
         pos++;
     }
 
-    ptr = encoded->str;
-
-    g_string_free (encoded, FALSE);
+    ptr = g_string_free (encoded, FALSE);
 
     return (char *)ptr;
 }
@@ -818,8 +816,7 @@ gnc_html_decode_string(const char * str)
         }
         ptr++;
     }
-    ptr = decoded->str;
-    g_string_free (decoded, FALSE);
+    ptr = g_string_free (decoded, FALSE);
 
     return (char *)ptr;
 }
@@ -850,8 +847,7 @@ gnc_html_unescape_newlines(const gchar * in)
     }
 
     g_string_append_c(rv, 0);
-    cstr = rv->str;
-    g_string_free(rv, FALSE);
+    cstr = g_string_free (rv, FALSE);
     return cstr;
 }
 
@@ -874,8 +870,7 @@ gnc_html_escape_newlines(const gchar * in)
         }
     }
     g_string_append_c(escaped, 0);
-    out = escaped->str;
-    g_string_free(escaped, FALSE);
+    out = g_string_free (escaped, FALSE);
     return out;
 }
 
diff --git a/libgnucash/app-utils/file-utils.c b/libgnucash/app-utils/file-utils.c
index f61e21f5b..52f910d33 100644
--- a/libgnucash/app-utils/file-utils.c
+++ b/libgnucash/app-utils/file-utils.c
@@ -152,8 +152,7 @@ gnc_getline (gchar **line, FILE *file)
     }
 
     len = gs->len;
-    *line = gs->str;
-    g_string_free(gs, FALSE);
+    *line = g_string_free (gs, FALSE);
     return len;
 }
 



Summary of changes:
 gnucash/gnome/assistant-loan.cpp   |  3 +--
 gnucash/html/gnc-html.c            | 13 ++++---------
 libgnucash/app-utils/file-utils.c  |  3 +--
 libgnucash/gnc-module/gnc-module.c |  4 ++--
 4 files changed, 8 insertions(+), 15 deletions(-)