From 3dbf9a08680c6d7252c79397dbf12082ead61bd7 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 21 Dec 2014 16:58:32 -0500
Subject: Remove sp_desktop_document and finish cleanup of desktop-handles.h

(bzr r13820)
---
 src/sp-item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-item.cpp')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index b6dee67e4..dbb0380ea 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -25,7 +25,7 @@
 #include "uri.h"
 #include "inkscape.h"
 #include "desktop.h"
-#include "desktop-handles.h"
+
 
 #include "style.h"
 #include <glibmm/i18n.h>
-- 
cgit v1.2.3


From c10ae6598c095b0273672f764f0fe0e684c94b87 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 24 Dec 2014 11:27:30 +0100
Subject: Remove sp_style_read_from_object()

(bzr r13822.1.3)
---
 src/sp-item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-item.cpp')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index dbb0380ea..fbb76e971 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -555,7 +555,7 @@ void SPItem::set(unsigned int key, gchar const* value) {
             }
         default:
             if (SP_ATTRIBUTE_IS_CSS(key)) {
-                sp_style_read_from_object(object->style, object);
+                style->readFromObject( this );
                 object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
             } else {
                 SPObject::set(key, value);
-- 
cgit v1.2.3


From a8479d867d60fe034bf5c02d3154b9386d94521b Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Thu, 15 Jan 2015 14:33:00 -0500
Subject: allow stroke_width to be scaled even if stroke color is not defined.
 (Bug 1365451 and Bug 1409458)

Fixed bugs:
  - https://launchpad.net/bugs/1365451

(bzr r13854)
---
 src/sp-item.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/sp-item.cpp')

diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index fbb76e971..5d181b80a 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -1299,7 +1299,7 @@ void SPItem::adjust_stroke( gdouble ex )
 
     SPStyle *style = this->style;
 
-    if (style && !style->stroke.isNone() && !Geom::are_near(ex, 1.0, Geom::EPSILON)) {
+    if (style && !Geom::are_near(ex, 1.0, Geom::EPSILON)) {
         style->stroke_width.computed *= ex;
         style->stroke_width.set = TRUE;
 
-- 
cgit v1.2.3