From 6b75dd581c0f72f1114bc37afa1d51e9a806df50 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Sat, 9 Oct 2010 04:13:11 +0200
Subject: widgets: Remove stipple from ECanvasBackground

---
 widgets/misc/e-canvas-background.c | 45 --------------------------------------
 widgets/misc/e-canvas-background.h |  1 -
 2 files changed, 46 deletions(-)

(limited to 'widgets')

diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index e062e16dfa..f6179379e4 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -51,7 +51,6 @@ G_DEFINE_TYPE (
 struct _ECanvasBackgroundPrivate {
 	guint rgba;		/* Fill color, RGBA */
 	GdkColor color;		/* Fill color */
-	GdkBitmap *stipple;	/* Stipple for fill */
 	GdkGC *gc;			/* GC for filling */
 	gdouble x1;
 	gdouble x2;
@@ -73,7 +72,6 @@ enum {
 	PROP_FILL_COLOR,
 	PROP_FILL_COLOR_GDK,
 	PROP_FILL_COLOR_RGBA,
-	PROP_FILL_STIPPLE,
 	PROP_X1,
 	PROP_X2,
 	PROP_Y1,
@@ -159,38 +157,12 @@ ecb_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flag
 	}
 }
 
-/* Sets the stipple pattern for the text */
-static void
-set_stipple (ECanvasBackground *ecb, GdkBitmap *stipple, gint use_value)
-{
-	if (use_value) {
-		if (ecb->priv->stipple)
-			g_object_unref (ecb->priv->stipple);
-
-		ecb->priv->stipple = stipple;
-		if (stipple)
-			g_object_ref (stipple);
-	}
-
-	if (ecb->priv->gc) {
-		if (stipple) {
-			gdk_gc_set_stipple (ecb->priv->gc, stipple);
-			gdk_gc_set_fill (ecb->priv->gc, GDK_STIPPLED);
-		} else
-			gdk_gc_set_fill (ecb->priv->gc, GDK_SOLID);
-	}
-}
-
 static void
 ecb_dispose (GObject *object)
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (object);
 
 	if (ecb->priv) {
-		if (ecb->priv->stipple)
-			g_object_unref (ecb->priv->stipple);
-		ecb->priv->stipple = NULL;
-
 		g_free (ecb->priv);
 		ecb->priv = NULL;
 	}
@@ -248,10 +220,6 @@ ecb_set_property (GObject *object,
 		color_changed = TRUE;
 		break;
 
-	case PROP_FILL_STIPPLE:
-		set_stipple (ecb, g_value_get_object (value), TRUE);
-		break;
-
 	case PROP_X1:
 		ecb->priv->x1 = g_value_get_double (value);
 		break;
@@ -296,9 +264,6 @@ ecb_get_property (GObject *object,
         case PROP_FILL_COLOR_RGBA:
 		g_value_set_uint (value, ecb->priv->rgba);
 		break;
-	case PROP_FILL_STIPPLE:
-		g_value_set_object (value, ecb->priv->stipple);
-		break;
 	case PROP_X1:
 		g_value_set_double (value, ecb->priv->x1);
 		break;
@@ -326,7 +291,6 @@ ecb_init (ECanvasBackground *ecb)
 	ecb->priv->color.red    = 0;
 	ecb->priv->color.green  = 0;
 	ecb->priv->color.blue   = 0;
-	ecb->priv->stipple      = NULL;
 	ecb->priv->gc           = NULL;
 	ecb->priv->x1           = -1.0;
 	ecb->priv->x2           = -1.0;
@@ -349,8 +313,6 @@ ecb_realize (GnomeCanvasItem *item)
 	get_color (ecb);
         gdk_gc_set_foreground (ecb->priv->gc, &ecb->priv->color);
 
-	set_stipple (ecb, NULL, FALSE);
-
 	ecb->priv->needs_redraw = 1;
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ecb));
 }
@@ -483,13 +445,6 @@ ecb_class_init (ECanvasBackgroundClass *ecb_class)
 							    0, G_MAXUINT, 0,
 							    G_PARAM_READWRITE));
 
-	g_object_class_install_property (object_class, PROP_FILL_STIPPLE,
-					 g_param_spec_object ("fill_stipple",
-							      "Fill stipple",
-							      "Fill stipple",
-							      GDK_TYPE_WINDOW,
-							      G_PARAM_READWRITE));
-
 	g_object_class_install_property (object_class, PROP_X1,
 					 g_param_spec_double ("x1",
 							      "X1",
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index e1e24d0663..3c07770701 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
  * fill_color		string		W		X color specification for fill color,
  *							or NULL pointer for no color (transparent)
  * fill_color_gdk	GdkColor*	RW		Allocated GdkColor for fill
- * fill_stipple		GdkBitmap*	RW		Stipple pattern for fill
  * x1                   gdouble		RW              Coordinates for edges of background rectangle
  * x2                   gdouble		RW              Default is all of them = -1.
  * y1                   gdouble		RW              Which means that the entire space is shown.
-- 
cgit v1.2.3