forked from AuroraMiddleware/gtk
gtk: Always load the atk-bridge
Slightly modified by Alejandro Piñeiro https://bugzilla.gnome.org/show_bug.cgi?id=677491
This commit is contained in:
parent
49c618c59c
commit
ffe1e31a2c
@ -1278,11 +1278,11 @@ AC_SUBST(GDK_DEP_CFLAGS)
|
||||
# Check for Accessibility Toolkit flags
|
||||
########################################
|
||||
|
||||
ATK_PACKAGES=atk
|
||||
ATK_PACKAGES="atk atk-bridge-2.0"
|
||||
PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
|
||||
|
||||
GTK_PACKAGES="atk cairo cairo-gobject gdk-pixbuf-2.0 gio-2.0"
|
||||
GTK_PRIVATE_PACKAGES=""
|
||||
GTK_PRIVATE_PACKAGES="atk-bridge-2.0"
|
||||
if test "x$enable_x11_backend" = xyes; then
|
||||
GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
|
||||
fi
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "gailutil.h"
|
||||
#include "gailmisc.h"
|
||||
|
||||
#include <atk-bridge.h>
|
||||
|
||||
static gboolean gail_focus_watcher (GSignalInvocationHint *ihint,
|
||||
guint n_param_values,
|
||||
@ -806,6 +807,7 @@ _gtk_accessibility_init (void)
|
||||
focus_tracker_id = atk_add_focus_tracker (gail_focus_tracker);
|
||||
|
||||
_gail_util_install ();
|
||||
atk_bridge_adaptor_init (NULL, NULL);
|
||||
|
||||
atk_misc_instance = g_object_new (GAIL_TYPE_MISC, NULL);
|
||||
}
|
||||
|
@ -247,10 +247,11 @@ static gboolean
|
||||
module_is_blacklisted (const gchar *name,
|
||||
gboolean verbose)
|
||||
{
|
||||
if (g_str_equal (name, "gail"))
|
||||
if (g_str_equal (name, "gail") ||
|
||||
g_str_equal (name, "atk-bridge"))
|
||||
{
|
||||
if (verbose)
|
||||
g_message ("Not loading module \"gail\": The functionality is provided by GTK natively. Please try to not load it.");
|
||||
g_message ("Not loading module \"%s\": The functionality is provided by GTK natively. Please try to not load it.", name);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user