[java-libglom] Ignore some new or removed methods in Glom from git master.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [java-libglom] Ignore some new or removed methods in Glom from git master.
- Date: Wed, 14 Dec 2011 10:28:59 +0000 (UTC)
commit 2dea6b7b054f02cca386ba79df0f537144772adb
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Dec 14 11:28:51 2011 +0100
Ignore some new or removed methods in Glom from git master.
* src/glom.i: This allows us to build with both Glom 1.20 and
the future Glom 1.21/22.
ChangeLog | 7 +++++++
src/glom.i | 4 ++++
2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 127364e..98a9bec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-14 Murray Cumming <murrayc murrayc com>
+
+ Ignore some new or removed methods in Glom from git master.
+
+ * src/glom.i: This allows us to build with both Glom 1.20 and
+ the future Glom 1.21/22.
+
2011-12-02 Ben Konrath <ben bagu org>
Update jhbuild moduleset for Ubuntu 10.04.
diff --git a/src/glom.i b/src/glom.i
index 86e9aa2..02ae1c5 100644
--- a/src/glom.i
+++ b/src/glom.i
@@ -191,6 +191,8 @@ using namespace Glom;
%ignore Glom::Field::get_field_info();
%ignore Glom::Field::get_field_info() const;
%ignore Glom::Field::set_field_info(const Glib::RefPtr<Gnome::Gda::Column>& fieldInfo);
+// Ignored because this method was removed from Glom 1.21/22 and we do not need it:
+%ignore Glom::Field::get_gda_holder_name();
// the %rename makes the getter and setter look better
%rename(_default_formatting) Glom::Field::m_default_formatting;
%include <libglom/data_structure/field.h>
@@ -214,6 +216,8 @@ using namespace Glom;
// Ignore const method
%ignore Glom::LayoutGroup::get_items() const;
%ignore Glom::LayoutGroup::get_items_recursive() const;
+// Ignored because this method was only added inGlom 1.21/22 and we do not need it yet:
+%ignore Glom::LayoutGroup::get_items_recursive_with_groups() const;
%include <libglom/data_structure/layout/layoutgroup.h>
// Ignored so that getters and setters aren't generated for the m_formatting field.
// This can be enabled if it's required.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]