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.

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"

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"

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"

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 #################*/

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 #################*/

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

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"

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"

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
 

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"

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:
 

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"
 
 

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"

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"
 }