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, 1 insertions, 18 deletions

diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index 6ec078ce0..b1dfda573 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -52,16 +52,6 @@ static void lpeeditor_selection_modified( Inkscape::Selection *selection, guint
 }
 
 
-static void lpeeditor_desktop_change(Inkscape::Application*, SPDesktop* desktop, void *data)
-{
-    if (!desktop) {
-        return;
-    }
-    LivePathEffectEditor* editor = reinterpret_cast<LivePathEffectEditor*>(data);
-    editor->setDesktop(desktop);
-}
-
-
 /*#######################
  * LivePathEffectEditor
  */
@@ -98,14 +88,6 @@ LivePathEffectEditor::LivePathEffectEditor()
     button_apply.signal_clicked().connect(sigc::mem_fun(*this, &LivePathEffectEditor::onApply));
     button_remove.signal_clicked().connect(sigc::mem_fun(*this, &LivePathEffectEditor::onRemove));
 
-    // connect callback functions to changes in selected desktop.
-    g_signal_connect( G_OBJECT(INKSCAPE), "activate_desktop",
-                       G_CALLBACK(lpeeditor_desktop_change), this);
-
-    g_signal_connect( G_OBJECT(INKSCAPE), "deactivate_desktop",
-                       G_CALLBACK(lpeeditor_desktop_change), this);
-
-    setDesktop(SP_ACTIVE_DESKTOP);
     show_all_children();
 
     button_remove.hide();
@@ -202,6 +184,7 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
 void 
 LivePathEffectEditor::setDesktop(SPDesktop *desktop)
 {
+    Panel::setDesktop(desktop);
 
     if ( desktop == current_desktop ) {
         return;