diff options
| author | Stefano Karapetsas <[email protected]> | 2012-12-23 11:14:36 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-12-23 11:14:36 -0800 |
| commit | 3ec2cb1ade8ed91ed472091adcc592485dc49f4d (patch) | |
| tree | 122f234160898266040a89a6767871856bd607c9 /eel/eel-canvas-rect-ellipse.c | |
| parent | 8379b1dc107c9e0daf31ef1b654c9ab44d9bac23 (diff) | |
| parent | c598aa7e65d9e370c63f883acbbb6504044c2531 (diff) | |
| download | caja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.bz2 caja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.xz | |
Merge pull request #65 from jasmineaura/develop
Most of remaining deprecations, some cleanups, and a leak fix
Diffstat (limited to 'eel/eel-canvas-rect-ellipse.c')
| -rw-r--r-- | eel/eel-canvas-rect-ellipse.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index d0e4a592..f93cc85e 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -530,46 +530,26 @@ eel_canvas_re_get_property (GObject *object, static void eel_canvas_re_update_shared (EelCanvasItem *item, double i2w_dx, double i2w_dy, int flags) { - EelCanvasRE *re; - #ifdef VERBOSE g_print ("eel_canvas_re_update_shared\n"); #endif - re = EEL_CANVAS_RE (item); - if (re_parent_class->update) (* re_parent_class->update) (item, i2w_dx, i2w_dy, flags); - -#ifdef OLD_XFORM - recalc_bounds (re); -#endif } static void eel_canvas_re_realize (EelCanvasItem *item) { - EelCanvasRE *re; - #ifdef VERBOSE g_print ("eel_canvas_re_realize\n"); #endif - re = EEL_CANVAS_RE (item); - if (re_parent_class->realize) (* re_parent_class->realize) (item); - -#ifdef OLD_XFORM - (* EEL_CANVAS_ITEM_CLASS (item->object.klass)->update) (item, NULL, NULL, 0); -#endif } static void eel_canvas_re_unrealize (EelCanvasItem *item) { - EelCanvasRE *re; - - re = EEL_CANVAS_RE (item); - if (re_parent_class->unrealize) (* re_parent_class->unrealize) (item); } @@ -717,7 +697,7 @@ eel_canvas_rect_realize (EelCanvasItem *item) priv = EEL_CANVAS_RECT (item)->priv; - dpy = gdk_x11_drawable_get_xdisplay (gtk_widget_get_window (GTK_WIDGET (item->canvas))); + dpy = GDK_WINDOW_XDISPLAY (gtk_widget_get_window (GTK_WIDGET (item->canvas))); priv->use_render = XRenderQueryExtension (dpy, &event_base, &error_base); if (priv->use_render) |