From ffd1f125604a2a25015804bcf2b8ebb6503fdd77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Pi=C3=B1eiro?= <apinheiro@igalia.com>
Date: Tue, 6 Jul 2010 13:36:48 +0200
Subject: [PATCH] cally: Use proper backend information on CallyActor

It uses HAVE_CLUTTER_GLX to check the current backend in use for
some accessibility related methods.

Fixes CB#2071
---
 clutter/cally/cally-actor.c | 4 ++--
 clutter/cally/cally-util.c  | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/clutter/cally/cally-actor.c b/clutter/cally/cally-actor.c
index 41bd368a1..a95fe9d81 100644
--- a/clutter/cally/cally-actor.c
+++ b/clutter/cally/cally-actor.c
@@ -103,7 +103,7 @@
 
 #include <clutter/clutter.h>
 
-#ifdef HAVE_CLUTTER_X11
+#ifdef HAVE_CLUTTER_GLX
 #include <clutter/x11/clutter-x11.h>
 #endif
 
@@ -917,7 +917,7 @@ _get_top_level_origin (ClutterActor *actor,
   *x = 0;
   *y = 0;
 
-#ifdef HAVE_CLUTTER_X11
+#ifdef HAVE_CLUTTER_GLX
   ClutterActor *stage      = NULL;
   Display      *display    = NULL;
   Window        root_window;
diff --git a/clutter/cally/cally-util.c b/clutter/cally/cally-util.c
index 8b8300909..40396fdea 100644
--- a/clutter/cally/cally-util.c
+++ b/clutter/cally/cally-util.c
@@ -50,10 +50,6 @@
 #include "cally-root.h"
 #include "cally-stage.h"
 
-#ifdef HAVE_CLUTTER_X11
-#include <X11/extensions/XKB.h>
-#endif
-
 static void cally_util_class_init (CallyUtilClass	*klass);
 static void cally_util_init       (CallyUtil *cally_util);