gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Jun 4 17:40:14 EDT 2018 

Updated	 via  https://github.com/Gnucash/gnucash/commit/0b10b4b9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b4b16be3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a97f9faf (commit)
	from  https://github.com/Gnucash/gnucash/commit/06808469 (commit)



commit 0b10b4b9ed432e8837ae1551c22956daac9ee3c2
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 4 13:40:53 2018 -0700

    Bug 796423 - Cannot Input Chinese, seems does not work with...
    
    other IME too .
    
    Also Bug 795253 - Have problems input Chinese.
    
    Adds GTK_IM_MODULE_FILE to environment on Macs so that IME is enabled.
    Removes toggling the GtkEntry's editability in
    gnucash_sheet_key_press_event_internal; disabling it killed the preedit
    and that broke IME.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 0d4d2d9..84f764c 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -188,6 +188,7 @@ if (MAC_INTEGRATION)
   file(APPEND ${ENV_FILE_OUT} "FONTCONFIG_FILE={GNC_HOME}/etc/fonts/fonts.conf\n")
   file(APPEND ${ENV_FILE_OUT} "OFX_DTD_PATH={GNC_HOME}/share/libofx/dtd\n")
   file(APPEND ${ENV_FILE_OUT} "GNC_DBD_DIR={SYS_LIB}/dbd\n")
