diff options
| author | Jasmine Hassan <[email protected]> | 2012-10-30 23:42:48 +0200 |
|---|---|---|
| committer | Jasmine Hassan <[email protected]> | 2012-11-16 09:45:51 +0200 |
| commit | 5f7d0e33a04e69778509edb93beabbe0e62ab69b (patch) | |
| tree | c9bf66086d6b74705cea4de46383da7a99d79895 /eel/eel-canvas-rect-ellipse.c | |
| parent | 4fe815f4dc825928008a1fc09e53ebcbbc22569d (diff) | |
| download | caja-5f7d0e33a04e69778509edb93beabbe0e62ab69b.tar.bz2 caja-5f7d0e33a04e69778509edb93beabbe0e62ab69b.tar.xz | |
[eel-canvas] don't use GtkObject (GTK3)
the ::destroy signal of GtkObject has only been moved to GtkWidget in GTK3
(after GtkObject removal): http://developer.gnome.org/gtk3/3.0/ch25s02.html
So, we conditionals in this case, to keep working with GTK2
Nautilus commit message: This implies adding a 'destroy' signal to EelCanvasItem,
with similar semantics to gtk_object_destroy()
http://git.gnome.org/browse/nautilus/commit/?id=1f615321613751a5dbc84d5ef7f20edd104b8dc4
Diffstat (limited to 'eel/eel-canvas-rect-ellipse.c')
| -rw-r--r-- | eel/eel-canvas-rect-ellipse.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index 9d738243..18263ce9 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -68,7 +68,6 @@ enum static void eel_canvas_re_class_init (EelCanvasREClass *klass); static void eel_canvas_re_init (EelCanvasRE *re); -static void eel_canvas_re_destroy (GtkObject *object); static void eel_canvas_re_set_property (GObject *object, guint param_id, const GValue *value, @@ -133,11 +132,9 @@ static void eel_canvas_re_class_init (EelCanvasREClass *klass) { GObjectClass *gobject_class; - GtkObjectClass *object_class; EelCanvasItemClass *item_class; gobject_class = (GObjectClass *) klass; - object_class = (GtkObjectClass *) klass; item_class = (EelCanvasItemClass *) klass; re_parent_class = g_type_class_peek_parent (klass); @@ -223,8 +220,6 @@ eel_canvas_re_class_init (EelCanvasREClass *klass) 0.0, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE)); - object_class->destroy = eel_canvas_re_destroy; - item_class->realize = eel_canvas_re_realize; item_class->unrealize = eel_canvas_re_unrealize; item_class->translate = eel_canvas_re_translate; @@ -241,22 +236,6 @@ eel_canvas_re_init (EelCanvasRE *re) re->width = 0.0; } -static void -eel_canvas_re_destroy (GtkObject *object) -{ - EelCanvasRE *re; - - g_return_if_fail (object != NULL); - g_return_if_fail (EEL_IS_CANVAS_RE (object)); - - re = EEL_CANVAS_RE (object); - - /* remember, destroy can be run multiple times! */ - - if (GTK_OBJECT_CLASS (re_parent_class)->destroy) - (* GTK_OBJECT_CLASS (re_parent_class)->destroy) (object); -} - static void get_bounds (EelCanvasRE *re, double *px1, double *py1, double *px2, double *py2) { EelCanvasItem *item; |