[nautilus] selection-canvas-item: remove useless Xrandr code which does nothing
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] selection-canvas-item: remove useless Xrandr code which does nothing
- Date: Thu, 17 Feb 2011 16:27:36 +0000 (UTC)
commit 3c749cf9da882043cc5a5cb938f8831831dec768
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Fri Feb 11 10:10:03 2011 -0500
selection-canvas-item: remove useless Xrandr code which does nothing
This code doesn't seem to actually do anything
configure.in | 13 ------
.../nautilus-selection-canvas-item.c | 40 --------------------
2 files changed, 0 insertions(+), 53 deletions(-)
---
diff --git a/configure.in b/configure.in
index a7772e1..16fa920 100644
--- a/configure.in
+++ b/configure.in
@@ -267,19 +267,6 @@ AC_TRY_RUN([#include <time.h>
AC_DEFINE(HAVE_STRFTIME_EXTENSION, 1, [Define if strftime supports %E and %O modifiers.])
)
-dnl ===========================================================================
-
-#
-# Checks for Xft/XRender
-#
-PKG_CHECK_MODULES(RENDER, xrender, [
- AM_CONDITIONAL(HAVE_RENDER, true)
- AC_DEFINE(HAVE_RENDER, 1, [Define to enable render support])
- ],
- [AM_CONDITIONAL(HAVE_RENDER, false)])
-
-AC_SUBST(RENDER_LIBS)
-
dnl ==========================================================================
dnl base libs
diff --git a/libnautilus-private/nautilus-selection-canvas-item.c b/libnautilus-private/nautilus-selection-canvas-item.c
index ced22e3..3878ade 100644
--- a/libnautilus-private/nautilus-selection-canvas-item.c
+++ b/libnautilus-private/nautilus-selection-canvas-item.c
@@ -30,11 +30,6 @@
#include <math.h>
-#ifdef HAVE_RENDER
-#include <gdk/gdkx.h>
-#include <X11/extensions/Xrender.h>
-#endif
-
enum {
PROP_X1 = 1,
PROP_Y1,
@@ -59,11 +54,6 @@ struct _NautilusSelectionCanvasItemDetails {
Rect last_outline_update_rect;
int last_outline_update_width;
-#ifdef HAVE_RENDER
- gboolean use_render;
- XRenderPictFormat *format;
-#endif
-
double x1, y1, x2, y2; /* Corners of item */
double width; /* Outline width */
@@ -412,35 +402,6 @@ nautilus_selection_canvas_item_update (EelCanvasItem *item,
}
static void
-nautilus_selection_canvas_item_realize (EelCanvasItem *item)
-{
-#ifdef HAVE_RENDER
- NautilusSelectionCanvasItemDetails *priv;
- int event_base, error_base;
- Display *dpy;
-
- priv = NAUTILUS_SELECTION_CANVAS_ITEM (item)->priv;
-
- 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) {
- GdkVisual *gdk_visual;
- Visual *visual;
-
- gdk_visual = gtk_widget_get_visual (GTK_WIDGET (item->canvas));
- visual = gdk_x11_visual_get_xvisual (gdk_visual);
-
- priv->format = XRenderFindVisualFormat (dpy, visual);
- }
-#endif
-
- if (EEL_CANVAS_ITEM_CLASS (nautilus_selection_canvas_item_parent_class)->realize) {
- (* EEL_CANVAS_ITEM_CLASS (nautilus_selection_canvas_item_parent_class)->realize) (item);
- }
-}
-
-static void
nautilus_selection_canvas_item_translate (EelCanvasItem *item,
double dx,
double dy)
@@ -691,7 +652,6 @@ nautilus_selection_canvas_item_class_init (NautilusSelectionCanvasItemClass *kla
item_class->draw = nautilus_selection_canvas_item_draw;
item_class->point = nautilus_selection_canvas_item_point;
item_class->update = nautilus_selection_canvas_item_update;
- item_class->realize = nautilus_selection_canvas_item_realize;
item_class->bounds = nautilus_selection_canvas_item_bounds;
item_class->translate = nautilus_selection_canvas_item_translate;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]