gnucash maint: Bug 797127 - Company name and address in reports not display properly
John Ralls
jralls at code.gnucash.org
Sat Apr 27 18:31:03 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/94bb28d9 (commit)
from https://github.com/Gnucash/gnucash/commit/4d529c02 (commit)
commit 94bb28d9ab823bbc6877a5fcc10a6838bb57c119
Author: John Ralls <jralls at ceridwen.us>
Date: Sat Apr 27 13:23:54 2019 -0700
Bug 797127 - Company name and address in reports not display properly
Ensure that all includes of swig-runtime.h are *followed* by
including guile-mappings.h so that the defines masking
scm_to_utf8_string and scm_from_utf8_string are undone.
diff --git a/gnucash/gnome-utils/gnc-plugin-menu-additions.c b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
index b8d1eff2b..2cc489824 100644
--- a/gnucash/gnome-utils/gnc-plugin-menu-additions.c
+++ b/gnucash/gnome-utils/gnc-plugin-menu-additions.c
@@ -38,6 +38,7 @@
#include <gtk/gtk.h>
#include <string.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "guile-util.h"
#include "gnc-engine.h"
diff --git a/gnucash/gnome/business-options-gnome.c b/gnucash/gnome/business-options-gnome.c
index 9b43335ee..cc058803b 100644
--- a/gnucash/gnome/business-options-gnome.c
+++ b/gnucash/gnome/business-options-gnome.c
@@ -27,6 +27,7 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include <libguile.h>
#include "gnc-ui-util.h"
diff --git a/gnucash/gnome/dialog-price-edit-db.c b/gnucash/gnome/dialog-price-edit-db.c
index ae2ed52f3..29586d9c0 100644
--- a/gnucash/gnome/dialog-price-edit-db.c
+++ b/gnucash/gnome/dialog-price-edit-db.c
@@ -28,7 +28,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <time.h>
#include "dialog-utils.h"
@@ -47,9 +46,10 @@
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "gnc-warnings.h"
+#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "guile-util.h"
#include "engine-helpers-guile.h"
-#include "swig-runtime.h"
#define DIALOG_PRICE_DB_CM_CLASS "dialog-price-edit-db"
diff --git a/gnucash/gnome/gnc-plugin-page-register.c b/gnucash/gnome/gnc-plugin-page-register.c
index 47c7a2ca7..e7d18cde4 100644
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -36,10 +36,10 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-plugin-page-register.h"
/*################## Added for Reg2 #################*/
diff --git a/gnucash/gnome/gnc-plugin-page-register2.c b/gnucash/gnome/gnc-plugin-page-register2.c
index 91d9736c2..41f89ca47 100644
--- a/gnucash/gnome/gnc-plugin-page-register2.c
+++ b/gnucash/gnome/gnc-plugin-page-register2.c
@@ -36,10 +36,10 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-plugin-page-register2.h"
/*################## Added for Reg2 #################*/
diff --git a/gnucash/gnucash-bin.c b/gnucash/gnucash-bin.c
index 16cc3ef7d..12866092f 100644
--- a/gnucash/gnucash-bin.c
+++ b/gnucash/gnucash-bin.c
@@ -55,6 +55,7 @@
#include "gnc-session.h"
#include "engine-helpers-guile.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#ifdef __MINGW32__
#include <Windows.h>
#endif
diff --git a/gnucash/import-export/qif-imp/assistant-qif-import.c b/gnucash/import-export/qif-imp/assistant-qif-import.c
index 4d117a0fa..3e89180cf 100644
--- a/gnucash/import-export/qif-imp/assistant-qif-import.c
+++ b/gnucash/import-export/qif-imp/assistant-qif-import.c
@@ -58,11 +58,10 @@
#include "gnc-plugin-page-account-tree.h"
#include "gnc-prefs.h"
#include "gnc-ui.h"
+#include "swig-runtime.h"
#include "guile-mappings.h"
#include <gfec.h>
-#include "swig-runtime.h"
-
#define ASSISTANT_QIF_IMPORT_CM_CLASS "assistant-qif-import"
#define GNC_PREFS_GROUP "dialogs.import.qif"
#define GNC_PREF_SHOW_DOC "show-doc"
diff --git a/gnucash/report/report-gnome/gnc-plugin-page-report.c b/gnucash/report/report-gnome/gnc-plugin-page-report.c
index 07602873b..2ff828e1e 100644
--- a/gnucash/report/report-gnome/gnc-plugin-page-report.c
+++ b/gnucash/report/report-gnome/gnc-plugin-page-report.c
@@ -71,6 +71,7 @@
#include "option-util.h"
#include "window-report.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "business-options.h"
#include "gnc-icons.h"
#include "print-session.h"
diff --git a/libgnucash/app-utils/business-options.c b/libgnucash/app-utils/business-options.c
index 6e6782b4c..2eb18a416 100644
--- a/libgnucash/app-utils/business-options.c
+++ b/libgnucash/app-utils/business-options.c
@@ -26,6 +26,7 @@
#include "business-options.h"
#include "swig-runtime.h"
+#include "guile-mappings.h"
#define FUNC_NAME G_STRFUNC
diff --git a/libgnucash/app-utils/gnc-helpers.c b/libgnucash/app-utils/gnc-helpers.c
index 219afbb39..302f32cf3 100644
--- a/libgnucash/app-utils/gnc-helpers.c
+++ b/libgnucash/app-utils/gnc-helpers.c
@@ -24,9 +24,9 @@
#include <config.h>
#include <libguile.h>
-#include "guile-mappings.h"
#include <string.h>
#include "swig-runtime.h"
+#include "guile-mappings.h"
#include "gnc-engine.h"
#include "engine-helpers-guile.h"
diff --git a/libgnucash/app-utils/option-util.c b/libgnucash/app-utils/option-util.c
index 802bbad73..3daf522eb 100644
--- a/libgnucash/app-utils/option-util.c
+++ b/libgnucash/app-utils/option-util.c
@@ -32,9 +32,9 @@
#include "glib-helpers.h"
#include "gnc-guile-utils.h"
#include "qof.h"
+#include "swig-runtime.h"
#include "guile-mappings.h"
-#include "swig-runtime.h"
/* TODO:
diff --git a/libgnucash/engine/glib-helpers.c b/libgnucash/engine/glib-helpers.c
index 154b1ddc0..9651c6f09 100644
--- a/libgnucash/engine/glib-helpers.c
+++ b/libgnucash/engine/glib-helpers.c
@@ -27,9 +27,9 @@
#include <string.h>
#include <glib.h>
#include <libguile.h>
+#include "swig-runtime.h"
#include "guile-mappings.h"
#include "gnc-guile-utils.h"
-#include "swig-runtime.h"
#include "glib-helpers.h"
diff --git a/libgnucash/engine/gnc-hooks.c b/libgnucash/engine/gnc-hooks.c
index 51b2b8cfc..a30a2065a 100644
--- a/libgnucash/engine/gnc-hooks.c
+++ b/libgnucash/engine/gnc-hooks.c
@@ -26,8 +26,8 @@
#include <glib.h>
#include <stdio.h>
#include <libguile.h>
-#include <guile-mappings.h>
#include "swig-runtime.h"
+#include <guile-mappings.h>
#include "gnc-hooks.h"
#include "gnc-hooks-scm.h"
#include "gnc-engine.h"
diff --git a/libgnucash/engine/kvp-scm.cpp b/libgnucash/engine/kvp-scm.cpp
index ba7e785af..79d76372c 100644
--- a/libgnucash/engine/kvp-scm.cpp
+++ b/libgnucash/engine/kvp-scm.cpp
@@ -7,11 +7,10 @@ extern "C"
#include <config.h>
#include <qof.h>
-#include "engine-helpers-guile.h"
-
+#include "swig-runtime.h"
#include "guile-mappings.h"
+#include "engine-helpers-guile.h"
#include "gnc-guile-utils.h"
-#include "swig-runtime.h"
#include "kvp-scm.h"
}
Summary of changes:
gnucash/gnome-utils/gnc-plugin-menu-additions.c | 1 +
gnucash/gnome/business-options-gnome.c | 1 +
gnucash/gnome/dialog-price-edit-db.c | 4 ++--
gnucash/gnome/gnc-plugin-page-register.c | 2 +-
gnucash/gnome/gnc-plugin-page-register2.c | 2 +-
gnucash/gnucash-bin.c | 1 +
gnucash/import-export/qif-imp/assistant-qif-import.c | 3 +--
gnucash/report/report-gnome/gnc-plugin-page-report.c | 1 +
libgnucash/app-utils/business-options.c | 1 +
libgnucash/app-utils/gnc-helpers.c | 2 +-
libgnucash/app-utils/option-util.c | 2 +-
libgnucash/engine/glib-helpers.c | 2 +-
libgnucash/engine/gnc-hooks.c | 2 +-
libgnucash/engine/kvp-scm.cpp | 5 ++---
14 files changed, 16 insertions(+), 13 deletions(-)
More information about the gnucash-changes
mailing list