diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-05-16 16:00:19 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-05-16 16:00:19 +0000 |
| commit | 58f7c54bdd82261552c308b672e8d5f079bf5c6d (patch) | |
| tree | c62c20759bfdea3c52cd2805289957731ab38305 /src/sp-object.cpp | |
| parent | merge from trunk (r12322) (diff) | |
| parent | Win32. More include fixes for glibmm 2.36 (file dialog). (diff) | |
| download | inkscape-58f7c54bdd82261552c308b672e8d5f079bf5c6d.tar.gz inkscape-58f7c54bdd82261552c308b672e8d5f079bf5c6d.zip | |
merge from trunk (r12337)
(bzr r11668.1.70)
Diffstat (limited to 'src/sp-object.cpp')
| -rw-r--r-- | src/sp-object.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sp-object.cpp b/src/sp-object.cpp index 4d2a5a709..b5c93e792 100644 --- a/src/sp-object.cpp +++ b/src/sp-object.cpp @@ -455,13 +455,15 @@ void SPObject::setLabel(gchar const *label) void SPObject::requestOrphanCollection() { g_return_if_fail(document != NULL); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); // do not remove style or script elements (Bug #276244) if (SP_IS_STYLE_ELEM(this)) { // leave it } else if (SP_IS_SCRIPT(this)) { // leave it - } else if (SP_IS_PAINT_SERVER(this) && static_cast<SPPaintServer*>(this)->isSwatch() ) { + + } else if ((! prefs->getBool("/options/cleanupswatches/value", false)) && SP_IS_PAINT_SERVER(this) && static_cast<SPPaintServer*>(this)->isSwatch() ) { // leave it } else if (IS_COLORPROFILE(this)) { // leave it |