From 99a9c6e7c6a67484c029518bdb31160469627701 Mon Sep 17 00:00:00 2001 From: Luke Yelavich Date: Sat, 8 Oct 2016 12:22:45 +1100 Subject: Fix accessible object inherritance when used with GTK 3 Also disable eel accessibility code that is not needed. Fixes https://github.com/mate-desktop/caja/issues/590 --- eel/eel-accessibility.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'eel/eel-accessibility.c') diff --git a/eel/eel-accessibility.c b/eel/eel-accessibility.c index 707756d1..da586ddc 100644 --- a/eel/eel-accessibility.c +++ b/eel/eel-accessibility.c @@ -63,6 +63,7 @@ eel_accessibility_set_up_label_widget_relation (GtkWidget *label, GtkWidget *wid * * Return value: the registered type, or 0 on failure. **/ +#if !GTK_CHECK_VERSION(3, 0, 0) GType eel_accessibility_create_derived_type (const char *type_name, GType existing_gobject_with_proxy, @@ -113,7 +114,7 @@ eel_accessibility_create_derived_type (const char *type_name, return type; } - +#endif static GQuark get_quark_accessible (void) @@ -207,6 +208,7 @@ eel_accessibility_destroy (gpointer data, * * Return value: @atk_object. **/ +#if !GTK_CHECK_VERSION(3, 0, 0) AtkObject * eel_accessibility_set_atk_object_return (gpointer object, AtkObject *atk_object) @@ -224,6 +226,7 @@ eel_accessibility_set_atk_object_return (gpointer object, return atk_object; } +#endif static GailTextUtil * get_simple_text (gpointer object) -- cgit v1.2.1