gnucash master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/27d36935 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/7d1c8de3 (commit)
	from  https://github.com/Gnucash/gnucash/commit/613bf2ec (commit)



commit 27d36935b8f312b07ea7a53aeab954d230603dd1
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Jul 22 01:49:39 2015 -0700

    Fix generation of extra frames in book features.

diff --git a/src/libqof/qof/qofbook.cpp b/src/libqof/qof/qofbook.cpp
index 3579b05..997f841 100644
--- a/src/libqof/qof/qofbook.cpp
+++ b/src/libqof/qof/qofbook.cpp
@@ -1051,7 +1051,7 @@ static void commit_err (G_GNUC_UNUSED QofInstance *inst, QofBackendError errcode
 //  gnc_engine_signal_commit_error( errcode );
 }
 
-#define GNC_FEATURES "/features/"
+#define GNC_FEATURES "features"
 static void
 add_feature_to_hash (const gchar *key, KvpValue *value, gpointer user_data)
 {

commit 7d1c8de3c7122563a25a065a61f2120a7ac5b1e5
Author: John Ralls <jralls at ceridwen.us>
Date:   Wed Jul 22 01:47:17 2015 -0700

    Remove patch file inadvertently added to repo.

diff --git a/0001-Change-gtkmacintegration-gtk2-include-directory-back.patch b/0001-Change-gtkmacintegration-gtk2-include-directory-back.patch
deleted file mode 100644
index 74774cf..0000000
--- a/0001-Change-gtkmacintegration-gtk2-include-directory-back.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b9de55c8711b07c0fdf83d9838c8a5d65222e887 Mon Sep 17 00:00:00 2001
-From: John Ralls <jralls at ceridwen.us>
-Date: Sun, 24 May 2015 18:05:04 -0700
-Subject: [PATCH] Change gtkmacintegration-gtk2 include directory back to
- gtkmacintegration.
-
-As of gtk-mac-integration-2.0.8.
----
- src/core-utils/binreloc.c         | 2 +-
- src/gnome-utils/gnc-main-window.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core-utils/binreloc.c b/src/core-utils/binreloc.c
-index 6a2a55f..4e72494 100644
---- a/src/core-utils/binreloc.c
-+++ b/src/core-utils/binreloc.c
-@@ -24,7 +24,7 @@
- #include <sys/stat.h>
- #include <unistd.h>
- #ifdef MAC_INTEGRATION
--#include <gtkmacintegration-gtk2/gtkosxapplication.h>
-+#include <gtkmacintegration/gtkosxapplication.h>
- #endif
- #endif /* ENABLE_BINRELOC */
- #include <stdio.h>
-diff --git a/src/gnome-utils/gnc-main-window.c b/src/gnome-utils/gnc-main-window.c
-index 89462ef..c77637d 100644
---- a/src/gnome-utils/gnc-main-window.c
-+++ b/src/gnome-utils/gnc-main-window.c
-@@ -70,7 +70,7 @@
- #include "gnc-autosave.h"
- #include "print-session.h"
- #ifdef MAC_INTEGRATION
--#include <gtkmacintegration-gtk2/gtkosxapplication.h>
-+#include <gtkmacintegration/gtkosxapplication.h>
- #endif
- #ifdef HAVE_SYS_STAT_H
- # include <sys/types.h>
--- 
-2.2.2
-



Summary of changes:
 ...acintegration-gtk2-include-directory-back.patch | 41 ----------------------
 src/libqof/qof/qofbook.cpp                         |  2 +-
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 0001-Change-gtkmacintegration-gtk2-include-directory-back.patch