Rework dialog management. Use singleton behavior for dialogs when

started in floating dialogs mode and use one dialog/desktop behavior
when started in dockable dialogs mode. Replace the panels use of the
SP_ACTIVE_DESKTOP macro and unify the panels' handling of desktop
activation events.

(bzr r4188)

1 files changed, 4 insertions, 9 deletions

diff --git a/src/dialogs/extensions.cpp b/src/dialogs/extensions.cpp
index 36ec67744..e363df607 100644
--- a/src/dialogs/extensions.cpp
+++ b/src/dialogs/extensions.cpp
@@ -25,18 +25,13 @@ namespace Dialogs {
 
 using Inkscape::Extension::Extension;
 
-ExtensionsPanel* ExtensionsPanel::instance = 0;
-
-
-ExtensionsPanel& ExtensionsPanel::getInstance()
+ExtensionsPanel &ExtensionsPanel::getInstance()
 {
-    if ( !instance ) {
-        instance = new ExtensionsPanel();
-    }
+    ExtensionsPanel &instance = *new ExtensionsPanel();
 
-    instance->rescan();
+    instance.rescan();
 
-    return *instance;
+    return instance;
 }