From 5a061ed4a3762431f6080b1d962060c8581aa2bf Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Wed, 3 Jul 2013 18:35:44 +0100
Subject: [PATCH] gdk: Replace deprecated Cogl API
---
clutter/gdk/clutter-backend-gdk.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c
index 988b37075..8f618215d 100644
--- a/clutter/gdk/clutter-backend-gdk.c
+++ b/clutter/gdk/clutter-backend-gdk.c
@@ -128,9 +128,10 @@ cogl_gdk_filter (GdkXEvent *xevent,
gpointer data)
{
#ifdef GDK_WINDOWING_X11
+ ClutterBackend *backend = data;
CoglFilterReturn ret;
- ret = cogl_xlib_handle_event ((XEvent*)xevent);
+ ret = cogl_xlib_renderer_handle_event (backend->cogl_renderer, (XEvent *) xevent);
switch (ret)
{
case COGL_FILTER_REMOVE:
@@ -170,7 +171,7 @@ _clutter_backend_gdk_post_parse (ClutterBackend *backend,
backend_gdk->screen = gdk_display_get_default_screen (backend_gdk->display);
/* add event filter for Cogl events */
- gdk_window_add_filter (NULL, cogl_gdk_filter, NULL);
+ gdk_window_add_filter (NULL, cogl_gdk_filter, backend_gdk);
clutter_backend_gdk_init_settings (backend_gdk);
@@ -210,7 +211,7 @@ clutter_backend_gdk_finalize (GObject *gobject)
{
ClutterBackendGdk *backend_gdk = CLUTTER_BACKEND_GDK (gobject);
- gdk_window_remove_filter (NULL, cogl_gdk_filter, NULL);
+ gdk_window_remove_filter (NULL, cogl_gdk_filter, backend_gdk);
g_object_unref (backend_gdk->display);
G_OBJECT_CLASS (clutter_backend_gdk_parent_class)->finalize (gobject);