summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS7
-rw-r--r--src/x11_in_gtk2.c7
-rw-r--r--src/x11_in_qt4.cpp6
-rw-r--r--wscript2
4 files changed, 17 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index f927be5..bea782c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+suil 0.6.17 unstable;
+
+ * Fix compilation errors on some systems
+ * Upgrade to waf 1.7.14
+
+ -- David Robillard <d@drobilla.net> Wed, 25 Dec 2013 00:16:55 -0500
+
suil (0.6.16) stable;
* Fix suil_instance_extension_data() for UIs with NULL extension_data
diff --git a/src/x11_in_gtk2.c b/src/x11_in_gtk2.c
index 0536f13..72be250 100644
--- a/src/x11_in_gtk2.c
+++ b/src/x11_in_gtk2.c
@@ -257,8 +257,11 @@ wrapper_wrap(SuilWrapper* wrapper,
wrap->instance = instance;
#ifdef HAVE_LV2_1_6_0
- const LV2UI_Idle_Interface* idle_iface = suil_instance_extension_data(
- instance, LV2_UI__idleInterface);
+ const LV2UI_Idle_Interface* idle_iface = NULL;
+ if (instance->descriptor->extension_data) {
+ idle_iface = (const LV2UI_Idle_Interface*)
+ instance->descriptor->extension_data(LV2_UI__idleInterface);
+ }
if (idle_iface) {
wrap->idle_iface = idle_iface;
wrap->idle_id = g_timeout_add(
diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp
index 338ae12..5d5f935 100644
--- a/src/x11_in_qt4.cpp
+++ b/src/x11_in_qt4.cpp
@@ -91,8 +91,10 @@ wrapper_wrap(SuilWrapper* wrapper,
{
const LV2UI_Idle_Interface* idle_iface = NULL;
#ifdef HAVE_LV2_1_6_0
- idle_iface = (const LV2UI_Idle_Interface*)suil_instance_extension_data(
- instance, LV2_UI__idleInterface);
+ if (instance->descriptor->extension_data) {
+ idle_iface = (const LV2UI_Idle_Interface*)
+ instance->descriptor->extension_data(LV2_UI__idleInterface);
+ }
#endif
SuilX11InQt4Wrapper* const impl = (SuilX11InQt4Wrapper*)wrapper->impl;
diff --git a/wscript b/wscript
index 50b68cd..1f3203a 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,7 @@ import waflib.extras.autowaf as autowaf
# major increment <=> incompatible changes
# minor increment <=> compatible changes (additions)
# micro increment <=> no interface changes
-SUIL_VERSION = '0.6.16'
+SUIL_VERSION = '0.6.17'
SUIL_MAJOR_VERSION = '0'
# Mandatory waf variables