Reset old code to reaply fixed

23 files changed, 159 insertions, 359 deletions

diff --git a/src/attribute-rel-util.cpp b/src/attribute-rel-util.cpp
index d377e5edb..42b6bebf2 100644
--- a/src/attribute-rel-util.cpp
+++ b/src/attribute-rel-util.cpp
@@ -34,14 +34,11 @@ unsigned int sp_attribute_clean_get_prefs() {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     unsigned int flags = 0;
     if( prefs->getBool("/options/svgoutput/incorrect_attributes_warn") )          flags += SP_ATTR_CLEAN_ATTR_WARN;
-    if( prefs->getBool("/options/svgoutput/incorrect_attributes_remove") &&
-       !prefs->getBool("/options/svgoutput/disable_optimizations" ) )             flags += SP_ATTR_CLEAN_ATTR_REMOVE;
+    if( prefs->getBool("/options/svgoutput/incorrect_attributes_remove") )        flags += SP_ATTR_CLEAN_ATTR_REMOVE;
     if( prefs->getBool("/options/svgoutput/incorrect_style_properties_warn") )    flags += SP_ATTR_CLEAN_STYLE_WARN;
-    if( prefs->getBool("/options/svgoutput/incorrect_style_properties_remove" ) &&
-       !prefs->getBool("/options/svgoutput/disable_optimizations" ) )             flags += SP_ATTR_CLEAN_STYLE_REMOVE;
+    if( prefs->getBool("/options/svgoutput/incorrect_style_properties_remove" ) ) flags += SP_ATTR_CLEAN_STYLE_REMOVE;
     if( prefs->getBool("/options/svgoutput/style_defaults_warn") )                flags += SP_ATTR_CLEAN_DEFAULT_WARN;
-    if( prefs->getBool("/options/svgoutput/style_defaults_remove") &&
-       !prefs->getBool("/options/svgoutput/disable_optimizations" ) )             flags += SP_ATTR_CLEAN_DEFAULT_REMOVE;
+    if( prefs->getBool("/options/svgoutput/style_defaults_remove") )              flags += SP_ATTR_CLEAN_DEFAULT_REMOVE;
 
     return flags;
 }
diff --git a/src/desktop.cpp b/src/desktop.cpp
index 72739305a..47c82b6d9 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -117,7 +117,6 @@ SPDesktop::SPDesktop() :
     waiting_cursor( false ),
     showing_dialogs ( false ),
     guides_active( false ),
-    on_live_extension(false),
     gr_item( NULL ),
     gr_point_type( POINT_LG_BEGIN ),
     gr_point_i( 0 ),
diff --git a/src/desktop.h b/src/desktop.h
index 8b20195db..f4eecf8b7 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -188,9 +188,9 @@ public:
     unsigned int interaction_disabled_counter;
     bool waiting_cursor;
     bool showing_dialogs;
+
     /// \todo fixme: This has to be implemented in different way */
     guint guides_active : 1;
-    bool on_live_extension;
 
     // storage for selected dragger used by GrDrag as it's
     // created and deleted by tools
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp
index bde04d924..7e233d215 100644
--- a/src/extension/execution-env.cpp
+++ b/src/extension/execution-env.cpp
@@ -22,8 +22,6 @@
 #include "selection.h"
 #include "effect.h"
 #include "document.h"
-#include "desktop.h"
-#include "inkscape.h"
 #include "document-undo.h"
 #include "desktop.h"
 #include "object/sp-namedview.h"
