From 56d3d2d17953c3340f2af4d9504f2ce6cd65e917 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 19 Oct 2014 20:13:08 +0200
Subject: Don't set linejoin and linecap type if query is "nothing" (query
 value is invalid).

(bzr r13628)
---
 src/widgets/stroke-style.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 9c8d45908..7477e07ca 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -764,7 +764,7 @@ StrokeStyle::setJoinType (unsigned const jointype)
             break;
         default:
             // Should not happen
-            std::cerr << "StrokeStyle::setJoinType(): Invalid value" << std::endl;
+            std::cerr << "StrokeStyle::setJoinType(): Invalid value: " << jointype << std::endl;
             tb = joinMiter;
             break;
     }
@@ -790,7 +790,7 @@ StrokeStyle::setCapType (unsigned const captype)
             break;
         default:
             // Should not happen
-            std::cerr << "StrokeStyle::setCapType(): Invalid value" << std::endl;
+            std::cerr << "StrokeStyle::setCapType(): Invalid value: " << captype << std::endl;
             tb = capButt;
             break;
     }
@@ -884,13 +884,15 @@ StrokeStyle::updateLine()
         miterLimitAdj->set_value(query->stroke_miterlimit.value); // TODO: reflect averagedness?
 #endif
 
-    if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT) {
+    if (result_join != QUERY_STYLE_MULTIPLE_DIFFERENT &&
+        result_join != QUERY_STYLE_NOTHING ) {
         setJoinType(query->stroke_linejoin.value);
     } else {
         setJoinButtons(NULL);
     }
 
-    if (result_cap != QUERY_STYLE_MULTIPLE_DIFFERENT) {
+    if (result_cap != QUERY_STYLE_MULTIPLE_DIFFERENT &&
+        result_cap != QUERY_STYLE_NOTHING ) {
         setCapType (query->stroke_linecap.value);
     } else {
         setCapButtons(NULL);
-- 
cgit v1.2.3


From e2ae473da92a1f96e307e3f1f3e206cad7bd1c38 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 23 Oct 2014 19:33:47 -0700
Subject: Initial removal of box3d outdated GTKish macros.

(bzr r13634)
---
 src/widgets/box3d-toolbar.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/box3d-toolbar.cpp b/src/widgets/box3d-toolbar.cpp
index 6d6b86c4d..3b13cd2cf 100644
--- a/src/widgets/box3d-toolbar.cpp
+++ b/src/widgets/box3d-toolbar.cpp
@@ -182,9 +182,9 @@ static void box3d_toolbox_selection_changed(Inkscape::Selection *selection, GObj
     purge_repr_listener(tbl, tbl);
 
     SPItem *item = selection->singleItem();
-    if (item && SP_IS_BOX3D(item)) {
+    SPBox3D *box = dynamic_cast<SPBox3D *>(item);
+    if (box) {
         // FIXME: Also deal with multiple selected boxes
-        SPBox3D *box = SP_BOX3D(item);
         Persp3D *persp = box3d_get_perspective(box);
         persp_repr = persp->getRepr();
         if (persp_repr) {
-- 
cgit v1.2.3