sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

x11: Replace deprecated Cogl API

Browse source
This commit is contained in:
Emmanuele Bassi 2013-07-03 18:24:27 +01:00
parent 5cc7a1ee57
commit dc7d42d87a
1 changed files with 4 additions and 3 deletions

7
clutter/x11/clutter-backend-x11.c
View file

@ -128,10 +128,11 @@ cogl_xlib_filter (XEvent *xevent,
ClutterEvent *event, ClutterEvent *event,
gpointer data) gpointer data)
{ {
ClutterBackend *backend = data;
ClutterX11FilterReturn retval; ClutterX11FilterReturn retval;
CoglFilterReturn ret; CoglFilterReturn ret;
ret = cogl_xlib_handle_event (xevent); ret = cogl_xlib_renderer_handle_event (backend->cogl_renderer, xevent);
switch (ret) switch (ret)
{ {
case COGL_FILTER_REMOVE: case COGL_FILTER_REMOVE:
@ -391,7 +392,7 @@ clutter_backend_x11_post_parse (ClutterBackend *backend,
settings = clutter_settings_get_default (); settings = clutter_settings_get_default ();
/* add event filter for Cogl events */ /* 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) if (clutter_screen == -1)
backend_x11->xscreen = DefaultScreenOfDisplay (backend_x11->xdpy); backend_x11->xscreen = DefaultScreenOfDisplay (backend_x11->xdpy);
@ -542,7 +543,7 @@ clutter_backend_x11_finalize (GObject *gobject)
g_free (backend_x11->display_name); 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_x11_remove_filter (xsettings_filter, backend_x11);
_clutter_xsettings_client_destroy (backend_x11->xsettings); _clutter_xsettings_client_destroy (backend_x11->xsettings);