summaryrefslogtreecommitdiffstats
path: root/src/selection-chemistry.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2013-04-22 14:58:19 +0000
committerMartin Owens <doctormo@gmail.com>2013-04-22 14:58:19 +0000
commit3c5cd145660b50b8b96bfa8c22bd6b28d72e452c (patch)
tree8bf34a4bffa22db113eeb2cd544a85d678c08212 /src/selection-chemistry.cpp
parentdefine booleans as booleans (prevent future errors in comparisons) (diff)
downloadinkscape-3c5cd145660b50b8b96bfa8c22bd6b28d72e452c.tar.gz
inkscape-3c5cd145660b50b8b96bfa8c22bd6b28d72e452c.zip
Add balloon symbols and connect defs modified signal.
Fixed bugs: - https://launchpad.net/bugs/1170817 (bzr r12298)
Diffstat (limited to 'src/selection-chemistry.cpp')
-rw-r--r--src/selection-chemistry.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index fc410897a..28dd51e81 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -2973,7 +2973,6 @@ void sp_selection_symbol(SPDesktop *desktop, bool /*apply*/ )
*/
void sp_selection_unsymbol(SPDesktop *desktop)
{
-
if (desktop == NULL) {
return;
}
@@ -2992,13 +2991,8 @@ void sp_selection_unsymbol(SPDesktop *desktop)
SPObject* use = selection->single();
// Make sure we have only one object in selection.
- if( use == NULL ) {
- desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select only one <b>symbol</b> to convert to group."));
- return;
- }
-
// Require that we really have a <use> that references a <symbol>.
- if( !SP_IS_USE( use ) && !SP_IS_SYMBOL( use->firstChild() ) ) {
+ if( use == NULL || ( !SP_IS_USE( use ) && !SP_IS_SYMBOL( use->firstChild() ))) {
desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Select only one <b>symbol</b> to convert to group."));
return;
}