From 4b92788b098a8c7e4414aa2f0c1a712ad15dc930 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Sat, 6 Mar 2010 00:39:14 -0800
Subject: Prevent crash due to double delete. Fixes bug #316506.

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

(bzr r9157)
---
 src/inkview.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 5cfde2c81..007438b49 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -446,9 +446,6 @@ sp_svgview_set_document(struct SPSlideShow *ss, SPDocument *doc, int current)
     if (doc && doc != ss->doc) {
         sp_document_ensure_up_to_date (doc);
         reinterpret_cast<SPSVGView*>(SP_VIEW_WIDGET_VIEW (ss->view))->setDocument (doc);
-        if (ss->doc) {
-            delete ss->doc;
-        }
         ss->doc = doc;
         ss->current = current;
     }
-- 
cgit v1.2.3


From bf83d5a03bf856e34bd0a6e2656a5b2dcfe8aafb Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Mon, 15 Mar 2010 00:58:16 +0100
Subject: Move around files to remove some vanity directories. Also remove the
 obsolete IDL file stub.

(bzr r9194)
---
 src/inkview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/inkview.cpp')

diff --git a/src/inkview.cpp b/src/inkview.cpp
index 007438b49..c151991dd 100644
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
@@ -63,7 +63,7 @@
 #include "svg-view-widget.h"
 
 #ifdef WITH_INKJAR
-#include "inkjar/jar.h"
+#include "io/inkjar.h"
 #endif
 
 #include "inkscape-private.h"
-- 
cgit v1.2.3