From 169ce1508b29e7133f5033fa3f473b3d9ffdf577 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 3 Mar 2010 17:46:53 +0000 Subject: [PATCH] x11-texture-pixmap: Move signal handler override The signal handling override for the ::queue-damage-redraw should be done in the class initialization function, not in the instance one. --- clutter/x11/clutter-x11-texture-pixmap.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/clutter/x11/clutter-x11-texture-pixmap.c b/clutter/x11/clutter-x11-texture-pixmap.c index 0c66a81..e290dba 100644 --- a/clutter/x11/clutter-x11-texture-pixmap.c +++ b/clutter/x11/clutter-x11-texture-pixmap.c @@ -471,11 +471,6 @@ clutter_x11_texture_pixmap_init (ClutterX11TexturePixmap *self) CLUTTER_X11_TYPE_TEXTURE_PIXMAP, ClutterX11TexturePixmapPrivate); - g_signal_override_class_handler ( - "queue-damage-redraw", - CLUTTER_X11_TYPE_TEXTURE_PIXMAP, - G_CALLBACK (clutter_x11_texture_pixmap_real_queue_damage_redraw)); - if (!check_extensions (self)) { /* FIMXE: means display lacks needed extensions for at least auto. @@ -814,17 +809,21 @@ clutter_x11_texture_pixmap_class_init (ClutterX11TexturePixmapClass *klass) * Since: 1.2 */ signals[QUEUE_DAMAGE_REDRAW] = - g_signal_new ("queue-damage-redraw", - G_TYPE_FROM_CLASS (object_class), - G_SIGNAL_RUN_FIRST, - 0, - NULL, NULL, - clutter_marshal_VOID__INT_INT_INT_INT, - G_TYPE_NONE, 4, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT, - G_TYPE_INT); + g_signal_new (g_intern_static_string ("queue-damage-redraw"), + G_TYPE_FROM_CLASS (object_class), + G_SIGNAL_RUN_FIRST, + 0, + NULL, NULL, + clutter_marshal_VOID__INT_INT_INT_INT, + G_TYPE_NONE, 4, + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_INT, + G_TYPE_INT); + + g_signal_override_class_handler ("queue-damage-redraw", + CLUTTER_X11_TYPE_TEXTURE_PIXMAP, + G_CALLBACK (clutter_x11_texture_pixmap_real_queue_damage_redraw)); default_backend = clutter_get_default_backend (); -- 2.7.4