gnucash maint: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/490f9a80 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/4eaa10c6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/4e653729 (commit)



commit 490f9a8035d6c204b3ab400c46082e037ba40c48
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 13 16:58:11 2021 -0700

    Change the g_log macro calls to QofLog ones so that they don't go to /dev/null.

diff --git a/bindings/guile/glib-guile.c b/bindings/guile/glib-guile.c
index 31936cbab..6a36178fd 100644
--- a/bindings/guile/glib-guile.c
+++ b/bindings/guile/glib-guile.c
@@ -267,7 +267,7 @@ gnc_spawn_process_async (GList *argl, const gboolean search_path)
     }
     else
     {
-        g_warning ("Could not spawn %s: %s", *argv ? *argv : "(null)",
+        PWARN ("Could not spawn %s: %s", *argv ? *argv : "(null)",
                    error->message ? error->message : "(null)");
         g_free (proc);
         proc = NULL;
@@ -293,7 +293,7 @@ gnc_process_get_fd (const Process *proc, const gint std_fd)
         g_return_val_if_reached (-1);
 
     if (*retptr == -1)
-        g_warning ("Pipe to child's file descriptor %d is -1", std_fd);
+        PWARN ("Pipe to child's file descriptor %d is -1", std_fd);
     return *retptr;
 }
 
@@ -306,21 +306,21 @@ gnc_detach_process (Process *proc, const gboolean kill_it)
     close (proc->fd_stdin);
     if (errno)
     {
-        g_message ("Close of child's stdin (%d) failed: %s", proc->fd_stdin,
+        PINFO ("Close of child's stdin (%d) failed: %s", proc->fd_stdin,
                    g_strerror (errno));
         errno = 0;
     }
     close (proc->fd_stdout);
     if (errno)
     {
-        g_message ("Close of child's stdout (%d) failed: %s", proc->fd_stdout,
+        PINFO ("Close of child's stdout (%d) failed: %s", proc->fd_stdout,
                    g_strerror(errno));
         errno = 0;
     }
     close (proc->fd_stderr);
     if (errno)
     {
-        g_message ("Close of child's stderr (%d) failed: %s", proc->fd_stderr,
+        PINFO ("Close of child's stderr (%d) failed: %s", proc->fd_stderr,
                    g_strerror(errno));
         errno = 0;
     }

commit 4eaa10c6beddaf5babff207b5b80c2b44756a06d
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Apr 13 16:56:55 2021 -0700

    Another extern-C glib.h, for Windows this time.

diff --git a/libgnucash/engine/qof-win32.cpp b/libgnucash/engine/qof-win32.cpp
index dd79ad2cd..2c83e25c3 100644
--- a/libgnucash/engine/qof-win32.cpp
+++ b/libgnucash/engine/qof-win32.cpp
@@ -22,13 +22,14 @@
  */
 
 #ifdef __cplusplus
+#include <glib.h>
+
 extern "C"
 {
 #endif
 
 #include <config.h>
 
-#include <glib.h>
 #include "gnc-date-p.h"
 #include "strptime.h"
 #include <windows.h>



Summary of changes:
 bindings/guile/glib-guile.c     | 10 +++++-----
 libgnucash/engine/qof-win32.cpp |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)