[dia] [glib-deprecated] g_type_init()
- From: Hans Breuer <hans src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia] [glib-deprecated] g_type_init()
- Date: Sun, 7 Sep 2014 21:45:33 +0000 (UTC)
commit cf77f0b0591bca7ee452147cdb45483323de116e
Author: Hans Breuer <hans breuer org>
Date: Sun Sep 7 21:36:53 2014 +0200
[glib-deprecated] g_type_init()
bindings/dia-extra.cpp | 3 ++-
plug-ins/python/diamodule.c | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/bindings/dia-extra.cpp b/bindings/dia-extra.cpp
index 92da4a7..f386824 100644
--- a/bindings/dia-extra.cpp
+++ b/bindings/dia-extra.cpp
@@ -47,8 +47,9 @@
*/
void dia::register_plugins ()
{
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init();
-
+#endif
libdia_init (DIA_MESSAGE_STDERR);
dia_register_plugins ();
diff --git a/plug-ins/python/diamodule.c b/plug-ins/python/diamodule.c
index 8871a62..01b774d 100644
--- a/plug-ins/python/diamodule.c
+++ b/plug-ins/python/diamodule.c
@@ -672,7 +672,9 @@ initdia(void)
Py_FatalError("can't initialize module dia");
else {
/* should all be no-ops when used embedded */
+#if !GLIB_CHECK_VERSION(2,36,0)
g_type_init ();
+#endif
libdia_init (DIA_MESSAGE_STDERR);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]