summaryrefslogtreecommitdiffstats
path: root/src/sp-conn-end.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-01 00:30:50 +0000
committerLiam P. White <inkscapebronyat-signgmaildotcom>2014-04-01 00:30:50 +0000
commitf438b6b2ed8fb3013ef75832ef0763d27aa130eb (patch)
tree57dbdbd030a0efb418ff714992520fc23af4597a /src/sp-conn-end.cpp
parentUpdate to trunk (diff)
parentpartial 2geom update: (diff)
downloadinkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.tar.gz
inkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.zip
Update to trunk
(bzr r13090.1.39)
Diffstat (limited to 'src/sp-conn-end.cpp')
-rw-r--r--src/sp-conn-end.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index c136cea66..3e5398ced 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -298,7 +298,7 @@ sp_conn_end_href_changed(SPObject */*old_ref*/, SPObject */*ref*/,
// This allows the connector tool to dive into a group's children
// And connect to their children's centers.
SPObject *parent = refobj->parent;
- if (SP_IS_GROUP(parent) and ! SP_IS_LAYER(parent)) {
+ if (SP_IS_GROUP(parent) && ! SP_IS_LAYER(parent)) {
connEnd._group_connection
= SP_ITEM(parent)->connectTransformed(sigc::bind(sigc::ptr_fun(&sp_conn_end_shape_move),
path));