From 15b8b0b9397cd9eceeb18c87d7ee9616d84179ca Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Thu, 17 Jan 2008 20:50:00 +0000
Subject: remove SPDesktop from SPNamedView when it is destroyed. Fixing bug
 183621, but another bug is apparently present that causes a bug with similar
 trigger

(bzr r4540)
---
 src/desktop.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/desktop.cpp')

diff --git a/src/desktop.cpp b/src/desktop.cpp
index e52d2b50c..9498d5399 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -314,6 +314,8 @@ SPDesktop::init (SPNamedView *nv, SPCanvas *aCanvas)
 
 void SPDesktop::destroy()
 {
+    namedview->hide(this);
+
     _activate_connection.disconnect();
     _deactivate_connection.disconnect();
     _sel_modified_connection.disconnect();
@@ -1086,9 +1088,11 @@ SPDesktop::shutdown()
 
 bool SPDesktop::onDeleteUI (GdkEventAny*)
 {
-	if(shutdown()) return true;
-	destroyWidget();
-	return false;
+    if(shutdown()) 
+        return true;
+
+    destroyWidget();
+    return false;
 }
 
 /**
-- 
cgit v1.2.3