From d127246c379859fbb890c382dc75e521848cbda7 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sun, 28 Oct 2012 11:16:08 +0200 Subject: [eel] remove commented out canvas code --- eel/eel-canvas.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'eel') diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index b3b4c482..84c4219b 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; } -- cgit v1.2.1 From cbd664b1fb9409b6500fb36f3d051ab100ffc828 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 17:44:02 +0200 Subject: [eel] Use future-safe GDK_WINDOW_XDISPLAY macro to query X display http://git.gnome.org/browse/nautilus/commit/?id=8cb07ccf2ddcf0cb8557c763f8905558d67736de --- eel/eel-canvas-rect-ellipse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'eel') diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index d0e4a592..9aca4086 100644 --- a/eel/eel-canvas-rect-ellipse.c +++ b/eel/eel-canvas-rect-ellipse.c @@ -717,7 +717,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) -- cgit v1.2.1 From 558280660418ef9e27e36ddd0619225c691e44b7 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 25 Oct 2012 18:34:52 +0200 Subject: [all] silence warnings from GCC 4.6 GCC 4.6 introduced a new warning about variables declared and initialized, but not really used in the function body. Remove all of these occurrences to build cleanly. http://git.gnome.org/browse/nautilus/commit/?id=d4230de8667764e02dbb966b5d806ff78ced2fd5 --- eel/eel-canvas-rect-ellipse.c | 20 -------------------- eel/eel-canvas.c | 5 ----- 2 files changed, 25 deletions(-) (limited to 'eel') diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c index 9aca4086..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); } diff --git a/eel/eel-canvas.c b/eel/eel-canvas.c index 84c4219b..24f84e24 100644 --- a/eel/eel-canvas.c +++ b/eel/eel-canvas.c @@ -1381,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) @@ -2851,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; -- cgit v1.2.1 From 7b384b35d0226eed7711f2d1fa0ca04381380d23 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Sat, 22 Dec 2012 05:37:47 +0200 Subject: [general] Don't use deprecated gdk_drawable_get_size at all Since we now require GTK 2.24, we can directly use gdk_window_get_width(), gdk_window_get_height() --- eel/eel-art-gtk-extensions.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'eel') 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; } -- cgit v1.2.1