summaryrefslogtreecommitdiff
path: root/eel
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-12-23 11:14:36 -0800
committerStefano Karapetsas <[email protected]>2012-12-23 11:14:36 -0800
commit3ec2cb1ade8ed91ed472091adcc592485dc49f4d (patch)
tree122f234160898266040a89a6767871856bd607c9 /eel
parent8379b1dc107c9e0daf31ef1b654c9ab44d9bac23 (diff)
parentc598aa7e65d9e370c63f883acbbb6504044c2531 (diff)
downloadcaja-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')
-rw-r--r--eel/eel-art-gtk-extensions.c13
-rw-r--r--eel/eel-canvas-rect-ellipse.c22
-rw-r--r--eel/eel-canvas.c10
3 files changed, 1 insertions, 44 deletions
diff --git a/eel/eel-art-gtk-extensions.c b/eel/eel-art-gtk-extensions.c
index 09f6d9d5..59963583 100644
--- a/eel/eel-art-gtk-extensions.c
+++ b/eel/eel-art-gtk-extensions.c
@@ -90,13 +90,8 @@ eel_gdk_window_get_bounds (GdkWindow *gdk_window)
gdk_window_get_position (gdk_window, &bounds.x0, &bounds.y0);
-#if GTK_CHECK_VERSION(3, 0, 0)
width = gdk_window_get_width(gdk_window);
height = gdk_window_get_height(gdk_window);
-#else
- gdk_drawable_get_size (gdk_window, &width, &height);
-#endif
-
bounds.x1 = bounds.x0 + width;
bounds.y1 = bounds.y0 + height;
@@ -128,12 +123,8 @@ eel_gdk_window_get_screen_relative_bounds (GdkWindow *gdk_window)
return eel_irect_empty;
}
-#if GTK_CHECK_VERSION(3, 0, 0)
width = gdk_window_get_width(gdk_window);
height = gdk_window_get_height(gdk_window);
-#else
- gdk_drawable_get_size(gdk_window, &width, &height);
-#endif
screen_bounds.x1 = screen_bounds.x0 + width;
screen_bounds.y1 = screen_bounds.y0 + height;
@@ -321,12 +312,8 @@ eel_gdk_window_get_dimensions (GdkWindow *gdk_window)
g_return_val_if_fail (gdk_window != NULL, eel_dimensions_empty);
-#if GTK_CHECK_VERSION(3, 0, 0)
dimensions.width = gdk_window_get_width(gdk_window);
dimensions.height = gdk_window_get_height(gdk_window);
-#else
- gdk_drawable_get_size (gdk_window, &dimensions.width, &dimensions.height);
-#endif
return dimensions;
}
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)
diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c
index b3b4c482..24f84e24 100644
--- a/eel/eel-canvas.c
+++ b/eel/eel-canvas.c
@@ -523,11 +523,6 @@ eel_canvas_item_set_valist (EelCanvasItem *item, const gchar *first_arg_name, va
g_object_set_valist (G_OBJECT (item), first_arg_name, args);
-#if 0
- /* I commented this out, because item implementations have to schedule update/redraw */
- eel_canvas_item_request_redraw (item);
-#endif
-
item->canvas->need_repick = TRUE;
}
@@ -1386,12 +1381,10 @@ static void
eel_canvas_group_get_property (GObject *gobject, guint param_id,
GValue *value, GParamSpec *pspec)
{
- EelCanvasItem *item;
EelCanvasGroup *group;
g_return_if_fail (EEL_IS_CANVAS_GROUP (gobject));
- item = EEL_CANVAS_ITEM (gobject);
group = EEL_CANVAS_GROUP (gobject);
switch (param_id)
@@ -2856,9 +2849,6 @@ pick_current_item (EelCanvas *canvas, GdkEvent *event)
&& !canvas->left_grabbed_item)
{
GdkEvent new_event;
- EelCanvasItem *item;
-
- item = canvas->current_item;
new_event = canvas->pick_event;
new_event.type = GDK_LEAVE_NOTIFY;