summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-01-31 18:11:42 +0300
committermonsta <[email protected]>2017-01-31 18:11:42 +0300
commit51301f7cad17aa0817806e82e57c9bd403153290 (patch)
treeee0b7b29c7c89f1cbad565770b029fcbbde36a89
parentcea24ed35ad7f5a22298fe6d921e30a34476ad11 (diff)
downloadcaja-51301f7cad17aa0817806e82e57c9bd403153290.tar.bz2
caja-51301f7cad17aa0817806e82e57c9bd403153290.tar.xz
eel: remove some code that seems to do nothing
ported from: https://git.gnome.org/browse/nautilus/commit/?id=3c749cf9da882043cc5a5cb938f8831831dec768
-rw-r--r--configure.ac14
-rw-r--r--eel/eel-canvas-rect-ellipse.c46
2 files changed, 0 insertions, 60 deletions
diff --git a/configure.ac b/configure.ac
index 0eaa6bd9..0b1f58f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,7 +103,6 @@ AC_DEFINE([HAVE_GTK_MULTIHEAD], [], [needed for egg-screen-exec functions])
AH_TEMPLATE([HAVE_STARTUP_NOTIFICATION])
AH_TEMPLATE([HAVE_EXIF])
-AH_TEMPLATE([HAVE_RENDER])
AM_GLIB_GNU_GETTEXT
GLIB_DEFINE_LOCALEDIR(MATELOCALEDIR)
@@ -264,19 +263,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 xext], [have_render=yes], [have_render=no])
-if test x$have_render = xyes; then
- AC_DEFINE(HAVE_RENDER)
- AC_SUBST(RENDER_CFLAGS)
- AC_SUBST(RENDER_LIBS)
-fi
-
dnl ==========================================================================
dnl libegg
diff --git a/eel/eel-canvas-rect-ellipse.c b/eel/eel-canvas-rect-ellipse.c
index 63468f28..95d7c454 100644
--- a/eel/eel-canvas-rect-ellipse.c
+++ b/eel/eel-canvas-rect-ellipse.c
@@ -37,15 +37,8 @@
#include "eel-canvas-rect-ellipse.h"
#include <string.h>
-#ifdef HAVE_RENDER
-#include <gdk/gdkx.h>
-#include <X11/extensions/Xrender.h>
-#endif
-
/* Base class for rectangle and ellipse item types */
-#define noVERBOSE
-
enum
{
PROP_0,
@@ -485,7 +478,6 @@ eel_canvas_re_bounds (EelCanvasItem *item, double *x1, double *y1, double *x2, d
static void eel_canvas_rect_class_init (EelCanvasRectClass *klass);
static void eel_canvas_rect_init (EelCanvasRect *rect);
static void eel_canvas_rect_finalize (GObject *object);
-static void eel_canvas_rect_realize (EelCanvasItem *item);
static void eel_canvas_rect_draw (EelCanvasItem *item, cairo_t *cr, cairo_region_t *region);
@@ -497,11 +489,6 @@ struct _EelCanvasRectPrivate
Rect last_update_rect;
Rect last_outline_update_rect;
int last_outline_update_width;
-
-#ifdef HAVE_RENDER
- gboolean use_render;
- XRenderPictFormat *format;
-#endif
};
GType
@@ -545,7 +532,6 @@ eel_canvas_rect_class_init (EelCanvasRectClass *klass)
item_class->draw = eel_canvas_rect_draw;
item_class->point = eel_canvas_rect_point;
item_class->update = eel_canvas_rect_update;
- item_class->realize = eel_canvas_rect_realize;
G_OBJECT_CLASS (klass)->finalize = eel_canvas_rect_finalize;
@@ -571,38 +557,6 @@ eel_canvas_rect_finalize (GObject *object)
}
static void
-eel_canvas_rect_realize (EelCanvasItem *item)
-{
-#ifdef HAVE_RENDER
- EelCanvasRectPrivate *priv;
- int event_base, error_base;
- Display *dpy;
-
- priv = EEL_CANVAS_RECT (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 (rect_parent_class)->realize)
- {
- (* EEL_CANVAS_ITEM_CLASS (rect_parent_class)->realize) (item);
- }
-}
-
-
-static void
eel_canvas_set_source_color (cairo_t *cr,
GdkRGBA *rgba)
{