From 6a2dc9a7976d4f370701ac3f35388bae98d40e6c Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 22 Jan 2017 00:40:16 +0200
Subject: [PATCH] fix some qml warnings on dock removal

---
 app/dockview.cpp                              | 2 ++
 containment/contents/ui/VisibilityManager.qml | 2 +-
 containment/contents/ui/main.qml              | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/dockview.cpp b/app/dockview.cpp
index a1d5a262b..122627589 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -90,6 +90,7 @@ DockView::DockView(Plasma::Corona *corona, QScreen *targetScreen)
 DockView::~DockView()
 {
     qDebug() << "dock view deleting...";
+    rootContext()->setContextProperty(QStringLiteral("dock"), nullptr);
     this->disconnect();
     qDebug() << "dock view connections deleted...";
 
@@ -114,6 +115,7 @@ void DockView::init()
         updateFormFactor();
         syncGeometry();
     });
+
     rootContext()->setContextProperty(QStringLiteral("dock"), this);
     setSource(corona()->kPackage().filePath("lattedockui"));
     setVisible(true);
diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml
index 62604a591..8f21605e8 100644
--- a/containment/contents/ui/VisibilityManager.qml
+++ b/containment/contents/ui/VisibilityManager.qml
@@ -60,7 +60,7 @@ Item{
     property int thicknessZoomOriginal: statesLineSizeOriginal + ((plasmoid.configuration.iconSize+iconMarginOriginal) * root.zoomFactor) + 2
 
     Binding{
-        target: dock ? dock : manager
+        target: dock
         property:"maxThickness"
         when: dock
         value: thicknessZoomOriginal
diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml
index 7ae11cc92..17a4b4abb 100644
--- a/containment/contents/ui/main.qml
+++ b/containment/contents/ui/main.qml
@@ -529,7 +529,7 @@ DragDrop.DropArea {
     }
 
     Component.onDestruction: {
-        console.log("Destroying Now Dock Panel...");
+        console.log("Destroying Latte Dock Containment UI...");
     }
 
     Containment.onAppletAdded: {
@@ -568,7 +568,7 @@ DragDrop.DropArea {
             }
             return;
         }
-        
+
         console.debug("user configuring", plasmoid.userConfiguring)
 
         if (plasmoid.userConfiguring) {