+  file(APPEND ${ENV_FILE_OUT} "GTK_IM_MODULE_FILE={GNC_HOME}/lib/gtk-3.0/3.0.0/immodules.cache\n")
 endif()
 
 file(COPY ${BUILD_ENV_FILE_OUT}
diff --git a/gnucash/register/register-gnome/gnucash-sheet.c b/gnucash/register/register-gnome/gnucash-sheet.c
index 2fd6398..2ba4ad6 100644
--- a/gnucash/register/register-gnome/gnucash-sheet.c
+++ b/gnucash/register/register-gnome/gnucash-sheet.c
@@ -1810,13 +1810,11 @@ gnucash_sheet_key_press_event_internal (GtkWidget *widget, GdkEventKey *event)
     if (pass_on)
     {
         gboolean result = FALSE;
-        gtk_editable_set_editable(GTK_EDITABLE(sheet->entry), TRUE);
 
         // If sheet is readonly, entry is not realized
         if (gtk_widget_get_realized (GTK_WIDGET(sheet->entry)))
             result = gtk_widget_event (sheet->entry, (GdkEvent *) event);
 
-        gtk_editable_set_editable(GTK_EDITABLE(sheet->entry), FALSE);
         return result;
     }
 

commit b4b16be30f6cf346ce580e37dbebf2c6320c38d1
Author: Keve Müller <keve.mueller at gmail.com>
Date:   Mon May 28 12:15:31 2018 +0200

    Small XML related fixes removing ambiguity improving uniformity
    
    acctchrt_common:
    there is a gratituous "i"
    
    acctchrt_full (ja):
    the Retirement and Spouse's retirement accounts have two parents
    (Investment as well as ROOT), removed ROOT.
    
    uk-vat:
    the root account was pasted a line too high 7y ago. all other files have
    the header block continuous

diff --git a/data/accounts/ca/acctchrt_common.gnucash-xea b/data/accounts/ca/acctchrt_common.gnucash-xea
index b24bfa4..9e82663 100644
--- a/data/accounts/ca/acctchrt_common.gnucash-xea
+++ b/data/accounts/ca/acctchrt_common.gnucash-xea
@@ -698,7 +698,7 @@
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Recollida de brossa</act:name>i
+  <act:name>Recollida de brossa</act:name>
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
diff --git a/data/accounts/en_GB/uk-vat.gnucash-xea b/data/accounts/en_GB/uk-vat.gnucash-xea
index 5603576..31bdb59 100644
--- a/data/accounts/en_GB/uk-vat.gnucash-xea
+++ b/data/accounts/en_GB/uk-vat.gnucash-xea
@@ -40,13 +40,13 @@
   <gnc-act:long-description>
     A basic set of accounts for tracking VAT in the UK.
   </gnc-act:long-description>
+  <gnc-act:start-selected>0</gnc-act:start-selected>
   <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
 </gnc:account>
-  <gnc-act:start-selected>0</gnc-act:start-selected>
 <gnc:account version="2.0.0">
   <act:name>Bank Accounts</act:name>
   <act:id type="new">48a242bf9a2d8c947cb41d96493d91da</act:id>
diff --git a/data/accounts/ja/acctchrt_full.gnucash-xea b/data/accounts/ja/acctchrt_full.gnucash-xea
index be7a7b5..535271b 100644
--- a/data/accounts/ja/acctchrt_full.gnucash-xea
+++ b/data/accounts/ja/acctchrt_full.gnucash-xea
@@ -266,7 +266,7 @@
     <cmdty:id>USD</cmdty:id>
   </act:commodity>
   <act:description>個人年金</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
@@ -277,7 +277,6 @@
       <slot:value type="string">確定拠出年金、退職金、IRA、401(k)など</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>債券</act:name>
@@ -332,7 +331,7 @@
     <cmdty:id>USD</cmdty:id>
   </act:commodity>
   <act:description>配偶者個人年金</act:description>
-  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -343,7 +342,6 @@
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
-  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>債券</act:name>

commit a97f9faf919788f0021917696b97b791d2a10370
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Jun 4 13:21:53 2018 -0700

    Revert "Merge Keve Mueller's 'xea-fixes' into maint"
    
    This reverts commit eb67baba5b18dc4eaba7f29bf306e9091a1ff1d7, reversing
    changes made to 0064dafbad30d1146688e7329274cc10714919b3.
    
    Keve Mueller's xea-fixes branch was made from master, so merging it into
    maint effectively merged master onto maint, not something we want to do.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efaf0e5..b8c3998 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,13 @@ enable_testing()
 
 # Version number of gnucash
 set (GNUCASH_MAJOR_VERSION 3)
-set (GNUCASH_MINOR_VERSION 900)
+set (GNUCASH_MINOR_VERSION 1)
 set (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
 set (GNUCASH_LATEST_STABLE_SERIES 3.x)
 
 set (PACKAGE gnucash)
 set (PACKAGE_NAME GnuCash)
-set (PACKAGE_VERSION 3.900)
+set (PACKAGE_VERSION 3.1)
 set (PACKAGE_BUGREPORT gnucash-devel at gnucash.org)
 set (PACKAGE_TARNAME ${PACKAGE})
 set (PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
diff --git a/data/accounts/ca/acctchrt_common.gnucash-xea b/data/accounts/ca/acctchrt_common.gnucash-xea
index 9e82663..b24bfa4 100644
--- a/data/accounts/ca/acctchrt_common.gnucash-xea
+++ b/data/accounts/ca/acctchrt_common.gnucash-xea
@@ -698,7 +698,7 @@
   <act:parent type="new">57635fa5f71dee8ffc207c277250e773</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
-  <act:name>Recollida de brossa</act:name>
+  <act:name>Recollida de brossa</act:name>i
   <act:id type="new">2d0315d7b2f8f11a8a8b32d805bca6eb</act:id>
   <act:type>EXPENSE</act:type>
   <act:commodity>
diff --git a/data/accounts/en_GB/uk-vat.gnucash-xea b/data/accounts/en_GB/uk-vat.gnucash-xea
index 31bdb59..5603576 100644
--- a/data/accounts/en_GB/uk-vat.gnucash-xea
+++ b/data/accounts/en_GB/uk-vat.gnucash-xea
@@ -40,13 +40,13 @@
   <gnc-act:long-description>
     A basic set of accounts for tracking VAT in the UK.
   </gnc-act:long-description>
-  <gnc-act:start-selected>0</gnc-act:start-selected>
   <gnc:account version="2.0.0">
   <act:name>Root Account</act:name>
   <act:id type="new">1972cce2e2364f95b2b0bc014502661d</act:id>
   <act:type>ROOT</act:type>
   <act:commodity-scu>0</act:commodity-scu>
 </gnc:account>
+  <gnc-act:start-selected>0</gnc-act:start-selected>
 <gnc:account version="2.0.0">
   <act:name>Bank Accounts</act:name>
   <act:id type="new">48a242bf9a2d8c947cb41d96493d91da</act:id>
diff --git a/data/accounts/ja/acctchrt_full.gnucash-xea b/data/accounts/ja/acctchrt_full.gnucash-xea
index 535271b..be7a7b5 100644
--- a/data/accounts/ja/acctchrt_full.gnucash-xea
+++ b/data/accounts/ja/acctchrt_full.gnucash-xea
@@ -266,7 +266,7 @@
     <cmdty:id>USD</cmdty:id>
   </act:commodity>
   <act:description>個人年金</act:description>
-  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>placeholder</slot:key>
@@ -277,6 +277,7 @@
       <slot:value type="string">確定拠出年金、退職金、IRA、401(k)など</slot:value>
     </slot>
   </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>債券</act:name>
@@ -331,7 +332,7 @@
     <cmdty:id>USD</cmdty:id>
   </act:commodity>
   <act:description>配偶者個人年金</act:description>
-  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
+  <act:parent type="new">1972cce2e2364f95b2b0bc014502661d</act:parent>
   <act:slots>
     <slot>
       <slot:key>notes</slot:key>
@@ -342,6 +343,7 @@
       <slot:value type="string">true</slot:value>
     </slot>
   </act:slots>
+  <act:parent type="new">0efa7e60042a8d5e4f07a2e6f76bb66d</act:parent>
 </gnc:account>
 <gnc:account version="2.0.0">
   <act:name>債券</act:name>



Summary of changes:
 CMakeLists.txt                                  | 4 ++--
 gnucash/CMakeLists.txt                          | 1 +
 gnucash/register/register-gnome/gnucash-sheet.c | 2 --
 3 files changed, 3 insertions(+), 4 deletions(-)

More information about the gnucash-changes mailing list