[goocanvas] 2010-05-07 Damon Chaplin <damon gnome org>

[Damon Chaplin <damon src gnome org>]

commit 022b07e8008a26a460195802ea48b3594342173e
Author: Damon Chaplin <damon gnome org>
Date:   Fri May 7 13:19:25 2010 +0100

    2010-05-07  Damon Chaplin  <damon gnome org>
    
    	    * src/goocanvasstyle.c (goo_canvas_style_set_stroke_options): handle
    	    a NULL dash setting. #617960.

 ChangeLog            |    9 +++++++++
 src/goocanvasstyle.c |    7 +++++--
 2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b065ad2..c5feb46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-05-07  Damon Chaplin  <damon gnome org>
+
+	* src/goocanvasstyle.c (goo_canvas_style_set_stroke_options): handle
+	a NULL dash setting. #617960.
+
+2010-04-28  Luis Medinas  <lmedinas gnome org>
+
+	* applied small patch to compile with GTK+ 3.0. #615435.
+
 2009-08-20  Murray Cumming  <murrayc murrayc com>
 
 	* docs/architecture.xml: Fixed documenation typo. Bug #591983. 
diff --git a/src/goocanvasstyle.c b/src/goocanvasstyle.c
index c05152e..6ca878d 100644
--- a/src/goocanvasstyle.c
+++ b/src/goocanvasstyle.c
@@ -457,8 +457,11 @@ goo_canvas_style_set_stroke_options (GooCanvasStyle *style,
 	  else if (property->id == goo_canvas_style_line_dash_id && !line_dash_set)
 	    {
 	      GooCanvasLineDash *dash = property->value.data[0].v_pointer;
-	      cairo_set_dash (cr, dash->dashes, dash->num_dashes,
-			      dash->dash_offset);
+	      if (dash)
+		cairo_set_dash (cr, dash->dashes, dash->num_dashes,
+				dash->dash_offset);
+	      else
+		cairo_set_dash (cr, NULL, 0, 0);
 	      line_dash_set = TRUE;
 	    }
 	}