From b89ff616f0366d69b8231702776771670c6b48c6 Mon Sep 17 00:00:00 2001
From: Sean Kaim <sean.kaim@gmail.com>
Date: Thu, 4 Apr 2019 15:40:34 -0400
Subject: [PATCH] Update ADTree.dll

Fixes #1383

@farosch had some refactoring done in the dll which required some minor updates in the calling code as well...
---
 mRemoteV1/References/ADTree.dll               | Bin 22528 -> 22528 bytes
 .../ActiveDirectoryImportWindow.Designer.cs   |   6 +++---
 .../UI/Window/ActiveDirectoryImportWindow.cs  |   7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mRemoteV1/References/ADTree.dll b/mRemoteV1/References/ADTree.dll
index efef39efd66723bea125d84a24002ef1537985d6..681e99c444ab2daa5fd39842ed6cda0e2de9c6f9 100644
GIT binary patch
delta 4164
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
U?d61(N%Yk8o`hS^a@TnC--WQ`7ytkO

delta 4170
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

diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
index d9ec226a..8593b2e0 100644
--- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
@@ -1,4 +1,4 @@
-
+
 
 using mRemoteNG.Themes;
 
@@ -64,7 +64,7 @@ namespace mRemoteNG.UI.Window
             // 
             // ActiveDirectoryTree
             // 
-            this.ActiveDirectoryTree.ADPath = null;
+            this.ActiveDirectoryTree.AdPath = null;
             this.ActiveDirectoryTree.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
@@ -76,7 +76,7 @@ namespace mRemoteNG.UI.Window
             this.ActiveDirectoryTree.SelectedNode = null;
             this.ActiveDirectoryTree.Size = new System.Drawing.Size(510, 285);
             this.ActiveDirectoryTree.TabIndex = 3;
-            this.ActiveDirectoryTree.ADPathChanged += new ADTree.ADtree.ADPathChangedEventHandler(this.ActiveDirectoryTree_ADPathChanged);
+            this.ActiveDirectoryTree.AdPathChanged += new ADTree.ADtree.AdPathChangedEventHandler(this.ActiveDirectoryTree_ADPathChanged);
             // 
             // btnClose
             // 
diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
index 07e0d9fe..af220114 100644
--- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
+++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Windows.Forms;
 using WeifenLuo.WinFormsUI.Docking;
@@ -57,7 +57,7 @@ namespace mRemoteNG.UI.Window
             else
                 importDestination = Runtime.ConnectionsService.ConnectionTreeModel.RootNodes.First();
 
-            Import.ImportFromActiveDirectory(ActiveDirectoryTree.ADPath, importDestination, chkSubOU.Checked);
+            Import.ImportFromActiveDirectory(ActiveDirectoryTree.AdPath, importDestination, chkSubOU.Checked);
         }
 
         /*
@@ -80,6 +80,7 @@ namespace mRemoteNG.UI.Window
             ChangeDomain();
         }
 
+        // ReSharper disable once UnusedParameter.Local
         private void ActiveDirectoryTree_ADPathChanged(object sender)
         {
             EnableDisableImportButton();
@@ -105,7 +106,7 @@ namespace mRemoteNG.UI.Window
 
         private void EnableDisableImportButton()
         {
-            btnImport.Enabled = !string.IsNullOrEmpty(ActiveDirectoryTree.ADPath);
+            btnImport.Enabled = !string.IsNullOrEmpty(ActiveDirectoryTree.AdPath);
         }
 
         #endregion