Update to experimental r13407

(bzr r13090.1.85)

8 files changed, 31 insertions, 8 deletions

diff --git a/share/extensions/colors.xml b/share/extensions/colors.xml
index 51167fdd7..7ed8592d5 100644
--- a/share/extensions/colors.xml
+++ b/share/extensions/colors.xml
@@ -119,6 +119,7 @@
 <color name="plum" hex="#dda0dd" rgb="221,160,221" />
 <color name="powderblue" hex="#b0e0e6" rgb="176,224,230" />
 <color name="purple" hex="#800080" rgb="128,0,128" />
+<color name="rebeccapurple" hex="#663399" rgb="102,51,153" />
 <color name="red" hex="#ff0000" rgb="255,0,0" />
 <color name="rosybrown" hex="#bc8f8f" rgb="188,143,143" />
 <color name="royalblue" hex="#4169e1" rgb="65,105,225" />
diff --git a/share/extensions/scour.py b/share/extensions/scour.py
index be40a27bd..236529daa 100644
--- a/share/extensions/scour.py
+++ b/share/extensions/scour.py
@@ -250,6 +250,7 @@ colors = {
 	'plum': 'rgb(221, 160, 221)',
 	'powderblue': 'rgb(176, 224, 230)',
 	'purple': 'rgb(128, 0, 128)',
+	'rebeccapurple': 'rgb(102, 51, 153)',
 	'red': 'rgb(255, 0, 0)',
 	'rosybrown': 'rgb(188, 143, 143)',
 	'royalblue': 'rgb( 65, 105, 225)',
diff --git a/share/extensions/simplestyle.py b/share/extensions/simplestyle.py
index 99b5938dd..806b81813 100644
--- a/share/extensions/simplestyle.py
+++ b/share/extensions/simplestyle.py
@@ -141,6 +141,7 @@ svgcolors={
     'plum':'#dda0dd',
     'powderblue':'#b0e0e6',
     'purple':'#800080',
+    'rebeccapurple':'#663399',
     'red':'#ff0000',
     'rosybrown':'#bc8f8f',
     'royalblue':'#4169e1',
diff --git a/share/palettes/svg.gpl b/share/palettes/svg.gpl
index b0893cd82..d8b868b5d 100644
--- a/share/palettes/svg.gpl
+++ b/share/palettes/svg.gpl
@@ -139,3 +139,4 @@ Name: SVG
 220  20  60	crimson (#DC143C)
 255 192 203	pink (#FFC0CB)
 255 182 193	lightpink (#FFB6C1)
+102  51 153     rebeccapurple (#663399)
diff --git a/src/libcroco/cr-rgb.c b/src/libcroco/cr-rgb.c
index 06e61ba41..537343579 100644
--- a/src/libcroco/cr-rgb.c
+++ b/src/libcroco/cr-rgb.c
@@ -150,6 +150,7 @@ static const CRRgb gv_standard_colors[] = {
         {(const guchar*)"plum",        221, 160, 221, FALSE, FALSE, FALSE, {0,0,0}},
         {(const guchar*)"powderblue",  176, 224, 230, FALSE, FALSE, FALSE, {0,0,0}},
         {(const guchar*)"purple",      128,   0, 128, FALSE, FALSE, FALSE, {0,0,0}},
+        {(const guchar*)"rebeccapurple",       102,  51, 153, FALSE, FALSE, FALSE, {0,0,0}},
         {(const guchar*)"red",         255,   0,   0, FALSE, FALSE, FALSE, {0,0,0}},
         {(const guchar*)"rosybrown",   188, 143, 143, FALSE, FALSE, FALSE, {0,0,0}},
         {(const guchar*)"royalblue",    65, 105, 225, FALSE, FALSE, FALSE, {0,0,0}},
diff --git a/src/sp-lpe-item.cpp b/src/sp-lpe-item.cpp
index 22726f236..74eb2af75 100644
--- a/src/sp-lpe-item.cpp
+++ b/src/sp-lpe-item.cpp
@@ -340,15 +340,22 @@ lpeobject_ref_modified(SPObject */*href*/, guint /*flags*/, SPLPEItem *lpeitem)
 static void
 sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem)
 {
+    g_return_if_fail(lpeitem != NULL);
     SPMask * mask = lpeitem->mask_ref->getObject();
-    if(mask)
+
+    if (mask)
     {
-        sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(mask->firstChild()));
+	if (SPLPEItem* maskChild = dynamic_cast<SPLPEItem*>(mask->firstChild())) {
+            sp_lpe_item_create_original_path_recursive(maskChild);
+	}
     }
+
     SPClipPath * clipPath = lpeitem->clip_ref->getObject();
-    if(clipPath)
+    if (clipPath)
     {
-        sp_lpe_item_create_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild()));
+	if (SPLPEItem* clipChild = dynamic_cast<SPLPEItem*>(clipPath->firstChild())) {
+            sp_lpe_item_create_original_path_recursive(clipChild);
+	}
     }
     if (SP_IS_GROUP(lpeitem)) {
         GSList const *item_list = sp_item_group_item_list(SP_GROUP(lpeitem));
@@ -370,15 +377,22 @@ sp_lpe_item_create_original_path_recursive(SPLPEItem *lpeitem)
 static void
 sp_lpe_item_cleanup_original_path_recursive(SPLPEItem *lpeitem)
 {
+    g_return_if_fail(lpeitem != NULL);
     SPMask * mask = lpeitem->mask_ref->getObject();
-    if(mask)
+
+    if (mask)
     {
-        sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(mask->firstChild()));
+	if (SPLPEItem* maskChild = dynamic_cast<SPLPEItem*>(mask->firstChild())) {
+            sp_lpe_item_cleanup_original_path_recursive(maskChild);
+	}
     }
+
     SPClipPath * clipPath = lpeitem->clip_ref->getObject();
-    if(clipPath)
+    if (clipPath)
     {
-        sp_lpe_item_cleanup_original_path_recursive(SP_LPE_ITEM(clipPath->firstChild()));
+	if (SPLPEItem* clipChild = dynamic_cast<SPLPEItem*>(clipPath->firstChild())) {
+            sp_lpe_item_cleanup_original_path_recursive(clipChild);
+	}
     }
 
     if (SP_IS_GROUP(lpeitem)) {
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 57f542373..ca94c241f 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -173,6 +173,7 @@ static SPSVGColor const sp_svg_color_named[] = {
     { 0xDDA0DD, "plum" },
     { 0xB0E0E6, "powderblue" },
     { 0x800080, "purple" },
+    { 0x663399, "rebeccapurple" },
     { 0xFF0000, "red" },
     { 0xBC8F8F, "rosybrown" },
     { 0x4169E1, "royalblue" },
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 361a54a90..b8f628987 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1246,6 +1246,9 @@ SPDesktopWidget::shutdown()
  */
 void
 SPDesktopWidget::requestCanvasUpdate() {
+    // ^^ also this->desktop != 0
+    g_return_if_fail (this->desktop != NULL);
+    g_return_if_fail (this->desktop->main != NULL);
     gtk_widget_queue_draw (GTK_WIDGET (SP_CANVAS_ITEM (this->desktop->main)->canvas));
 }