@@ -54,6 +52,19 @@ ExecutionEnv::ExecutionEnv (Effect * effect, Inkscape::UI::View::View * doc, Imp
     _show_working(show_working),
     _show_errors(show_errors)
 {
+    SPDesktop *desktop = (SPDesktop *)_doc;
+    sp_namedview_document_from_window(desktop);
+
+    if (desktop != NULL) {
+        auto selected = desktop->getSelection()->items();
+        for(auto x = selected.begin(); x != selected.end(); ++x){
+            Glib::ustring selected_id;
+            selected_id = (*x)->getId();
+            _selected.insert(_selected.end(), selected_id);
+            //std::cout << "Selected: " << selected_id << std::endl;
+        }
+    }
+
     genDocCache();
 
     return;
@@ -178,14 +189,24 @@ ExecutionEnv::commit (void) {
 
 void
 ExecutionEnv::reselect (void) {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    Inkscape::Selection * selection = NULL;
-    if(desktop) {
-        selection = desktop->getSelection();
-        if (!desktop->on_live_extension) {
-            selection->restoreBackup();
+    if (_doc == NULL) { return; }
+    SPDocument * doc = _doc->doc();
+    if (doc == NULL) { return; }
+
+    SPDesktop *desktop = (SPDesktop *)_doc;
+    sp_namedview_document_from_window(desktop);
+
+    if (desktop == NULL) { return; }
+
+    Inkscape::Selection * selection = desktop->getSelection();
+
+    for (std::list<Glib::ustring>::iterator i = _selected.begin(); i != _selected.end(); ++i) {
+        SPObject * obj = doc->getObjectById(i->c_str());
+        if (obj != NULL) {
+            selection->add(obj);
         }
     }
+
     return;
 }
 
diff --git a/src/extension/execution-env.h b/src/extension/execution-env.h
index 8af97cd92..b1a3a8ea2 100644
--- a/src/extension/execution-env.h
+++ b/src/extension/execution-env.h
@@ -54,6 +54,9 @@ private:
     Glib::RefPtr<Glib::MainLoop> _mainloop;
     /** \brief  The document that we're working on. */
     Inkscape::UI::View::View * _doc;
+    /** \brief  A list of the IDs of all the selected objects before
+                we started to work on this document. */
+    std::list<Glib::ustring> _selected;
     /** \brief  A document cache if we were passed one. */
     Implementation::ImplementationDocumentCache * _docCache;
 
diff --git a/src/extension/implementation/implementation.cpp b/src/extension/implementation/implementation.cpp
index e05dbf3c4..6e6100d2b 100644
--- a/src/extension/implementation/implementation.cpp
+++ b/src/extension/implementation/implementation.cpp
@@ -27,23 +27,6 @@ namespace Inkscape {
 namespace Extension {
 namespace Implementation {
 
-ImplementationDocumentCache::ImplementationDocumentCache (Inkscape::UI::View::View * view)
-     : _view(view)
-{
-    SPDesktop *desktop = (SPDesktop*)view;
-    Inkscape::Selection * selection = NULL;
-    if (desktop) {
-        selection = desktop->getSelection();
-        if (selection && !selection->params.empty()) {
-            selection->restoreBackup();
-            if (!desktop->on_live_extension) {
-                selection->emptyBackup();
-            }
-        }
-    }
-    return;
-}
-
 Gtk::Widget *
 Implementation::prefs_input(Inkscape::Extension::Input *module, gchar const */*filename*/) {
     return module->autogui(NULL, NULL);
diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h
index 5bb909ef2..1232ae0c8 100644
--- a/src/extension/implementation/implementation.h
+++ b/src/extension/implementation/implementation.h
@@ -56,8 +56,11 @@ class ImplementationDocumentCache {
          */
     Inkscape::UI::View::View * _view;
 public:
-    ImplementationDocumentCache (Inkscape::UI::View::View * view);
-    
+    ImplementationDocumentCache (Inkscape::UI::View::View * view) :
+            _view(view)
+    {
+        return;
+    };
     virtual ~ImplementationDocumentCache ( ) { return; };
     Inkscape::UI::View::View const * view ( ) { return _view; };
 };
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index f1b46e8ac..f25c8a5d6 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -417,12 +417,11 @@ ScriptDocCache::ScriptDocCache (Inkscape::UI::View::View * view) :
 
     SPDesktop *desktop = (SPDesktop *) view;
     sp_namedview_document_from_window(desktop);
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    prefs->setBool("/options/svgoutput/disable_optimizations", true);
+
     Inkscape::Extension::save(
               Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE),
               view->doc(), _filename.c_str(), false, false, false, Inkscape::Extension::FILE_SAVE_METHOD_TEMPORARY);
-    prefs->setBool("/options/svgoutput/disable_optimizations", false);
+
     return;
 }
 
@@ -687,14 +686,57 @@ void Script::effect(Inkscape::Extension::Effect *module,
         return;
     }
 
-    if (desktop) {
-        Inkscape::Selection * selection = desktop->getSelection();
-        if (!selection->isEmpty()) {
-            selection->setBackup();
+    auto selected =
+            desktop->getSelection()->items(); //desktop should not be NULL since doc was checked and desktop is a casted pointer
+    for(auto x = selected.begin(); x != selected.end(); ++x){
+        Glib::ustring selected_id;
+        selected_id += "--id=";
+        selected_id += (*x)->getId();
+        params.push_front(selected_id);
+    }
+
+    {//add selected nodes
+    Inkscape::UI::Tools::NodeTool *tool = 0;
+    if (SP_ACTIVE_DESKTOP ) {
+        Inkscape::UI::Tools::ToolBase *ec = SP_ACTIVE_DESKTOP->event_context;
+        if (INK_IS_NODE_TOOL(ec)) {
+            tool = static_cast<Inkscape::UI::Tools::NodeTool*>(ec);
+        }
+    }
+    
+    if(tool){
+        Inkscape::UI::ControlPointSelection *cps = tool->_selected_nodes;
+        for (Inkscape::UI::ControlPointSelection::iterator i = cps->begin(); i != cps->end(); ++i) {
+            Inkscape::UI::Node *node = dynamic_cast<Inkscape::UI::Node*>(*i);
+            if (node) { 
+                std::string id = node->nodeList().subpathList().pm().item()->getId(); 
+
+                int sp = 0;
+                bool found_sp = false;
+                for(Inkscape::UI::SubpathList::iterator i = node->nodeList().subpathList().begin(); i != node->nodeList().subpathList().end(); ++i,++sp){
+                    if(&**i == &(node->nodeList())){
+                        found_sp = true;
+                        break;
+                    }
+                }
+                int nl=0;
+                bool found_nl = false;
+                for (Inkscape::UI::NodeList::iterator j = node->nodeList().begin(); j != node->nodeList().end(); ++j, ++nl){
+                    if(&*j==node){
+                        found_nl = true;
+                        break;
+                    }
+                }
+                std::ostringstream ss;
+                ss<< "--selected-nodes=" << id << ":" << sp << ":" << nl;
+                Glib::ustring selected = ss.str();
+
+                if(found_nl && found_sp)params.push_front(selected);
+                else g_warning("Something went wrong while trying to pass selected nodes to extension. Please report a bug.");
+            }
         }
-        params = selection->params;
-        module->paramListString(params);
     }
+    }//end add selected nodes
 
     file_listener fileout;
     int data_read = execute(command, params, dc->_filename, fileout);
@@ -748,7 +790,6 @@ void Script::effect(Inkscape::Extension::Effect *module,
                         layer = document->getObjectById(g_quark_to_string(nv->default_layer_id));
                     }
                 }
-                desktop->showGrids(nv->grids_visible);
             }
             
             sp_namedview_update_layers_from_document(desktop);
@@ -757,14 +798,6 @@ void Script::effect(Inkscape::Extension::Effect *module,
                 //set the current layer
                 desktop->setCurrentLayer(layer);
             }
-            SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-            if (desktop) {
-                Inkscape::Selection * selection = desktop->getSelection();
-                if (selection && selection->isEmpty() && !desktop->on_live_extension) {
-                    selection->restoreBackup();
-                    selection->emptyBackup();
-                }
-            }
         }
         mydoc->release();
     }
@@ -800,10 +833,12 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
         g_warning("Error on copy_doc: NULL pointer input.");
         return;
     }
+
     // For copying attributes in root and in namedview
     using Inkscape::Util::List;
     using Inkscape::XML::AttributeRecord;
     std::vector<gchar const *> attribs;
+
     // Must explicitly copy root attributes. This must be done first since
     // copying grid lines calls "SPGuide::set()" which needs to know the
     // width, height, and viewBox of the root element.
@@ -824,33 +859,80 @@ void Script::copy_doc (Inkscape::XML::Node * oldroot, Inkscape::XML::Node * newr
         oldroot->setAttribute(name, newroot->attribute(name));
     }
 
+
     // Question: Why is the "sodipodi:namedview" special? Treating it as a normal
     // elmement results in crashes.
     // Seems to be a bug:
     // http://inkscape.13.x6.nabble.com/Effect-that-modifies-the-document-properties-tt2822126.html
 
     std::vector<Inkscape::XML::Node *> delete_list;
+    Inkscape::XML::Node * oldroot_namedview = NULL;
+    Inkscape::XML::Node * newroot_namedview = NULL;
 
     // Make list
     for (Inkscape::XML::Node * child = oldroot->firstChild();
             child != NULL;
             child = child->next()) {
         if (!strcmp("sodipodi:namedview", child->name())) {
+            oldroot_namedview = child;
             for (Inkscape::XML::Node * oldroot_namedview_child = child->firstChild();
                     oldroot_namedview_child != NULL;
                     oldroot_namedview_child = oldroot_namedview_child->next()) {
                 delete_list.push_back(oldroot_namedview_child);
             }
-            break;
+        } else {
+            delete_list.push_back(child);
         }
     }
 
+    if(!oldroot_namedview)
+    {
+        g_warning("Error on copy_doc: No namedview on destination document.");
+        return;
+    }
+
     // Unparent (delete)
     for (unsigned int i = 0; i < delete_list.size(); i++) {
         sp_repr_unparent(delete_list[i]);
     }
+
+    // Copy
+    for (Inkscape::XML::Node * child = newroot->firstChild();
+            child != NULL;
+            child = child->next()) {
+        if (!strcmp("sodipodi:namedview", child->name())) {
+            newroot_namedview = child;
+            for (Inkscape::XML::Node * newroot_namedview_child = child->firstChild();
+                    newroot_namedview_child != NULL;
+                    newroot_namedview_child = newroot_namedview_child->next()) {
+                oldroot_namedview->appendChild(newroot_namedview_child->duplicate(oldroot->document()));
+            }
+        } else {
+            oldroot->appendChild(child->duplicate(oldroot->document()));
+        }
+    }
+
     attribs.clear();
-    oldroot->mergeFrom(newroot, "id", true, true);
+
+    // Must explicitly copy namedview attributes.
+    // Make a list of all attributes of the old namedview node.
+    for (List<AttributeRecord const> iter = oldroot_namedview->attributeList(); iter; ++iter) {
+        attribs.push_back(g_quark_to_string(iter->key));
+    }
+
+    // Delete the attributes of the old namedview node.
+    for (std::vector<gchar const *>::const_iterator it = attribs.begin(); it != attribs.end(); ++it) {
+        oldroot_namedview->setAttribute(*it, NULL);
+    }
+
+    // Set the new attributes.
+    for (List<AttributeRecord const> iter = newroot_namedview->attributeList(); iter; ++iter) {
+        gchar const *name = g_quark_to_string(iter->key);
+        oldroot_namedview->setAttribute(name, newroot_namedview->attribute(name));
+    }
+
+    /** \todo  Restore correct layer */
+    /** \todo  Restore correct selection */
 }
 
 /**  \brief  This function checks the stderr file, and if it has data,
diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index 4bcc5d715..f04007d00 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -53,7 +53,6 @@ BlurEdge::load (Inkscape::Extension::Extension */*module*/)
 void
 BlurEdge::effect (Inkscape::Extension::Effect *module, Inkscape::UI::View::View *desktop, Inkscape::Extension::Implementation::ImplementationDocumentCache * /*docCache*/)
 {
-    
     Inkscape::Selection * selection     = static_cast<SPDesktop *>(desktop)->selection;
 
     float width = module->get_param_float("blur-width");
diff --git a/src/extension/internal/filter/filter.cpp b/src/extension/internal/filter/filter.cpp
index 69aec1595..166e5406f 100644
--- a/src/extension/internal/filter/filter.cpp
+++ b/src/extension/internal/filter/filter.cpp
@@ -120,6 +120,7 @@ void Filter::effect(Inkscape::Extension::Effect *module, Inkscape::UI::View::Vie
 	if (filterdoc == NULL) {
 		return; // could not parse the XML source of the filter; typically parser will stderr a warning
 	}
+
 	//printf("Calling filter effect\n");
     Inkscape::Selection * selection = ((SPDesktop *)document)->selection;
 
diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp
index 0861f1dc3..0247e18e9 100644
--- a/src/extension/prefdialog.cpp
+++ b/src/extension/prefdialog.cpp
@@ -18,8 +18,6 @@
 // Used to get SP_ACTIVE_DESKTOP
 #include "inkscape.h"
 #include "desktop.h"
-#include "document.h"
-#include "document-undo.h"
 
 #include "effect.h"
 #include "implementation/implementation.h"
@@ -63,13 +61,6 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co
         controls = _effect->get_imp()->prefs_effect(_effect, SP_ACTIVE_DESKTOP, &_signal_param_change, NULL);
         _signal_param_change.connect(sigc::mem_fun(this, &PrefDialog::param_change));
     }
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop) {
-        Inkscape::Selection * selection = desktop->getSelection();
-        if (selection) {
-            selection->emptyBackup();
-        }
-    }
     hbox->pack_start(*controls, true, true, 0);
     hbox->show();
 
@@ -179,29 +170,12 @@ PrefDialog::run (void) {
 
 void
 PrefDialog::preview_toggle (void) {
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    Inkscape::Selection * selection = NULL;
-    bool modified = document->isModifiedSinceSave();
-    if(desktop) {
-        selection = desktop->getSelection();
-        if (!selection->isEmpty()) {
-            selection->setBackup();
-        }
-    }
     if(_param_preview->get_bool(NULL, NULL)) {
+        set_modal(true);
         if (_exEnv == NULL) {
-            set_modal(true);
-            if (desktop && selection) {
-                desktop->on_live_extension = true;
-                
-            }
             _exEnv = new ExecutionEnv(_effect, SP_ACTIVE_DESKTOP, NULL, false, false);
             _effect->set_execution_env(_exEnv);
             _exEnv->run();
-            if (desktop && selection) {
-                selection->clear();
-            }
         }
     } else {
         set_modal(false);
@@ -211,13 +185,8 @@ PrefDialog::preview_toggle (void) {
             delete _exEnv;
             _exEnv = NULL;
             _effect->set_execution_env(_exEnv);
-            if (desktop && selection) {
-                selection->restoreBackup();
-                desktop->on_live_extension = false;
-            }
         }
     }
-    document->setModifiedSinceSave(modified);
 }
 
 void
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 23040fcfd..ed00092b2 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -323,7 +323,6 @@ static char const preferences_skeleton[] =
 "           clips=\"16711935\"" // 00ff00ff
 "           masks=\"65535\"/>\n" // 0x0000ffff
 "    <group id=\"svgoutput\" "
-"           disable_optimizations=\"0\" "
 "           usenamedcolors=\"0\" "
 "           numericprecision=\"8\" "
 "           minimumexponent=\"-8\" "
diff --git a/src/selection.cpp b/src/selection.cpp
index 230073bcd..a2080e6fb 100644
--- a/src/selection.cpp
+++ b/src/selection.cpp
@@ -30,6 +30,8 @@
 #include "object/sp-path.h"
 #include "object/sp-defs.h"
 
+#include "xml/repr.h"
+
 #define SP_SELECTION_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE + 1)
 
 namespace Inkscape {
@@ -178,127 +180,6 @@ void Selection::_releaseSignals(SPObject *object) {
     _modified_connections.erase(object);
 }
 
-void
-Selection::emptyBackup(){
-    _selected_ids.clear();
-    _seldata.clear();
-    params.clear();
-}
-
-void
-Selection::setBackup () 
-{
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    Inkscape::UI::Tools::NodeTool *tool = 0;
-    if (desktop) {
-        Inkscape::UI::Tools::ToolBase *ec = desktop->event_context;
-        if (INK_IS_NODE_TOOL(ec)) {
-            tool = static_cast<Inkscape::UI::Tools::NodeTool*>(ec);
-        }
-    }
-    _selected_ids.clear();
-    _seldata.clear();
-    params.clear();
-    auto items = const_cast<Selection *>(this)->items();
-    for (auto iter = items.begin(); iter != items.end(); ++iter) {
-        SPItem *item = *iter;
-        std::string selected_id;
-        selected_id += "--id=";
-        selected_id += item->getId();
-        params.push_back(selected_id);
-        _selected_ids.push_back(item->getId());
-    }
-    if(tool){
-        Inkscape::UI::ControlPointSelection *cps = tool->_selected_nodes;
-        std::list<Inkscape::UI::SelectableControlPoint *> points_list = cps->_points_list;
-        for (std::list<Inkscape::UI::SelectableControlPoint *>::iterator i = points_list.begin(); i != points_list.end(); ++i) {
-            Inkscape::UI::Node *node = dynamic_cast<Inkscape::UI::Node*>(*i);
-            if (node) { 
-                std::string id = node->nodeList().subpathList().pm().item()->getId(); 
-
-                int sp = 0;
-                bool found_sp = false;
-                for(Inkscape::UI::SubpathList::iterator i = node->nodeList().subpathList().begin(); i != node->nodeList().subpathList().end(); ++i,++sp){
-                    if(&**i == &(node->nodeList())){
-                        found_sp = true;
-                        break;
-                    }
-                }
-                int nl=0;
-                bool found_nl = false;
-                for (Inkscape::UI::NodeList::iterator j = node->nodeList().begin(); j != node->nodeList().end(); ++j, ++nl){
-                    if(&*j==node){
-                        found_nl = true;
-                        break;
-                    }
-                }
-                std::ostringstream ss;
-                ss<< "--selected-nodes=" << id << ":" << sp << ":" << nl;
-                Glib::ustring selected_nodes = ss.str();
-
-                if(found_nl && found_sp) {
-                    _seldata.push_back(std::make_pair(id,std::make_pair(sp,nl)));
-                    params.push_back(selected_nodes);
-                } else {
-                    g_warning("Something went wrong while trying to pass selected nodes to extension. Please report a bug.");
-                }
-            }
-        }
-    }//end add selected nodes
-}
-
-void
-Selection::restoreBackup() 
-{
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    SPDocument *document = SP_ACTIVE_DOCUMENT;
-    Inkscape::UI::Tools::NodeTool *tool = 0;
-    if (desktop) {
-        Inkscape::UI::Tools::ToolBase *ec = desktop->event_context;
-        if (INK_IS_NODE_TOOL(ec)) {
-            tool = static_cast<Inkscape::UI::Tools::NodeTool*>(ec);
-        }
-    }
-    clear();
-    std::vector<std::string>::iterator it = _selected_ids.begin();
-    for (; it!= _selected_ids.end(); ++it){
-        SPItem * item = dynamic_cast<SPItem *>(document->getObjectById(it->c_str()));
-        SPDefs * defs = document->getDefs();
-        if (item && !defs->isAncestorOf(item)) {
-            add(item);
-        }
-    }
-    if (tool) {
-        Inkscape::UI::ControlPointSelection *cps = tool->_selected_nodes;
-        cps->selectAll();
-        std::list<Inkscape::UI::SelectableControlPoint *> points_list = cps->_points_list;
-        cps->clear();
-        Inkscape::UI::Node * node = dynamic_cast<Inkscape::UI::Node*>(*points_list.begin());
-        if (node) {
-            Inkscape::UI::SubpathList sp = node->nodeList().subpathList();
-            for (std::vector<std::pair<std::string, std::pair<int, int> > >::iterator l = _seldata.begin(); l != _seldata.end();  ++l) {
-                SPPath * path = dynamic_cast<SPPath *>(document->getObjectById(l->first));
-                gint sp_count = 0;
-                for (Inkscape::UI::SubpathList::iterator j = sp.begin(); j != sp.end(); ++j, ++sp_count) {
-                    if(sp_count == l->second.first) {
-                        gint nt_count = 0;
-                        for (Inkscape::UI::NodeList::iterator k = (*j)->begin(); k != (*j)->end(); ++k, ++nt_count) {
-                            if(nt_count == l->second.second) {
-                                cps->insert(k.ptr());
-                                break;
-                            }
-                        }
-                        break;
-                    }
-                }
-            }
-        }
-        points_list.clear();
-    }
-}
-
-
 }
 
 /*
diff --git a/src/selection.h b/src/selection.h
index 989adf6b0..2b454e947 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -183,23 +183,6 @@ public:
         return _modified_signal.slots().insert(_modified_signal.slots().begin(), slot);
     }
 
-    /**
-     * Set a backup of current selection and store it also to be command line readable by extension system
-     */
-    void setBackup();
-    /**
-     * Clear backup of current selection
-     */
-    void emptyBackup();
-    /**
-     * Restore a selection from a existing backup
-     */
-    void restoreBackup();
-    /**
-     * Here store a paramlist when set backup
-     */
-    std::list<std::string> params;
-
 protected:
     void _emitSignals();
     void _connectSignals(SPObject* object);
@@ -229,8 +212,7 @@ private:
     SPObject* _selection_context;
     unsigned int _flags;
     unsigned int _idle;
-    std::vector<std::pair<std::string, std::pair<int, int> > > _seldata;
-    std::vector<std::string> _selected_ids;
+
     std::map<SPObject *, sigc::connection> _modified_connections;
     sigc::connection _context_release_connection;
 
diff --git a/src/svg/path-string.cpp b/src/svg/path-string.cpp
index 2fa2c8f02..7d0092dfa 100644
--- a/src/svg/path-string.cpp
+++ b/src/svg/path-string.cpp
@@ -28,7 +28,7 @@ int Inkscape::SVG::PathString::minimumexponent;
 Inkscape::SVG::PATHSTRING_FORMAT Inkscape::SVG::PathString::format;
 
 Inkscape::SVG::PathString::PathString() :
-    force_repeat_commands(!Inkscape::Preferences::get()->getBool("/options/svgoutput/disable_optimizations" ) && Inkscape::Preferences::get()->getBool("/options/svgoutput/forcerepeatcommands"))
+    force_repeat_commands(Inkscape::Preferences::get()->getBool("/options/svgoutput/forcerepeatcommands"))
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     format = (PATHSTRING_FORMAT)prefs->getIntLimited("/options/svgoutput/pathstring_format", 1, 0, PATHSTRING_FORMAT_SIZE - 1 );
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 1f26d02b1..d1e91ace1 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -491,8 +491,7 @@ void sp_svg_write_color(gchar *buf, unsigned const buflen, guint32 const rgba32)
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     unsigned const rgb24 = rgba32 >> 8;
-    if ( prefs->getBool("/options/svgoutput/usenamedcolors") &&
-        !prefs->getBool("/options/svgoutput/disable_optimizations" )) {
+    if (prefs->getBool("/options/svgoutput/usenamedcolors")) {
         rgb24_to_css(buf, rgb24);
     } else {
         g_snprintf(buf, buflen, "#%06x", rgb24);
diff --git a/src/ui/tool/control-point-selection.h b/src/ui/tool/control-point-selection.h
index d0cfce8d2..ec845b1b3 100644
--- a/src/ui/tool/control-point-selection.h
+++ b/src/ui/tool/control-point-selection.h
@@ -117,8 +117,6 @@ public:
     void getOriginalPoints(std::vector<Inkscape::SnapCandidatePoint> &pts);
     void getUnselectedPoints(std::vector<Inkscape::SnapCandidatePoint> &pts);
     void setOriginalPoints();
-    //the purpose of this list is to keep track of first and last selected
-    std::list<SelectableControlPoint *> _points_list;
 
 private:
     // The functions below are invoked from SelectableControlPoint.
@@ -142,7 +140,8 @@ private:
     double _rotationRadius(Geom::Point const &);
 
     set_type _points;
-
+    //the purpose of this list is to keep track of first and last selected
+    std::list<SelectableControlPoint *> _points_list;
     set_type _all_points;
     INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Point> _original_positions;
     INK_UNORDERED_MAP<SelectableControlPoint *, Geom::Affine> _last_trans;
diff --git a/src/ui/tool/selectable-control-point.cpp b/src/ui/tool/selectable-control-point.cpp
index 83ed7d38b..f3f9c0e1e 100644
--- a/src/ui/tool/selectable-control-point.cpp
+++ b/src/ui/tool/selectable-control-point.cpp
@@ -87,15 +87,6 @@ bool SelectableControlPoint::clicked(GdkEventButton *event)
     return true;
 }
 
-void SelectableControlPoint::select(bool toselect)
-{
-    if (toselect) {
-        _selection.insert(this);
-    } else {
-        _selection.erase(this);
-    }
-}
-
 void SelectableControlPoint::_takeSelection()
 {
     _selection.clear();
diff --git a/src/ui/tool/selectable-control-point.h b/src/ui/tool/selectable-control-point.h
index c16f639b1..362d4addc 100644
--- a/src/ui/tool/selectable-control-point.h
+++ b/src/ui/tool/selectable-control-point.h
@@ -28,10 +28,8 @@ public:
     virtual Geom::Rect bounds() const {
         return Geom::Rect(position(), position());
     }
-    virtual void select(bool toselect);
     friend class NodeList;
 
-
 protected:
 
     SelectableControlPoint(SPDesktop *d, Geom::Point const &initial_pos, SPAnchorType anchor,
diff --git a/src/xml/node.h b/src/xml/node.h
index 8d9fc19e4..29cfdab46 100644
--- a/src/xml/node.h
+++ b/src/xml/node.h
@@ -384,20 +384,6 @@ public:
      */
     virtual void changeOrder(Node *child, Node *after)=0;
 
-     /**
-     * @brief Remove all elements that not in src node
-     * @param src The node to check for elemments into this node
-     * @param key The attribute to use as the identity attribute
-     */
-    virtual void cleanOriginal(Node *src, gchar const *key)=0;
-
-
-     /**
-     * @brief Compare 2 nodes equality
-     * @param other The other node to compare
-     * @param recursive Recursive mode check
-     */
-    virtual bool equal(Node const *other, bool recursive)=0; 
     /**
      * @brief Merge all children of another node with the current
      *
@@ -411,11 +397,8 @@ public:
      *
      * @param src The node to merge into this node
      * @param key The attribute to use as the identity attribute
-     * @param noid If true process noid items
-     * @param key If clean callback to cleanOriginal
      */
-
-    virtual void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false)=0;
+    virtual void mergeFrom(Node const *src, char const *key)=0;
     
     /*@}*/
 
diff --git a/src/xml/repr-io.cpp b/src/xml/repr-io.cpp
index c7b483dcb..2ff9d4776 100644
--- a/src/xml/repr-io.cpp
+++ b/src/xml/repr-io.cpp
@@ -872,10 +872,7 @@ static void sp_repr_write_stream_root_element(Node *repr, Writer &out,
     if (clean) sp_attribute_clean_tree( repr );
 
     // Sort attributes in a canonical order (helps with "diffing" SVG files).
-    bool sort = prefs->getBool("/options/svgoutput/disable_optimizations");
-    if (!sort) {
-        sort = prefs->getBool("/options/svgoutput/sort_attributes");
-    }
+    bool sort = prefs->getBool("/options/svgoutput/sort_attributes");
     if (sort) sp_attribute_sort_tree( repr );
 
     Glib::QueryQuark xml_prefix=g_quark_from_static_string("xml");
diff --git a/src/xml/simple-node.cpp b/src/xml/simple-node.cpp
index a1a7127cc..78fc52a27 100644
--- a/src/xml/simple-node.cpp
+++ b/src/xml/simple-node.cpp
@@ -315,7 +315,7 @@ SimpleNode::setAttribute(gchar const *name, gchar const *value, bool const /*is_
 
     // Check usefulness of attributes on elements in the svg namespace, optionally don't add them to tree.
     Glib::ustring element = g_quark_to_string(_name);
-    //g_message("setAttribute:  %s: %s: %s", element.c_str(), name, value);
+    // g_message("setAttribute:  %s: %s: %s", element.c_str(), name, value);
     gchar* cleaned_value = g_strdup( value );
 
     // Only check elements in SVG name space and don't block setting attribute to NULL.
@@ -645,112 +645,28 @@ Node *SimpleNode::root() {
     }
 }
 
-void SimpleNode::cleanOriginal(Node *src, gchar const *key){
-    std::vector<Node *> to_delete;
-    for ( Node *child = this->firstChild() ; child != NULL ; child = child->next() )
-    {
-        gchar const *id = child->attribute(key);
-        if (id) {
-            Node *rch = sp_repr_lookup_child(src, key, id);
-            if (rch) {
-                child->cleanOriginal(rch, key);
-            } else {
-                to_delete.push_back(child);
-            }
-        } else {
-            to_delete.push_back(child);
-        }
-    }
-    for ( std::vector<Node *>::iterator i = to_delete.begin(); i != to_delete.end(); ++i) {
-        removeChild(*i);
-    }
-}
-
-bool SimpleNode::equal(Node const *other, bool recursive) {
-    if(strcmp(name(),other->name())!= 0){
-        return false;
-    }
-    if (!(strcmp("sodipodi:namedview", name()))) {
-        return true;
-    }
-    guint orig_length = 0;
-    guint other_length = 0;
-
-    if(content() && other->content() && strcmp(content(), other->content()) != 0){
-        return false;
-    }
-    for (List<AttributeRecord const> orig_attr = attributeList(); orig_attr; ++orig_attr) {
-        for (List<AttributeRecord const> other_attr = other->attributeList(); other_attr; ++other_attr) {
-            const gchar * key_orig = g_quark_to_string(orig_attr->key);
-            const gchar * key_other = g_quark_to_string(other_attr->key);
-            if (!strcmp(key_orig, key_other) && 
-                !strcmp(orig_attr->value, other_attr->value)) 
-            {
-                other_length++;
-                break;
-            }
-        }
-        orig_length++;
-    }
-    if (orig_length != other_length) {
-        return false;
-    }
-    if (recursive) {
-        //NOTE: for faster the childs need to be in the same order
-        Node const *other_child = other->firstChild();
-        for ( Node *child = firstChild();
-              child; 
-              child = child->next())
-        {
-            if (!child->equal(other_child, recursive)) {
-                return false;
-            }
-            other_child = other_child->next();
-            if(!other_child) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-void SimpleNode::mergeFrom(Node const *src, gchar const *key, bool extension, bool clean) {
+void SimpleNode::mergeFrom(Node const *src, gchar const *key) {
     g_return_if_fail(src != NULL);
     g_return_if_fail(key != NULL);
     g_assert(src != this);
 
     setContent(src->content());
-    if(_parent) {
-        setPosition(src->position());
-    }
-
-    if (clean) {
-        Node * srcp = const_cast<Node *>(src);
-        cleanOriginal(srcp, key);
-    }
 
     for ( Node const *child = src->firstChild() ; child != NULL ; child = child->next() )
     {
         gchar const *id = child->attribute(key);
         if (id) {
             Node *rch=sp_repr_lookup_child(this, key, id);
-            if (rch && (!extension || rch->equal(child, false))) {
-                rch->mergeFrom(child, key, extension);
+            if (rch) {
+                rch->mergeFrom(child, key);
             } else {
-                if(rch) {
-                    removeChild(rch);
-                }
-                guint pos = child->position();
                 rch = child->duplicate(_document);
                 appendChild(rch);
-                rch->setPosition(pos);
                 rch->release();
             }
         } else {
-            guint pos = child->position();
             Node *rch=child->duplicate(_document);
             appendChild(rch);
-            rch->setPosition(pos);
             rch->release();
         }
     }
diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index fd41e53a8..f2cfa953c 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -91,9 +91,7 @@ public:
     char const *content() const;
     void setContent(char const *value);
 
-    void cleanOriginal(Node *src, gchar const *key);
-    bool equal(Node const *other, bool recursive);
-    void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false);
+    void mergeFrom(Node const *src, char const *key);
 
     Inkscape::Util::List<AttributeRecord const> attributeList() const {
         return _attributes;