This was done by branching right before the original merge
and redoing a clean merge of the private-kvp branch again.
This result was then cherry-picked onto master with
git cherry-pick <merge-commit> -m 1
It was done like this because git merge would consider
the private-kvp branch already merged even after a revert
(see git-revert man page) and won't allow to merge a
second time on the same branch.
Resolved conflicts:
README.dependencies
src/app-utils/gnc-sx-instance-model.c
src/engine/cap-gains.c
src/engine/test/Makefile.am
src/gnome/assistant-hierarchy.c
src/import-export/import-match-map.c
src/import-export/import-utilities.c
src/import-export/ofx/gnc-ofx-kvp.c
src/libqof/qof/qofbook.cpp
src/libqof/qof/qofinstance-p.h
src/libqof/qof/qofinstance.cpp
src/libqof/qof/test/test-kvp_frame.c
src/report/report-gnome/gnc-plugin-page-report.c
Makes all kvp operations private to the object of which the kvp is
a member. Access from outside of the object is accomplished via
GObject Properties. A convenience function, qof_instance_set(),
is provided that wraps g_object_set and marks dirty the instance
so that it will be saved. It is still necessary to wrap calls in
begin_edit/commit to accomplish the save to the SQL backend. A
like-named wrapper, qof_instance_get() is provided to balance the API.
Note that the XML backend retains direct access to KVP to avoid having
to catalog the properties.
Particularly interesting is src/engine/Makefile.am: Having a mention of
target_CFLAGS in an #if disables automatic use AM_CFLAGS even when the
#if condition is false.
* Fix price quotes after removal of yahoo-get-historical-quotes
* calculate num-columns-required in transaction report correctly
* Additional changes to column calculations in transaction report
* Fix configure.ac code that customizes parameters for specific gcc versions
* Ignore SIGTTOU while importing Python console class.
Clang didn't complain about these. Note that some of the error messages
for not-clang in the tests have changed, likely due to C++. The old ones
are commented out for now; this part needs to be tested with an older
gcc to see if it's consistent.
This fix, calculates num-columns-required correctly based on which columns are used/not-used/merged. Earlier code did not consider merged columns.
Effectively with this fix, when you print report, on average it saves 2-3 pages per 12-15 pages.
* Use libsecret if available
* correction in version number in NEWS history re 2.6.3 and 2.6.2
* deletion of duplicate lines in src/engine/gnc-commodity.c
This is a minimal change to get LibQOF and only LibQOF to compile as C++.
There are no functional changes, just casts to satisfy the rather pickier
C++ compiler and wrapping declarations with extern "C" { } to maintain C
mangling so that the libgncmod_qof will work with the rest of the program.
A note about renaming gnc-numeric.c to gnc-numeric.cpp: Dunno if it's a
clang bug, but it wouldn't link test-math with the -xc++ flag; renaming
the one file got around the problem. We'll likely have to do the same for
other test programs and for gnucash-bin.c.
