From dc7d42d87ab8ef6f571685e3a8910ae3a0a5debc Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 3 Jul 2013 18:24:27 +0100
Subject: [PATCH] x11: Replace deprecated Cogl API
---
clutter/x11/clutter-backend-x11.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index b7cfcc477..f2892d95b 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -128,10 +128,11 @@ cogl_xlib_filter (XEvent *xevent,
ClutterEvent *event,
gpointer data)
{
+ ClutterBackend *backend = data;
ClutterX11FilterReturn retval;
CoglFilterReturn ret;
- ret = cogl_xlib_handle_event (xevent);
+ ret = cogl_xlib_renderer_handle_event (backend->cogl_renderer, xevent);
switch (ret)
{
case COGL_FILTER_REMOVE:
@@ -391,7 +392,7 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
settings = clutter_settings_get_default ();
/* add event filter for Cogl events */
- clutter_x11_add_filter (cogl_xlib_filter, NULL);
+ clutter_x11_add_filter (cogl_xlib_filter, backend);
if (clutter_screen == -1)
backend_x11->xscreen = DefaultScreenOfDisplay (backend_x11->xdpy);
@@ -542,7 +543,7 @@ clutter_backend_x11_finalize (GObject *gobject)
g_free (backend_x11->display_name);
- clutter_x11_remove_filter (cogl_xlib_filter, NULL);
+ clutter_x11_remove_filter (cogl_xlib_filter, gobject);
clutter_x11_remove_filter (xsettings_filter, backend_x11);
_clutter_xsettings_client_destroy (backend_x11->xsettings);