From 13db4e8d7c2250a8b5a88beca4a5800ef90b7f54 Mon Sep 17 00:00:00 2001
From: Diederik van Lierop <mail@diedenrezi.nl>
Date: Sat, 16 Aug 2014 22:54:37 +0200
Subject: Fix shift of transformation center on pasting

Fixed bugs:
  - https://launchpad.net/bugs/1247799

(bzr r13521)
---
 src/file.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index 51e629c7d..580c93c9e 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1087,9 +1087,9 @@ void sp_import_document(SPDesktop *desktop, SPDocument *clipdoc, bool in_place)
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
     selection->setReprList(pasted_objects);
 
-    // invers apply parent transform
+    // Apply inverse of parent transform
     Geom::Affine doc2parent = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false);
+    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false, false);
 
     // Update (among other things) all curves in paths, for bounds() to work
     target_document->ensureUpToDate();
@@ -1226,7 +1226,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
             // c2p is identity matrix at this point unless ensureUpToDate is called
             doc->ensureUpToDate();
             Geom::Affine affine = doc->getRoot()->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse();
-            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false);
+            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false, false);
 
             // move to mouse pointer
             {
-- 
cgit v1.2.3


From 490eb1e7f52f50d9d9a531c2a54a5d9616ff50bf Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Tue, 19 Aug 2014 17:24:08 -0400
Subject: Clear the waiting cursor on the old desktop after creating a new one

(bzr r13528)
---
 src/file.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/file.cpp')

diff --git a/src/file.cpp b/src/file.cpp
index 580c93c9e..200077de5 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -148,14 +148,14 @@ SPDesktop *sp_file_new(const std::string &templ)
         DocumentUndo::setUndoSensitive(doc, true);
     }
     
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop)
-        desktop->setWaitingCursor();
+    SPDesktop *olddesktop = SP_ACTIVE_DESKTOP;
+    if (olddesktop)
+        olddesktop->setWaitingCursor();
     
     SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
     g_return_val_if_fail(dtw != NULL, NULL);
     sp_create_window(dtw, TRUE);
-    desktop = static_cast<SPDesktop *>(dtw->view);
+    SPDesktop* desktop = static_cast<SPDesktop *>(dtw->view);
 
     doc->doUnref();
 
@@ -166,6 +166,8 @@ SPDesktop *sp_file_new(const std::string &templ)
     Inkscape::Extension::Dbus::dbus_init_desktop_interface(desktop);
 #endif
     
+    if (olddesktop)
+        olddesktop->clearWaitingCursor();
     if (desktop)
         desktop->clearWaitingCursor();
 
-- 
cgit v1.2.3