[glom] Do not pygoject_init() the wrong version.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Do not pygoject_init() the wrong version.
- Date: Wed, 19 Oct 2011 09:20:24 +0000 (UTC)
commit 7a71d707a1d306a395f12b93f35e0c44bf34f33c
Author: Murray Cumming <murrayc murrayc com>
Date: Wed Oct 19 09:58:01 2011 +0200
Do not pygoject_init() the wrong version.
* glom/libglom/init.cc: Specify pygobject 3 instead of 2 when calling
pygobject_init(). They are parallel-installable and incompatible and it is
3 that we depend on. This recently started failing during "make check",
which it should.
ChangeLog | 9 +++++++++
glom/libglom/init.cc | 2 +-
2 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b17f68f..c74500c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-19 Murray Cumming <murrayc murrayc com>
+
+ Do not pygoject_init() the wrong version.
+
+ * glom/libglom/init.cc: Specify pygobject 3 instead of 2 when calling
+ pygobject_init(). They are parallel-installable and incompatible and it is
+ 3 that we depend on. This recently started failing during "make check",
+ which it should.
+
1.19.14:
2011-10-18 Murray Cumming <murrayc murrayc com>
diff --git a/glom/libglom/init.cc b/glom/libglom/init.cc
index 5399165..4d55048 100644
--- a/glom/libglom/init.cc
+++ b/glom/libglom/init.cc
@@ -66,7 +66,7 @@ void libglom_init()
//Initialize PyGObject, so that functions such as pygobject_new() work
//instead of crashing.
- pygobject_init(2, 28, 0);
+ pygobject_init(3, 0, 0); //The major version should match the one in configure.ac.
}
void libglom_deinit()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]