gnucash master: Multiple changes pushed

[J. Alex Aycinena]

Updated	 via  https://github.com/Gnucash/gnucash/commit/e814221e (commit)
	 via  https://github.com/Gnucash/gnucash/commit/80705551 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/e9972be9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/207c0145 (commit)
	from  https://github.com/Gnucash/gnucash/commit/de34215e (commit)



commit e814221efc8b4bb844571414e2eb9ee3d83bd9aa
Merge: de34215 8070555
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date:   Mon Feb 23 18:26:47 2015 -0800

    Merge branch 'maint'


commit 80705551aec53e8c91db48b46875873f934eddaa
Author: Alex Aycinena <alex.aycinena at gmail.com>
Date:   Mon Feb 23 18:04:50 2015 -0800

    Correct the number field displayed in the reconcile window to correspond with the source specified in File->Options.

diff --git a/src/gnome/reconcile-view.c b/src/gnome/reconcile-view.c
index 05a1032..120bdef 100644
--- a/src/gnome/reconcile-view.c
+++ b/src/gnome/reconcile-view.c
@@ -31,6 +31,7 @@
 
 #include "gnc-date.h"
 #include "qof.h"
+#include "qofbook.h"
 #include "Transaction.h"
 #include "gnc-ui-util.h"
 #include "gnc-prefs.h"
@@ -354,6 +355,8 @@ gnc_reconcile_view_init (GNCReconcileView *view)
 {
     GNCSearchParam *param;
     GList          *columns = NULL;
+    gboolean num_action =
+                qof_book_use_split_action_for_num_field(gnc_get_current_book());
 
     view->reconciled = g_hash_table_new (NULL, NULL);
     view->account = NULL;
@@ -374,7 +377,12 @@ gnc_reconcile_view_init (GNCReconcileView *view)
     columns = gnc_search_param_prepend (columns, _("Description"), NULL,
                                         GNC_ID_SPLIT, SPLIT_TRANS,
                                         TRANS_DESCRIPTION, NULL);
-    columns = gnc_search_param_prepend_with_justify (columns, _("Num"),
+    columns = num_action ?
+              gnc_search_param_prepend_with_justify (columns, _("Num"),
+              GTK_JUSTIFY_CENTER,
+              NULL, GNC_ID_SPLIT,
+              SPLIT_ACTION, NULL) :
+              gnc_search_param_prepend_with_justify (columns, _("Num"),
               GTK_JUSTIFY_CENTER,
               NULL, GNC_ID_SPLIT,
               SPLIT_TRANS, TRANS_NUM, NULL);

commit e9972be93232f9d4a4a975c741db70ee4f1c63c6
Author: Mike Alexander <mta at umich.edu>
Date:   Mon Feb 23 18:26:45 2015 -0500

    Fix some bugs found by SWIG version 3.0.5.
    Prior to version 3.0.3 SWIG silently ignored invalid preprocessor directives.
    See <https://github.com/swig/swig/issues/217>

diff --git a/src/core-utils/core-utils.i b/src/core-utils/core-utils.i
index 77c05fb..ca200f4 100644
--- a/src/core-utils/core-utils.i
+++ b/src/core-utils/core-utils.i
@@ -77,6 +77,6 @@ const char * gnc_locale_default_iso_currency_code (void);
     return gnc_utf8_validate(str, -1, 0);
   }
 %}
-#elsif defined(SWIGPYTHON)
+#elif defined(SWIGPYTHON)
 gboolean gnc_utf8_validate(const gchar *, gssize, const gchar**);
 #endif
diff --git a/src/engine/business-core.i b/src/engine/business-core.i
index f7331fd..5463461 100644
--- a/src/engine/business-core.i
+++ b/src/engine/business-core.i
@@ -166,7 +166,7 @@ static GncInvoiceList * qof_query_run_for_invoices(QofQuery *q) {
     SET_ENUM("GNC-INVOICE-VEND-CREDIT-NOTE");
     SET_ENUM("GNC-INVOICE-EMPL-CREDIT-NOTE");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }
diff --git a/src/engine/engine.i b/src/engine/engine.i
index 49cfc23..99a1039 100644
--- a/src/engine/engine.i
+++ b/src/engine/engine.i
@@ -355,7 +355,7 @@ KvpValue * kvp_frame_get_slot_path_gslist (KvpFrame *frame, GSList *key_path);
     SET_ENUM("GNC-HOW-RND-ROUND");
     SET_ENUM("GNC-HOW-RND-NEVER");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }
diff --git a/src/html/gnc-html.i b/src/html/gnc-html.i
index d29558d..3c02009 100644
--- a/src/html/gnc-html.i
+++ b/src/html/gnc-html.i
@@ -51,7 +51,7 @@ SCM scm_init_sw_gnc_html_module(void);
     SET_ENUM("URL-TYPE-PRICE");
     SET_ENUM("URL-TYPE-OTHER");
 
-#undefine SET_ENUM
+#undef SET_ENUM
   }
 
 }

commit 207c01453ea52b42a89c37d960b2fa67813a8faa
Author: Geert Janssens <janssens-geert at telenet.be>
Date:   Mon Feb 23 22:57:25 2015 +0100

    Bug 723409 - Incorrect symbol for Turkish lira

diff --git a/src/engine/iso-4217-currencies.xml b/src/engine/iso-4217-currencies.xml
index f20f166..557cbce 100644
--- a/src/engine/iso-4217-currencies.xml
+++ b/src/engine/iso-4217-currencies.xml
@@ -2516,7 +2516,7 @@
   exchange-code="949"
   parts-per-unit="100"
   smallest-fraction="100"
-  local-symbol="₤"
+  local-symbol="₺"
 />
 <!-- "TTD" - "Trinidad and Tobago Dollar"
 -->



Summary of changes:
 src/core-utils/core-utils.i        |  2 +-
 src/engine/business-core.i         |  2 +-
 src/engine/engine.i                |  2 +-
 src/engine/iso-4217-currencies.xml |  2 +-
 src/gnome/reconcile-view.c         | 10 +++++++++-
 src/html/gnc-html.i                |  2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)